resolve conflicts

akkartik

May 20, 2024, 6:47 AM

RXZQUKKR2I4JJUSURDNGBMPPOH4ASAPB6Y2C67I52RSZYPPR6B7AC

Dependencies

• [2] KJLZCK2R resolve conflicts
• [3] WOVVBEQQ document recent handlers
• [4] KM6WXSKV pijul bugfix
• [5] 36Z442IV back to commit 8123959e52f without code editing
• [6] VOU73AK6 Merge lines.love
• [7] 5GHT3LUX copy correct warning message
• [8] VPRGENLA hide some details within the 'warning' state
• [9] N2NUGNN4 include a brief reference enabling many useful apps
• [10] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
• [11] CM76TS5R mousefocus handler
• [12] Y5XAFGMW Merge text.love
• [13] JOPVPUSA editing source code from within the app
• [14] 27GDAM5J correct various names in this and other pre-freewheeling forks
• [15] JRLBUB6L more intuitive point delete from polygons
• [16] KKMFQDR4 editing source code from within the app
• [17] 6VJTQKW7 start supporting LÖVE v12
• [18] YF2ATH2Q Merge lines.love
• [19] LXFHXL2N Merge text.love
• [20] GFXWHTE6 mouse wheel support
• [21] E3PF2R6Q stray dead code
• [22] 2Y7YH7UP infrastructure for caching LÖVE text objects
• [23] 2CTN2IEF Merge lines.love
• [24] ULKNZUZK resolve conflicts
• [25] D2TYFYG2 Merge text.love
• [26] MX7YD2WC resolve conflicts
• [27] 2IOWGOPG mousemoved handler
• [28] 3AU3KLEU resolve conflicts
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in reference.md at line 75
  [5.3431]→[3.18:159](∅→∅)
  −

  − * `App.mousemoved(x,y, dx,dy, is_touch)` -- called any time the mouse moves.

  − (Based on [LÖVE](https://love2d.org/wiki/love.mousemoved).)
• edit in reference.md at line 82
  [5.3781]→[3.160:320](∅→∅)
  − * `App.mousefocus(in_focus)` -- called when the mouse pointer moves on or off

  − the app window.

  − (Based on [LÖVE](https://love2d.org/wiki/love.mousefocus).)

  −
• edit in main.lua at line 275
  [5.336]→[2.12:12](∅→∅),[5.1059]→[5.273:332](∅→∅),[5.1059]→[5.273:332](∅→∅),[5.1059]→[5.273:332](∅→∅),[5.956]→[5.219:272](∅→∅),[5.956]→[5.219:272](∅→∅),[5.889]→[5.21:21](∅→∅),[5.889]→[5.21:21](∅→∅),[5.889]→[5.21:21](∅→∅),[5.364]→[5.172:218](∅→∅),[5.364]→[5.172:218](∅→∅),[5.364]→[5.172:218](∅→∅),[5.364]→[5.172:218](∅→∅),[5.364]→[5.172:218](∅→∅),[5.171]→[5.293:364](∅→∅),[5.293]→[5.293:364](∅→∅),[5.293]→[5.293:364](∅→∅),[5.293]→[5.293:364](∅→∅),[5.234]→[5.94:171](∅→∅),[5.234]→[5.94:171](∅→∅),[5.234]→[5.94:171](∅→∅),[5.234]→[5.94:171](∅→∅),[5.93]→[5.196:234](∅→∅),[5.196]→[5.196:234](∅→∅),[5.196]→[5.196:234](∅→∅),[5.196]→[5.196:234](∅→∅),[5.143]→[5.22:93](∅→∅),[5.143]→[5.22:93](∅→∅),[5.143]→[5.22:93](∅→∅),[5.21]→[5.66:143](∅→∅),[5.66]→[5.66:143](∅→∅),[5.66]→[5.66:143](∅→∅),[5.66]→[5.66:143](∅→∅),[5.346]→[5.20:351](∅→∅),[5.102]→[5.20:351](∅→∅),[5.102]→[5.20:351](∅→∅)
  −

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

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

  −

  − function App.mousemoved(x,y, dx,dy, is_touch)

  − else

  − assert(false, 'unknown app "'..Current_app..'"')

  − end

  − end

  −

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

  − elseif Current_app == 'source' then

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

  − if current_app_is_warning() then return end

  − if Current_app == 'run' then

  − 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 275
  [5.336]

  [5.151]