resolve conflicts

akkartik

Apr 1, 2026, 8:16 PM

4MUANSZKZVCELRQS5CBIMSTSM32LO2PQAQ46LH7ZVVAL4ZLXULGAC

Dependencies

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

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