resolve conflicts

akkartik

May 20, 2024, 6:32 AM

3AU3KLEUAWHZGGXBBV7PBVLGTZZDMHNFSU72NHDKINDRT2F667LQC

Dependencies

• [2] TOXPJJYY resolve conflicts
• [3] 2IOWGOPG mousemoved handler
• [4] CM76TS5R mousefocus handler
• [5] 2Y7YH7UP infrastructure for caching LÖVE text objects
• [6] 2CTN2IEF Merge lines.love
• [7] GFXWHTE6 mouse wheel support
• [8] KKMFQDR4 editing source code from within the app
• [9] ORKN6EOB Merge lines.love
• [10] 4U4VQWNY Merge lines.love
• [11] 6VJTQKW7 start supporting LÖVE v12
• [12] YF2ATH2Q Merge lines.love
• [13] VOU73AK6 Merge lines.love
• [14] MX7YD2WC resolve conflicts
• [15] 2CK5QI7W make love event names consistent
• [16] VPRGENLA hide some details within the 'warning' state
• [17] JOPVPUSA editing source code from within the app
• [18] JRLBUB6L more intuitive point delete from polygons
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 310
  [5.889]→[5.1320:1320](∅→∅),[5.894]→[3.20:66](∅→∅),[5.894]→[3.20:66](∅→∅)
  −

  − function App.mousemoved(x,y, dx,dy, is_touch)
• resurrect zombie in main.lua at line 310
  [3.66]→[3.66:143](∅→∅),[3.66]→[3.66:143](∅→∅)
  + if current_app_is_warning() then return end

  + if Current_app == 'run' then
• resolve order conflict in main.lua at line 310
  [5.889]

  [3.66]
• replacement in main.lua at line 312
  [3.143]→[3.143:196](∅→∅),[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
  [3.234]→[3.234:293](∅→∅),[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
• edit in main.lua at line 320
  [3.364]

  [5.1098]
  + function App.mousemoved(x,y, dx,dy, is_touch)
• replacement in main.lua at line 323
  [5.956]→[5.890:961](∅→∅)
  − if run.mouse_release then run.mouse_release(x,y, mouse_button) end
  [5.956]

  [5.1021]
  + if run.mouse_move then run.mouse_move(dx,dy) end
• replacement in main.lua at line 325
  [5.1059]→[5.962:1039](∅→∅)
  − if source.mouse_release then source.mouse_release(x,y, mouse_button) end
  [5.1059]

  [5.191200]
  + if source.mouse_move then source.mouse_move(dx,dy) end
• edit in main.lua at line 339
  [5.190711]→[2.2859:2859](∅→∅)
  −
• resurrect zombie in main.lua at line 339
  [5.102]→[4.20:351](∅→∅),[5.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..'"')
• resolve order conflict in main.lua at line 339
  [5.190711]
• edit in main.lua at line 339
  [0.334]

  [4.20]
  + end

  + end

  +
• edit in main.lua at line 350
  [4.351]→[4.351:362](∅→∅),[4.351]→[4.351:362](∅→∅)
  − end

  − end

  −