resolve conflicts

akkartik

Dec 12, 2024, 7:38 AM

TKKMRGBCEAHZPOGCVN6LQ4LIWCU7XLOJUZEZYZK52KPIW7OMUGFQC

Dependencies

• [2] WQEP7P75 bring version status up to date
• [3] ME5XRPZP resolve conflicts
• [4] JYAEYMKZ get rid of a special case
• [5] QRUFNFPP Merge text0
• [6] 27JP3RRT resolve conflicts
• [7] LRDM35CE app running again
• [8] 3CMM7CXD resolve conflicts
• [9] DKDZZ6VU resolve conflicts
• [10] PJ5PQAQE record support for multiple versions
• [11] ULKNZUZK resolve conflicts
• [12] SDRXK4X5 move
• [13] F2P336NO resolve conflicts
• [14] BQH7ANWM resolve conflicts
• [15] 45BU7IRV remove a local
• [16] 36Z442IV back to commit 8123959e52f without code editing
• [17] 442XD5KJ merge bugfix
• [18] NV4WC3K4 new example: interactivity
• [19] T7QIIGQ6 attempt at better error recovery
• [*] OTIBCAUJ love2d scaffold

Change contents

• resurrect zombie in main.lua at line 20
  [4.2139]→[2.0:94](∅→∅),[4.2139]→[2.0:94](∅→∅)
  + Supported_versions = {'11.5', '11.4', '11.3', '11.2'} -- put the recommended version first
• edit in main.lua at line 21
  [2.94]→[4.11:11](∅→∅),[2.94]→[4.11:11](∅→∅),[4.120]→[4.11:11](∅→∅)
  −
• resurrect zombie in live.lua at line 417
  [4.9940]→[4.0:100](∅→∅),[4.9940]→[4.0:100](∅→∅)
  + love.graphics.setCanvas() -- undo any canvas we happened to be within, otherwise LÖVE seizes up