resolve conflicts

akkartik

Nov 13, 2023, 4:06 AM

AFDLKNAPELPFZUV6LBOBTWTUGYLPDDCD6ALTQ2E3TG2MPFOG72JQC

Dependencies

• [2] 2ZCXBDLY Merge text.love
• [3] D2TYFYG2 Merge text.love
• [4] LHG2QWSO resolve conflicts
• [5] 2Y7YH7UP infrastructure for caching LÖVE text objects
• [6] 36Z442IV back to commit 8123959e52f without code editing
• [7] 2CTN2IEF Merge lines.love
• [8] 7SICLTED check for 'error' mode in a few more places
• [9] 44ZJJ5ST Merge text.love
• [10] YF2ATH2Q Merge lines.love
• [11] 3PSFWAIL Merge lines.love
• [12] LNUHQOGH start passing in Editor_state explicitly
• [13] OTIBCAUJ love2d scaffold
• [14] AVTNUQYR basic test-enabled framework
• [15] ORKN6EOB Merge lines.love
• [16] EHADZNMB show any error after switching to source editor
• [17] Y5XAFGMW Merge text.love
• [18] JOPVPUSA editing source code from within the app
• [19] 2CK5QI7W make love event names consistent
• [20] LXFHXL2N Merge text.love
• [21] GQBMVYD4 Merge text.love
• [22] AJB4LFRB try to maintain a reasonable line width
• [23] 2L5MEZV3 experiment: new edit namespace
• [24] KKMFQDR4 editing source code from within the app
• [25] XGHCLIKB Merge lines.love
• [26] EKJUHVHB hoist out some common settings
• [27] 4DHGKUMD Merge text.love
• [28] ZNLTRNNK highlight another global
• [29] YT5P6TO6 bugfix: save previous file when dropping a new one on
• [30] YGCT2D2O start loading settings as applicable
• [31] 3QQZ7W4E bring couple more globals back to the app level
• [32] PJ5PQAQE record support for multiple versions
• [33] C3GUE45I Merge text.love
• [34] 6VJTQKW7 start supporting LÖVE v12
• [35] WQOSZSUE warn on unused commandline args
• [36] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
• [37] TSK2OXU2 .
• [38] VP5KC4XZ Merge lines.love
• [39] UH4YWHW5 button framework is at the app level
• [40] PP2IIHL6 stop putting button state in a global
• [*] RXNR3U5E Merge text.love

Change contents

• edit in main.lua at line 33
  [5.186724]→[5.0:37](∅→∅),[5.186724]→[5.0:37](∅→∅)
  − elseif Current_app == 'error' then
• edit in main.lua at line 34
  [5.186411]→[4.20:57](∅→∅),[5.186411]→[4.20:57](∅→∅)
  − elseif Current_app == 'error' then
• edit in main.lua at line 49
  [5.2567]→[2.77:77](∅→∅),[5.187263]→[5.76:113](∅→∅),[5.187263]→[5.76:113](∅→∅)
  −

  − elseif Current_app == 'error' then
• resolve order conflict in main.lua at line 49
  [5.2567]

  [5.187263]
• edit in main.lua at line 59
  [5.187568]→[5.114:151](∅→∅),[5.187568]→[5.114:151](∅→∅)
  − elseif Current_app == 'error' then
• resolve order conflict in main.lua at line 59
  [5.2814]

  [5.187568]
• edit in main.lua at line 74
  [5.3019]→[5.9:9](∅→∅),[5.4536]→[4.58:95](∅→∅),[5.4536]→[4.58:95](∅→∅),[5.4536]→[4.58:95](∅→∅)
  −

  − elseif Current_app == 'error' then
• resolve order conflict in main.lua at line 74
  [5.3019]

  [5.187401]
• edit in main.lua at line 151
  [5.188255]→[5.190:227](∅→∅),[5.188255]→[5.190:227](∅→∅)
  − elseif Current_app == 'error' then
• resolve order conflict in main.lua at line 151
  [5.5763]

  [5.188315]
• edit in main.lua at line 180
  [5.6071]→[3.132:132](∅→∅),[5.1373]→[4.96:235](∅→∅),[5.1373]→[4.96:235](∅→∅),[5.187951]→[4.237:237](∅→∅),[5.187951]→[4.237:237](∅→∅)
  −

  − if Current_app == 'run' then

  − run.draw()

  − elseif Current_app == 'source' then

  − source.draw()

  − elseif Current_app == 'error' then

  −
• resolve order conflict in main.lua at line 180
  [5.6071]

  [5.416]
• edit in main.lua at line 233
  [5.188606]→[5.368:405](∅→∅),[5.188606]→[5.368:405](∅→∅)
  − elseif Current_app == 'error' then
• resolve order conflict in main.lua at line 233
  [42.82]

  [5.188666]
• edit in main.lua at line 244
  [5.67]→[3.134:134](∅→∅),[5.456]→[5.406:445](∅→∅),[5.456]→[5.406:445](∅→∅),[5.456]→[5.406:445](∅→∅)
  −

  − elseif Current_app == 'error' then
• resolve order conflict in main.lua at line 244
  [5.67]

  [5.223]
• edit in main.lua at line 268
  [5.507]→[3.140:140](∅→∅),[5.268]→[4.239:239](∅→∅),[5.268]→[4.239:239](∅→∅)
  −

  −
• resolve order conflict in main.lua at line 268
  [5.507]