akkartik/sokoban.love - Change F7W3GSOIFAB5AK5NUZPAPNV33QOVJQAI2XBZIXROTF3QAAATUC6AC

resolve conflicts

Created by akkartik on October 26, 2025

F7W3GSOIFAB5AK5NUZPAPNV33QOVJQAI2XBZIXROTF3QAAATUC6AC

Dependencies

In channels

main

Change contents

Replacement in screens/move_to_empty at line 10 [2.38]
B:BD[2.282] → [2.282:304]
```
function car.update()
```
[2.282]
[2.304]
```
function animate_pending_moves()
```

Deletion in screens/main at line 55 [6.6482]

∅:D[3.2518] → [5.18:18]

B:BD[7.863] → [5.18:18]

B:BD[6.6915] → [4.12:189]

BD:BD[6.6915] → [4.12:189]

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

Solving an order conflict in screens/main at line 55 [6.6482]
[3.2518]
[8.528971]

Insertion in screens/main at line 73 [6.6482]

[9.646]

[5.20]

function car.update()
  local x, y = love.mouse.getPosition()
  if mouse_hover_on_any_button(ui_state, x,y) then
    love.mouse.setCursor(Hand_icon)
  else
    love.mouse.setCursor(Arrow_icon)
  end
  animate_pending_moves()
end