akkartik/template-carousel-mobile - Change X6DXCO6KHXGD7LP3QRI6WSOAXYS67LAFK2ZUNH5B5QZIV3FCEH6QC

resolve conflicts

Created by akkartik yesterday at 23:52

X6DXCO6KHXGD7LP3QRI6WSOAXYS67LAFK2ZUNH5B5QZIV3FCEH6QC

Dependencies

In channels

main

Change contents

Deletion in conf.lua at line 3 [6.33]
B:BD[5.55] → [3.3687:3687]
BD:BD[5.55] → [3.3687:3687]
BD:BD[5.55] → [3.3687:3687]

Replacement in app.lua at line 71 [11.2]

∅:D[9.870] → [10.994:1036]

B:BD[10.994] → [10.994:1036]

  App.screen.resize = love.window.setMode

[9.870]

[10.1036]

  App.screen.resize = function(w, h, flags)
    -- Hack. On Linux with LÖVE 12, I've observed love.window.setMode go awry.
    -- Guidance from LÖVE folks (https://github.com/love2d/love/issues/2214)
    -- is that everything should be working with density-independent units
    -- most of the time, but on some platforms love.window.setMode doesn't do
    -- so. In that case, make sure to pass in values in raw pixel units to it.
    local w1 = love.window.getMode()
    local w2 = love.graphics.getDimensions()
    if w1 ~= w2 then
      w, h = love.window.toPixels(w, h)
    end
    love.window.setMode(w, h, flags)
  end

Deletion in app.lua at line 597 [11.2]

B:BD[12.7988] → [13.40:668]

BD:BD[12.7988] → [13.40:668]

B:BD[13.668] → [4.20:152]

BD:BD[13.668] → [4.20:152]

  App.screen.resize = function(w, h, flags)
    -- Hack. On Linux with LÖVE 12, I've observed love.window.setMode go awry.
    -- Guidance from LÖVE folks (https://github.com/love2d/love/issues/2214)
    -- is that everything should be working with density-independent units
    -- most of the time, but on some platforms love.window.setMode doesn't do
    -- so. In that case, make sure to pass in values in raw pixel units to it.
    local w1 = love.window.getMode()
    local w2 = love.graphics.getDimensions()
    if w1 ~= w2 then
      w, h = love.window.toPixels(w, h)
    end
    love.window.setMode(w, h, flags)
  end
  App.screen.size = love.window.getMode
  App.screen.move = love.window.setPosition
  App.screen.position = love.window.getPosition