resolve conflicts

akkartik

Dec 3, 2023, 9:22 PM

XSKVRP2SH2GOMPHP6OFEIN3LXUXSYEP2MAGTJJWFASONQU2MCYZAC

Dependencies

• [2] B5SFL7HP Merge text0
• [3] DB4BXG24 .
• [4] VUAAYL6X handlers for _all_ LÖVE events
• [5] TVSDIF6D resolve conflicts
• [6] PESSMQBJ no, make sure to compute line width after screen dimensions
• [7] JOPVPUSA editing source code from within the app
• [8] FE25XVZY yet another bugfix to the version check
• [9] AVTNUQYR basic test-enabled framework
• [10] JNJ4R56X support running tests multiple times
• [11] PJ5PQAQE record support for multiple versions
• [12] KKMFQDR4 editing source code from within the app
• [13] M7UODV5H Merge text0
• [14] TWVSI3F2 Merge text0
• [15] 44ZJJ5ST Merge text.love
• [16] 6VXZ4E7G merge bugfix
• [17] RHARLLIQ Merge text0
• [18] 36Z442IV back to commit 8123959e52f without code editing
• [19] Y6QTA6LF Merge text.love
• [20] KWIIU3KR document available modes
• [21] NX2KHW7Q Merge text0
• [22] JCXL74WV bring back everything from commit a68647ae22
• [23] AFDLKNAP resolve conflicts
• [24] HUY4JHU2 Merge text0
• [25] VMV4LBR4 resolve conflicts
• [26] Y5XAFGMW Merge text.love
• [27] QRUFNFPP Merge text0
• [28] JZTUZQ35 resolve conflicts
• [29] RTV7W3GU Merge text0
• [30] D2TYFYG2 Merge text.love
• [31] SW7BSBMJ several bugfixes in saving/loading cursor position
• [32] T7QIIGQ6 attempt at better error recovery
• [33] QFOQPDDW Merge lines.love
• [34] PCEXCSOW Merge text.love
• [*] OTIBCAUJ love2d scaffold
• [*] 3QNOKBFM beginnings of a test harness
• [*] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing

Change contents

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

  [6.124]
  + 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 265
  [6.507]→[5.131:131](∅→∅),[6.507]→[5.131:131](∅→∅),[6.63]→[5.11:129](∅→∅),[6.63]→[5.11:129](∅→∅),[6.63]→[5.11:129](∅→∅)
  −

  − Supported_versions = {'11.5', '11.4', '11.3', '11.2', '11.1', '11.0', '12.0'} -- put the recommended version first
• resolve order conflict in main.lua at line 265
  [4.247]
• resurrect zombie in app.lua at line 147
  [6.276]→[5.140:162](∅→∅),[6.276]→[5.140:162](∅→∅)
  + App.version_check()
• edit in Manual_tests.md at line 10
  [3.59]→[6.48:48](∅→∅),[6.58]→[6.48:48](∅→∅),[6.751]→[5.168:168](∅→∅),[6.751]→[5.168:168](∅→∅)
  −

  −
• resolve order conflict in Manual_tests.md at line 10
  [3.59]

  [6.39]