resolve conflicts

akkartik

Dec 7, 2023, 9:17 AM

CLNTRHOK4KAGZPG5IW2NIMHXWMIBSNFOP4MOCUJP2ZLDWADJIJVQC

Dependencies

• [2] ZC7UBMKI pijul bug
• [3] AKEXQV6A minor tweaks to manual tests while pushing to all forks
• [4] EWJZ6XHB better formatting
• [5] 2L5MEZV3 experiment: new edit namespace
• [6] 5XQ4Y7NU reorg manual tests doc
• [7] QFOQPDDW Merge lines.love
• [8] VPRGENLA hide some details within the 'warning' state
• [9] KKMFQDR4 editing source code from within the app
• [10] 2CTN2IEF Merge lines.love
• [11] MX7YD2WC resolve conflicts
• [12] VMV4LBR4 resolve conflicts
• [13] O5F6DNPG _yet another_ bugfix to the version check X-(
• [14] FJIGUGEC bugfix: version check
• [15] S7ZZA3YE ugh, handle absolute as well as relative paths
• [16] VSBSWTE4 bugfix: where cursor is drawn
• [17] 2Y7YH7UP infrastructure for caching LÖVE text objects
• [18] HZRO5BV5 require editor margins to be ints
• [19] Z2VZTIXY redo version checks
• [20] 5GHT3LUX copy correct warning message
• [*] OTIBCAUJ love2d scaffold
• [*] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing

Change contents

• edit in main.lua at line 368
  [4.1581]→[2.175:175](∅→∅)
  −
• replacement in Manual_tests.md at line 20
  [4.40]→[4.1929:2065](∅→∅)
  − - run with an untested version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.
  [4.40]

  [4.2065]
  + - run with an untested version of LÖVE. 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 22
  [4.2163]

  [4.158]
  + - create a couple of spuriously failing tests. Run with an untested version of LÖVE. Error message includes message about untested version.
• edit in Manual_tests.md at line 27
  [4.156]→[3.39:184](∅→∅),[4.156]→[3.39:184](∅→∅),[4.156]→[3.39:184](∅→∅)
  − - run with an untested version of LÖVE. 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 27
  [4.260]

  [4.1460]
• edit in Manual_tests.md at line 62
  [4.16279]→[4.2165:2165](∅→∅),[4.121]→[3.185:328](∅→∅),[4.121]→[3.185:328](∅→∅),[4.121]→[3.185:328](∅→∅)
  −

  − - create a couple of spuriously failing tests. Run with an untested version of LÖVE. Error message includes message about untested version.
• resolve order conflict in Manual_tests.md at line 62
  [4.16279]