Merge text0

[?]

Mar 25, 2023, 6:50 PM

M7UODV5HDRZKAS3BKGLNU5Z5HM4KZDM4QIB2S3E6S7NAWGJY3MJAC

Dependencies

[2] 4NUCYNB4 Merge text0
[3] RHARLLIQ Merge text0
[4] Y5XAFGMW Merge text.love
[5] JOPVPUSA editing source code from within the app
[6] LRDM35CE app running again
[7] 5OVKHVY6 nice way to make on.* handlers more discoverable
[8] YT5P6TO6 bugfix: save previous file when dropping a new one on
[9] XSLCFVFH .
[10] RXNR3U5E Merge text.love
[11] PPUUN5VZ fix file_drop callback
[12] AJB4LFRB try to maintain a reasonable line width
[13] RF5ALVNY allow the window to be resized
[14] R56CKHYZ Merge text.love
[15] CE4LZV4T drop last couple of manual tests
[16] JCSLDGAH beginnings of support for multiple shapes
[17] KKMFQDR4 editing source code from within the app
[18] UHB4GARJ left/right margin -> left/right coordinates
[19] OTIBCAUJ love2d scaffold
[20] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
[21] 2CTN2IEF Merge lines.love
[22] AVTNUQYR basic test-enabled framework
[23] 36Z442IV back to commit 8123959e52f without code editing
[24] APX2PY6G stop tracking wallclock time
[25] YJ6ASFBG yet another fork trying to integrate my live framework with everything else
[26] NEXUNNCF extract a function

Change contents

edit in main.lua at line 45

[5.81]

[5.81]

-- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
edit in main.lua at line 51

[5.8]→[5.8:55](∅→∅)

if on.initialize then on.initialize(arg) end
resurrect zombie in main.lua at line 51

[5.41]→[4.101:103](∅→∅),[5.41]→[4.101:103](∅→∅)
resolve order conflict in main.lua at line 51

[5.8]

[4.101]
edit in main.lua at line 53

[4.103]

[5.187463]

if on.initialize then on.initialize(arg) end
edit in main.lua at line 121

[5.54]→[2.13:13](∅→∅),[5.73]→[4.104:196](∅→∅),[5.73]→[4.104:196](∅→∅),[5.73]→[4.104:196](∅→∅),[5.6044]→[4.197:200](∅→∅),[5.6044]→[4.197:200](∅→∅)

-- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
resolve order conflict in main.lua at line 121

[5.54]

[5.183]
edit in main.lua at line 200

[3.378]→[3.378:382](∅→∅),[5.466]→[4.201:336](∅→∅)

end
end
Cursor_time = 0 -- ensure cursor is visible immediately after it moves
return edit.key_release(Editor_state, key, scancode)
resolve order conflict in main.lua at line 200

[3.378]

[4.336]
edit in main.lua at line 201

[4.340]→[4.340:507](∅→∅),[5.40]→[4.8:100](∅→∅),[5.40]→[4.8:100](∅→∅),[5.40]→[4.8:100](∅→∅)

-- use this sparingly
function to_text(s)
if Text_cache[s] == nil then
Text_cache[s] = App.newText(love.graphics.getFont(), s)
end
return Text_cache[s]
end

-- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
resolve order conflict in main.lua at line 201

[4.340]