resolve conflicts

akkartik

Dec 7, 2023, 9:21 AM

ZM6AON3AYYLI75CD3P62YU62KKN4KWXLWPNWZ44XM4KCQ42JEUUQC

Dependencies

[2] ULKNZUZK resolve conflicts
[3] 5GHT3LUX copy correct warning message
[4] CLNTRHOK resolve conflicts
[5] 2L5MEZV3 experiment: new edit namespace
[6] LXFHXL2N Merge text.love
[7] QFOQPDDW Merge lines.love
[8] EWJZ6XHB better formatting
[9] AKEXQV6A minor tweaks to manual tests while pushing to all forks
[10] TVSDIF6D resolve conflicts
[11] MX7YD2WC resolve conflicts
[12] VSBSWTE4 bugfix: where cursor is drawn
[13] 36Z442IV back to commit 8123959e52f without code editing
[14] D2TYFYG2 Merge text.love
[15] 3XQROLSK redo version checks yet again
[16] S7ZZA3YE ugh, handle absolute as well as relative paths
[17] FE25XVZY yet another bugfix to the version check
[18] VMV4LBR4 resolve conflicts
[19] C3GUE45I Merge text.love
[20] Y6QTA6LF Merge text.love
[21] AFDLKNAP resolve conflicts
[22] HZRO5BV5 require editor margins to be ints
[23] JOPVPUSA editing source code from within the app
[24] 2CTN2IEF Merge lines.love
[25] 5XQ4Y7NU reorg manual tests doc
[26] GQBMVYD4 Merge text.love
[27] 6VJTQKW7 start supporting LÖVE v12
[28] ZC7UBMKI pijul bug
[29] KKMFQDR4 editing source code from within the app
[30] VPRGENLA hide some details within the 'warning' state
[31] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
[32] Z2VZTIXY redo version checks
[*] OTIBCAUJ love2d scaffold
[*] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing

Change contents

edit in main.lua at line 252

[5.67]→[2.626:626](∅→∅),[5.1104]→[3.0:54](∅→∅),[5.1104]→[3.0:54](∅→∅),[5.1104]→[3.0:54](∅→∅)

love.system.setClipboardText(warning_message())
resolve order conflict in main.lua at line 252

[5.67]

[5.223]
edit in main.lua at line 276

[5.1581]→[2.638:638](∅→∅)
replacement in Manual_tests.md at line 15

[5.40]→[2.1152:1288](∅→∅)

- 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.

[5.40]

[2.1288]

- 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 17

[2.1386]

[5.169]

- 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 22

[5.271]→[2.1388:1388](∅→∅),[5.40]→[4.39:184](∅→∅),[5.40]→[4.39:184](∅→∅),[5.2163]→[4.185:328](∅→∅),[5.2163]→[4.185:328](∅→∅)

- 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.
- 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 22

[5.271]

[5.158]
edit in Manual_tests.md at line 54

[5.16279]→[2.1390:1390](∅→∅),[5.16279]→[4.332:332](∅→∅),[5.211526]→[5.329:586](∅→∅),[5.211526]→[5.329:586](∅→∅),[5.260]→[4.330:330](∅→∅),[5.260]→[4.330:330](∅→∅),[5.260]→[4.330:330](∅→∅)

* run with an untested version of LÖVE. Error message pops up. Press a key. Text editor comes up, and doesn't receive the key. Press ctrl+e. Error pops up. Press a key. Source editor opens up. Press ctrl+e. Error pops up. Press a key. Text editor returns.
resolve order conflict in Manual_tests.md at line 54

[5.16279]