Merge text0
[?]
Oct 10, 2023, 4:15 AM
QRUFNFPP3EDJDYTAJGUTY6CVIGNKNTSF53YN22RRVMHXDO6MUJOQCDependencies
- [2]
T7QIIGQ6attempt at better error recovery - [3]
UZHSWA3DMerge text0 - [4]
JXI7KJSLMerge text0 - [5]
RTV7W3GUMerge text0 - [6]
D2TYFYG2Merge text.love - [7]
RHARLLIQMerge text0 - [8]
G2SVT3ROMerge text0 - [9]
5FW7YOFThighlight selection while dragging - [10]
JCXL74WVbring back everything from commit a68647ae22 - [11]
AVLAYODPmuch simpler - [12]
BYG5CEMVsupport for naming points - [13]
6VJTQKW7start supporting LÖVE v12 - [14]
2CTN2IEFMerge lines.love - [15]
LRDM35CEapp running again - [16]
N4T2HHMVMerge text0 - [17]
TXDMRA5Jbugfix: alt-tab shouldn't emit keypress events - [18]
AVTNUQYRbasic test-enabled framework - [19]
JNJ4R56Xsupport running tests multiple times - [20]
LNUHQOGHstart passing in Editor_state explicitly - [21]
36Z442IVback to commit 8123959e52f without code editing - [22]
UH4YWHW5button framework is at the app level - [23]
Z4XRNDTRfind text - [24]
JOPVPUSAediting source code from within the app - [25]
OTIBCAUJlove2d scaffold - [26]
3QNOKBFMbeginnings of a test harness - [27]
JCSLDGAHbeginnings of support for multiple shapes - [28]
ZNLTRNNKhighlight another global - [29]
Y5XAFGMWMerge text.love - [30]
M7UODV5HMerge text0 - [31]
2L5MEZV3experiment: new edit namespace - [32]
PJ5PQAQErecord support for multiple versions - [33]
HLIF3YQEMerge text0 - [34]
KWIIU3KRdocument available modes - [35]
NILDKUJVMerge text0 - [36]
GQBMVYD4Merge text.love - [37]
QMSYY47GMerge text0 - [38]
CYGNFOA5Merge text0 - [39]
44ZJJ5STMerge text.love - [40]
YF2ATH2QMerge lines.love - [41]
PP2IIHL6stop putting button state in a global - [42]
APX2PY6Gstop tracking wallclock time - [43]
KKMFQDR4editing source code from within the app - [44]
3QQZ7W4Ebring couple more globals back to the app level - [45]
KVHUFUFVreorg - [46]
6VXO3ZL3just keep the cursor visible after any input events - [47]
C3GUE45IMerge text.love
Change contents
- edit in main.lua at line 21
Supported_versions = {'11.4', '11.3', '11.2', '11.1', '11.0'} -- keep these sorted in descending order - resurrect zombie in main.lua at line 21
if array.find(Supported_versions, Version) == nil thenMode = 'error'Error_message = ("This app doesn't support version %s; please use version %s. Press any key to try it with this version anyway."):format(Version, Supported_versions[1])print(Error_message)-- continue initializing everything; hopefully we won't have errors during initialization - edit in main.lua at line 21
Supported_versions = {'11.4', '11.3', '11.2', '11.1', '11.0', '12.0'} -- keep these sorted in descending orderlocal minor_versionMajor_version, minor_version = love.getVersion()Version = Major_version..'.'..minor_version - edit in main.lua at line 30
local minor_versionMajor_version, minor_version = love.getVersion()Version = Major_version..'.'..minor_version - resolve order conflict in main.lua at line 30
- resurrect zombie in main.lua at line 165
if on.draw then on.draw() end - edit in main.lua at line 166[7.40]→[7.46:46](∅→∅),[7.224]→[7.46:46](∅→∅),[7.6071]→[7.46:46](∅→∅),[7.187951]→[7.46:46](∅→∅),[7.681]→[7.6045:6071](∅→∅),[7.681]→[7.6045:6071](∅→∅),[7.1373]→[7.6045:6071](∅→∅),[7.1373]→[7.6045:6071](∅→∅),[7.6071]→[6.132:132](∅→∅),[7.6071]→[6.132:132](∅→∅)
edit.draw(Editor_state) - resolve order conflict in main.lua at line 166
- edit in main.lua at line 228
- resolve order conflict in main.lua at line 228
- replacement in main.lua at line 231[7.1512]→[7.1004:1049](∅→∅),[7.1512]→[7.1004:1049](∅→∅),[7.1049]→[6.136:136](∅→∅),[7.1049]→[6.136:136](∅→∅)
if Mode == 'version_check' then return endif Mode == 'error' then return end - edit in main.lua at line 233
if Mode == 'error' then return end - resolve order conflict in main.lua at line 233
- edit in main.lua at line 252
- resolve order conflict in main.lua at line 252[7.87]
- resurrect zombie in app.lua at line 17
-- have LÖVE delegate all handlers to App if they existfor name in pairs(love.handlers) doif App[name] then - resurrect zombie in app.lua at line 35
endend-- Stash current state of App for testsApp_for_tests = {}for k,v in pairs(App) doApp_for_tests[k] = vend-- there's one nested tableApp_for_tests.screen = {}for k,v in pairs(App.screen) doApp_for_tests.screen[k] = vend-- Mutate App for the real app-- disable test methodsApp.screen.init = nilApp.filesystem = nilApp.time = nilApp.run_after_textinput = nilApp.run_after_keychord = nilApp.keypress = nilApp.keyrelease = nilApp.run_after_mouse_click = nilApp.run_after_mouse_press = nilApp.run_after_mouse_release = nilApp.fake_keys_pressed = nilApp.fake_key_press = nilApp.fake_key_release = nilApp.fake_mouse_state = nilApp.fake_mouse_press = nilApp.fake_mouse_release = nil - resurrect zombie in app.lua at line 67[3.870]→[7.994:1209](∅→∅),[7.994]→[7.994:1209](∅→∅),[7.994]→[7.994:1209](∅→∅),[7.994]→[7.994:1209](∅→∅)
App.screen.resize = love.window.setModeApp.screen.size = love.window.getModeApp.screen.move = love.window.setPositionApp.screen.position = love.window.getPositionApp.screen.print = love.graphics.print - resurrect zombie in app.lua at line 128[7.56]→[7.1684:1828](∅→∅),[3.928]→[7.1684:1828](∅→∅),[7.1684]→[7.1684:1828](∅→∅),[7.1684]→[7.1684:1828](∅→∅),[7.1684]→[7.1684:1828](∅→∅)
App.mouse_move = love.mouse.setPositionApp.mouse_down = love.mouse.isDownApp.mouse_x = love.mouse.getXApp.mouse_y = love.mouse.getY - edit in app.lua at line 133
- resolve order conflict in app.lua at line 133