resolve conflicts

akkartik

Apr 1, 2026, 8:16 PM

4MUANSZKZVCELRQS5CBIMSTSM32LO2PQAQ46LH7ZVVAL4ZLXULGAC

Dependencies

[2] 3V2R6YS6 merge bugfix
[3] F7YD5D7I resolve conflicts
[4] YZVFSDIZ resolve conflicts
[5] F4RUTOND split up editor tests between LÖVE 11 and LÖVE 12
[6] VHQCNMAR several more modules
[7] D2GCFTTT clean up repl functionality
[8] CE4LZV4T drop last couple of manual tests
[9] SW5GN5LP suggest a default layout for freewheeling apps
[10] 2DVVKKVA flesh out Readme
[11] BRBXUGRG resolve conflicts
[12] BULPIBEG beginnings of a module for the text editor
[13] LRDM35CE app running again
[14] R6MNUXDJ pijul bug
[15] 4Y2QDDAZ resolve conflicts
[16] C3GUE45I Merge text.love
[17] 5T2AKBEX resolve conflicts
[18] CD7JC76C resolve conflicts
[19] 66X36NZN a little more prose describing manual_tests
[20] 67PWAM7G resolve conflicts
[21] 4SR3Z4Y3 document the version of LÖVE I've been using
[22] UEG224LH debug animations
[23] RSZD5A7G forgot to add json.lua
[24] T42Y5MLO explicitly specify app name
[25] PT7ICD7Z resolve conflicts
[26] JOPVPUSA editing source code from within the app
[27] LWPFEZBI Merge lines.love
[28] MBAJPTDJ resolve conflicts
[29] HZENSQEQ resolve conflicts
[30] TLOAPLBJ add a license
[31] D43U7GQ4 alter on-disk representation (manifest files)
[32] CZQ3NJ4N Merge text0
[33] OL7ZCZWD Merge text.love
[34] AVTNUQYR basic test-enabled framework
[35] BLWAYPKV extract a module
[36] VLTU33KW resolve conflicts
[37] 2EELKVO2 resolve conflicts
[38] VXORMHME delete experimental REPL
[39] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[40] 2CFLXLIE Merge text.love
[41] CZ6X73VY merge bugfix
[42] OTIBCAUJ love2d scaffold
[43] XX7G2FFJ intermingle freehand line drawings with text
[44] 3PSFWAIL Merge lines.love
[45] 3QNOKBFM beginnings of a test harness
[46] 36Z442IV back to commit 8123959e52f without code editing
[47] FYJXSWXV resolve conflicts
[48] FS2ITYYH record a known issue
[49] 5255G4IV resolve conflicts
[50] LXTTOB33 extract a couple of files
[51] 73OCE2MC after much struggle, a brute-force undo
[52] TVCPXAAU rename
[53] T4FRZSYL delete an ancient, unused file
[54] SGMA5JLE save the list of tests in repo
[55] KKMFQDR4 editing source code from within the app
[56] ML34DNND delete a stale file
[57] VZPH3XJK update source editor
[58] VP5KC4XZ Merge lines.love
[59] VHUNJHXB Merge lines.love
[60] KMSL74GA support selections in the source editor
[61] 5OVKHVY6 nice way to make on.* handlers more discoverable
[62] 57HKHZ7Z include the tool that's mentioned in representation.md
[63] PJ5PQAQE record support for multiple versions
[64] N2NUGNN4 include a brief reference enabling many useful apps
[65] K2X6G75Z start writing some tests for drawings
[66] YY472LBU resolve conflicts
[67] 4YDBYBA4 clean up memory leak experiments
[68] PCHTG7YU resolve conflicts
[69] RUB7L6GY resolve conflicts
[70] R5QXEHUI somebody stop me
[71] KKQKPGCI resolve conflicts
[72] ED4Z6ORC cleaner API for file-system access
[73] 6VJTQKW7 start supporting LÖVE v12
[74] VTCPDL3A resolve conflicts
[75] ORKN6EOB Merge lines.love
[76] ZLJYLPOT Merge lines.love
[77] OGUV4HSA remove some memory leaks from rendered fragments
[78] 2L5MEZV3 experiment: new edit namespace
[79] 6LJZN727 handle chords
[80] VXRYVZ74 Merge text.love
[81] EZHO4TSW new file-system format for freewheeling apps

Change contents

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

[5.2]→[5.147125:147164](∅→∅),[5.2]→[5.147125:147164](∅→∅),[5.2]→[5.147125:147164](∅→∅),[5.2]→[5.147125:147164](∅→∅),[5.147164]→[5.83786:83786](∅→∅),[5.2]→[5.147125:147164](∅→∅),[5.2]→[5.147125:147164](∅→∅),[5.147164]→[5.83786:83786](∅→∅)

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