akkartik/sokoban.love - Change 3AU3KLEUAWHZGGXBBV7PBVLGTZZDMHNFSU72NHDKINDRT2F667LQC

resolve conflicts

Created by akkartik on May 20, 2024

3AU3KLEUAWHZGGXBBV7PBVLGTZZDMHNFSU72NHDKINDRT2F667LQC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 310 [7.2]
B:BD[5.889] → [6.1320:1320]
B:BD[8.894] → [3.20:66]
BD:BD[8.894] → [3.20:66]
```
function App.mousemoved(x,y, dx,dy, is_touch)
```
Resurrecting zombie bytes in main.lua at line 310 [7.2]
B:B[3.66] → [3.66:143]
BD:B[3.66] → [3.66:143]
```
  if current_app_is_warning() then return end
  if Current_app == 'run' then
```
Solving an order conflict in main.lua at line 310 [7.2]
[5.889]
[3.66]

Replacement in main.lua at line 312 [7.2]

B:BD[3.143] → [3.143:196]

BD:BD[3.143] → [3.143:196]

    if run.mouse_move then run.mouse_move(dx,dy) end

[3.143]

[3.196]

    if run.mouse_release then run.mouse_release(x,y, mouse_button) end

Replacement in main.lua at line 314 [7.2]

B:BD[3.234] → [3.234:293]

BD:BD[3.234] → [3.234:293]

    if source.mouse_move then source.mouse_move(dx,dy) end

[3.234]

[3.293]

    if source.mouse_release then source.mouse_release(x,y, mouse_button) end

Insertion in main.lua at line 320 [7.2]
[3.364]
[9.1098]
```
function App.mousemoved(x,y, dx,dy, is_touch)
```

Replacement in main.lua at line 323 [7.2]

B:BD[8.956] → [5.890:961]

    if run.mouse_release then run.mouse_release(x,y, mouse_button) end

[8.956]

[8.1021]

    if run.mouse_move then run.mouse_move(dx,dy) end

Replacement in main.lua at line 325 [7.2]

B:BD[8.1059] → [5.962:1039]

    if source.mouse_release then source.mouse_release(x,y, mouse_button) end

[8.1059]

[10.191200]

    if source.mouse_move then source.mouse_move(dx,dy) end

Deletion in main.lua at line 339 [7.2]
B:BD[11.190711] → [2.2859:2859]

Resurrecting zombie bytes in main.lua at line 339 [7.2]

B:B[12.102] → [4.20:351]

BD:B[12.102] → [4.20:351]

function App.mousefocus(in_focus)
  if current_app_is_warning() then return end
  if Current_app == 'run' then
    if run.mouse_focus then run.mouse_focus(in_focus) end
  elseif Current_app == 'source' then
    if source.mouse_focus then source.mouse_focus(in_focus) end
  else
    assert(false, 'unknown app "'..Current_app..'"')

Solving an order conflict in main.lua at line 339 [7.2]
[11.190711]
Insertion in main.lua at line 339 [7.2]
[0.334]
[4.20]
```
  end
end
```
Deletion in main.lua at line 350 [7.2]
B:BD[4.351] → [4.351:362]
BD:BD[4.351] → [4.351:362]
```
  end
end
```

resolve conflicts

Dependencies

In channels

Change contents

Deletion in main.lua at line 310 [7.2]

Resurrecting zombie bytes in main.lua at line 310 [7.2]

Solving an order conflict in main.lua at line 310 [7.2]

Replacement in main.lua at line 312 [7.2]

Replacement in main.lua at line 314 [7.2]

Insertion in main.lua at line 320 [7.2]

Replacement in main.lua at line 323 [7.2]

Replacement in main.lua at line 325 [7.2]

Deletion in main.lua at line 339 [7.2]

Resurrecting zombie bytes in main.lua at line 339 [7.2]

Solving an order conflict in main.lua at line 339 [7.2]

Insertion in main.lua at line 339 [7.2]

Deletion in main.lua at line 350 [7.2]