resolve conflicts

akkartik

Apr 1, 2026, 7:53 PM

YZVFSDIZOPSQFXNBL2GYTNZXTLENH7EY4K2KSQOOOJOVXIYIY2NAC

Dependencies

[2] A27ZAO4O resolve conflicts
[3] A7MKM5XL better support other keyboard layouts
[4] VP5KC4XZ Merge lines.love
[5] 6VJTQKW7 start supporting LÖVE v12
[6] LXTTOB33 extract a couple of files
[7] AVTNUQYR basic test-enabled framework
[8] VZPH3XJK update source editor
[9] VHQCNMAR several more modules
[10] KKQKPGCI resolve conflicts
[11] CE4LZV4T drop last couple of manual tests
[12] K2X6G75Z start writing some tests for drawings
[13] 3PSFWAIL Merge lines.love
[14] QZUFJMD5 resolve conflicts
[15] OGUV4HSA remove some memory leaks from rendered fragments
[16] 73OCE2MC after much struggle, a brute-force undo
[17] 2CTN2IEF Merge lines.love
[18] BLWAYPKV extract a module
[19] ORKN6EOB Merge lines.love
[20] LWPFEZBI Merge lines.love
[21] T42Y5MLO explicitly specify app name
[22] VHUNJHXB Merge lines.love
[23] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[24] ZLJYLPOT Merge lines.love
[25] GIG6OV3G port keyboard layout handling to source editor
[26] VXORMHME delete experimental REPL
[27] TLOAPLBJ add a license
[28] R5QXEHUI somebody stop me
[29] JOPVPUSA editing source code from within the app
[30] XX7G2FFJ intermingle freehand line drawings with text
[31] 6LJZN727 handle chords
[32] KMSL74GA support selections in the source editor
[33] BULPIBEG beginnings of a module for the text editor
[34] 4SR3Z4Y3 document the version of LÖVE I've been using
[35] 2EELKVO2 resolve conflicts
[36] 66X36NZN a little more prose describing manual_tests
[37] D2GCFTTT clean up repl functionality
[38] VTCPDL3A resolve conflicts
[39] F4RUTOND split up editor tests between LÖVE 11 and LÖVE 12
[40] PT7ICD7Z resolve conflicts
[41] 2L5MEZV3 experiment: new edit namespace
[42] 2CK5QI7W make love event names consistent
[43] ED4Z6ORC cleaner API for file-system access
[44] FS2ITYYH record a known issue
[45] TVCPXAAU rename
[46] T4FRZSYL delete an ancient, unused file
[47] MBAJPTDJ resolve conflicts
[48] 3QNOKBFM beginnings of a test harness
[49] RSZD5A7G forgot to add json.lua
[50] KKMFQDR4 editing source code from within the app
[51] N2NUGNN4 include a brief reference enabling many useful apps
[52] FYJXSWXV resolve conflicts
[53] SGMA5JLE save the list of tests in repo
[54] 4YDBYBA4 clean up memory leak experiments
[55] RUB7L6GY resolve conflicts
[56] OTIBCAUJ love2d scaffold

Change contents

file deletion: source_text.lua (----------)source_text.lua (----------)

[4.2]→[4.147062:147101](∅→∅),[4.2]→[4.147062:147101](∅→∅),[4.147101]→[4.83723:83723](∅→∅)

-- textinput events can occur on chords with the shift key or AltGr key
-- but not for ctrl, alt or cmd/super/gui
if App.ctrl_down() or App.alt_down() or App.cmd_down() then
return
end
replacement in source_text.lua at line 223

[4.97240]→[4.8:70](∅→∅),[4.70]→[4.8:83](∅→∅),[4.83]→[4.147:238](∅→∅),[4.147]→[4.147:238](∅→∅)

if App.any_modifier_down() then
if App.key_down(t) then
-- The modifiers didn't change the key. Handle it in keychord_press.
return
else
-- Key mutated by the keyboard layout. Continue below.
end

[4.97240]

[4.238]

-- textinput events can occur on chords with the shift key or AltGr key
-- but not for ctrl, alt or cmd/super/gui
if App.ctrl_down() or App.alt_down() or App.cmd_down() then
return