resolve conflicts

akkartik

Dec 3, 2023, 9:03 PM

VMV4LBR4O26OBLEBKG5UD53H5JOIZOTSVVJ5PNZCPG54PHMLYEFAC

Dependencies

• [2] QFOQPDDW Merge lines.love
• [3] YF2ATH2Q Merge lines.love
• [4] FJIGUGEC bugfix: version check
• [5] 2CTN2IEF Merge lines.love
• [6] 6VJTQKW7 start supporting LÖVE v12
• [7] JCSLDGAH beginnings of support for multiple shapes
• [8] XGHCLIKB Merge lines.love
• [9] JOPVPUSA editing source code from within the app
• [10] FE25XVZY yet another bugfix to the version check
• [11] KKMFQDR4 editing source code from within the app
• [12] EWJZ6XHB better formatting
• [13] AVTNUQYR basic test-enabled framework
• [14] GY7DW6GY Merge lines.love
• [15] CUFW4EJL reorganize app.lua and its comments
• [16] IM6GSGVZ fix some arg names
• [17] 3QNOKBFM beginnings of a test harness
• [*] OTIBCAUJ love2d scaffold
• [*] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• edit in main.lua at line 255
  [5.57]→[3.853:897](∅→∅)
  − if Current_app == 'error' then return end
• edit in app.lua at line 11
  [5.54]→[3.1058:1080](∅→∅)
  − App.version_check()
• edit in Manual_tests.md at line 19
  [5.685]

  [2.158]
  +

  + - 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.
• edit in Manual_tests.md at line 60
  [5.685]→[4.155:295](∅→∅),[5.685]→[4.155:295](∅→∅)
  −

  − - 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 60
  [21.16279]