akkartik/carousel.love - Change K55LM3DPVFNOUQEWDFZ7TYESMTLPIDPEDZ5QSWOXHFQIXSSQHJEQC

resolve conflicts

Created by akkartik today at 01:29

K55LM3DPVFNOUQEWDFZ7TYESMTLPIDPEDZ5QSWOXHFQIXSSQHJEQC

Dependencies

In channels

main

Change contents

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[4.2] → [5.165725:165764]

BFD:BFD[5.165764] → [5.152440:152440]

B:BD[6.18405] → [3.16:113]

B:BD[5.155300] → [3.114:141]

B:BD[5.156628] → [3.142:316]

∅:D[3.316] → [6.21512:21540]

∅:D[3.141] → [5.155300:155320]

∅:D[3.113] → [6.18405:18406]


Hand_icon = love.mouse.getSystemCursor('hand')
Arrow_icon = love.mouse.getSystemCursor('arrow')
    button_handlers = {},
  local x, y = love.mouse.getPosition()
  if mouse_hover_on_any_button(State, x,y) then
    love.mouse.setCursor(Hand_icon)
  else
    love.mouse.setCursor(Arrow_icon)
  end
  Drawing.update(State, dt)
  }
  return result

Insertion in source_edit.lua at line 24 [8.152503]

[7.16955]


Hand_icon = love.mouse.getSystemCursor('hand')
Arrow_icon = love.mouse.getSystemCursor('arrow')

Insertion in source_edit.lua at line 108 [8.152503]
[8.155363]
[8.155363]
```
    button_handlers = {},
```

Insertion in source_edit.lua at line 218 [8.152503]

[8.156691]

[7.20062]

  local x, y = love.mouse.getPosition()
  if mouse_hover_on_any_button(State, x,y) then
    love.mouse.setCursor(Hand_icon)
  else
    love.mouse.setCursor(Arrow_icon)
  end