resolve conflicts

akkartik

Dec 3, 2023, 9:18 PM

TVSDIF6DIKJNK6IHHNHLKEO56GY4HS7LVQGJQ4GMNS2RF4YJJ2NAC

Dependencies

• [2] IZMDHZDZ Merge text.love
• [3] 6VXZ4E7G merge bugfix
• [4] AFDLKNAP resolve conflicts
• [5] FE25XVZY yet another bugfix to the version check
• [6] OLH6DPAD speculatively recommend new LÖVE v11.5 in all forks
• [7] VMV4LBR4 resolve conflicts
• [8] PESSMQBJ no, make sure to compute line width after screen dimensions
• [9] 4DHGKUMD Merge text.love
• [10] IM6GSGVZ fix some arg names
• [11] Y5XAFGMW Merge text.love
• [12] JCXL74WV bring back everything from commit a68647ae22
• [13] CUFW4EJL reorganize app.lua and its comments
• [14] AVTNUQYR basic test-enabled framework
• [15] D2TYFYG2 Merge text.love
• [16] Y6QTA6LF Merge text.love
• [17] SW7BSBMJ several bugfixes in saving/loading cursor position
• [18] JOPVPUSA editing source code from within the app
• [19] 44ZJJ5ST Merge text.love
• [20] YF2ATH2Q Merge lines.love
• [21] 6VJTQKW7 start supporting LÖVE v12
• [22] FJIGUGEC bugfix: version check
• [23] EWJZ6XHB better formatting
• [24] 3QNOKBFM beginnings of a test harness
• [25] 5XQ4Y7NU reorg manual tests doc
• [26] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
• [27] 2CTN2IEF Merge lines.love
• [28] PJ5PQAQE record support for multiple versions
• [29] KKMFQDR4 editing source code from within the app
• [30] 36Z442IV back to commit 8123959e52f without code editing
• [31] SDRXK4X5 move
• [32] QFOQPDDW Merge lines.love
• [*] OTIBCAUJ love2d scaffold
• [*] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [*] PCEXCSOW Merge text.love

Change contents

• replacement in main.lua at line 18
  [8.63]→[3.11:121](∅→∅)
  − Supported_versions = {'11.4', '11.3', '11.2', '11.1', '11.0', '12.0'} -- put the recommended version first
  [8.63]

  [8.11]
  + Supported_versions = {'11.5', '11.4', '11.3', '11.2', '11.1', '11.0', '12.0'} -- put the recommended version first
• edit in main.lua at line 34
  [8.198]→[6.20:112](∅→∅),[8.198]→[6.20:112](∅→∅)
  − local supported_versions = {'11.5', '11.4', '12.0'} -- put the recommended version first
• edit in main.lua at line 268
  [8.507]→[4.26:26](∅→∅),[8.190302]→[8.20:112](∅→∅),[8.190302]→[8.20:112](∅→∅),[8.190302]→[8.20:112](∅→∅)
  −

  − if Current_app == 'error' then

  − Current_app = 'run'

  − elseif Current_app == 'run' then
• resolve order conflict in main.lua at line 268
  [8.507]
• edit in app.lua at line 10
  [8.54]→[8.1125:1147](∅→∅)
  − App.version_check()
• edit in app.lua at line 18
  [8.209821]→[5.0:22](∅→∅),[8.209821]→[5.0:22](∅→∅)
  − App.version_check()
• resolve order conflict in app.lua at line 18
  [8.8463]

  [8.258]
• edit in app.lua at line 19
  [8.276]

  [8.8464]
  + App.version_check()
• resurrect zombie in Manual_tests.md at line 14
  [8.685]→[7.39:179](∅→∅),[8.685]→[7.39:179](∅→∅)
  +

  + - run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.
• resolve order conflict in Manual_tests.md at line 14
  [36.751]

  [7.39]
• edit in Manual_tests.md at line 16
  [7.179]

  [8.158]
  +

  + Code loading:

  + * run love with directory; text editor runs

  + * run love with zip file; text editor runs
• edit in Manual_tests.md at line 26
  [8.211526]→[5.23:238](∅→∅),[8.211526]→[5.23:238](∅→∅)
  − * run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key. Press ctrl+e to edit source. Source editor opens up without checking version.