Merge lines.love

[?]

Mar 25, 2023, 6:30 PM

4U4VQWNYWI53T7JQ2WSA4HZU3AWUIVXWMFCHOGUKT3ZN5C3GF6AQC

Dependencies

[2] VOU73AK6 Merge lines.love
[3] OMLASW7K experiment at avoiding some merge conflicts
[4] 3QNOKBFM beginnings of a test harness
[5] Q7XPSKII Merge lines.love
[6] 4YDBYBA4 clean up memory leak experiments
[7] 66X36NZN a little more prose describing manual_tests
[8] JOPVPUSA editing source code from within the app
[9] A4BSGS2C Merge lines.love
[10] ZTZOO2OQ Merge lines.love
[11] 73OCE2MC after much struggle, a brute-force undo
[12] DCO5BQWV Merge lines.love
[13] AKZWDWIA Merge lines.love
[14] XX7G2FFJ intermingle freehand line drawings with text
[15] 2CTN2IEF Merge lines.love
[16] KKMFQDR4 editing source code from within the app
[17] FS2ITYYH record a known issue
[18] D76MS2G2 Merge lines.love
[19] 2TQUKHBC Merge lines.love
[20] GFXWHTE6 mouse wheel support
[21] R5QXEHUI somebody stop me
[22] CE4LZV4T drop last couple of manual tests
[23] BLWAYPKV extract a module
[24] 7VGDIPLC more robust state validation
[25] VHQCNMAR several more modules
[26] VHUNJHXB Merge lines.love
[27] 6LJZN727 handle chords
[28] BULPIBEG beginnings of a module for the text editor
[29] TVCPXAAU rename
[30] G54H3YG2 get rid of all bifold text
[31] X3CQLBTR set window title within each app
[32] ATQO62TF Merge lines.love
[33] OGUV4HSA remove some memory leaks from rendered fragments
[34] KMSL74GA support selections in the source editor
[35] ORKN6EOB Merge lines.love
[36] MD3W5IRA new fork: rip out drawing support
[37] RSZD5A7G forgot to add json.lua
[38] ETXNVRPT Merge lines.love
[39] K74U4BAU Merge lines.love
[40] K2X6G75Z start writing some tests for drawings
[41] VXORMHME delete experimental REPL
[42] T4FRZSYL delete an ancient, unused file
[43] 2L5MEZV3 experiment: new edit namespace
[44] 3PSFWAIL Merge lines.love
[45] D2GCFTTT clean up repl functionality
[46] YMNOUE2M ugh, missed deleting an arg
[47] VP5KC4XZ Merge lines.love
[48] 2CK5QI7W make love event names consistent
[49] AVTNUQYR basic test-enabled framework
[50] TLOAPLBJ add a license
[51] GUOQRUL7 Merge lines.love
[52] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[53] LXTTOB33 extract a couple of files
[54] OTIBCAUJ love2d scaffold
[55] CQYKYJJU remember window positions across restart/ctrl+e
[56] L2FWWEQL source: remember cursor position of multiple files
[57] 4SR3Z4Y3 document the version of LÖVE I've been using
[58] U3MJNFUY Merge lines.love
[59] QS3YLNKZ Merge lines.love
[60] HCFDBUXH fix stale comment
[61] EMG7SDLW bugfix: cold start

Change contents

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

[4.2]→[4.177652:177686](∅→∅),[4.2]→[4.177652:177686](∅→∅),[4.177686]→[4.165766:165766](∅→∅)

end

-- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
love.window.setTitle('lines.love - source')

end

-- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
love.window.setTitle('lines.love - source')
file deletion: run.lua (----------)run.lua (----------)

[4.2]→[4.184046:184077](∅→∅),[4.2]→[4.184046:184077](∅→∅),[4.184077]→[4.178044:178044](∅→∅)

end

function run.draw()
edit.draw(Editor_state)
end

function run.update(dt)
Cursor_time = Cursor_time + dt
edit.update(Editor_state, dt)
end

function run.quit()
edit.quit(Editor_state)
end

function run.settings()

-- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
love.window.setTitle('lines.love - '..Editor_state.filename)

if #arg > 1 then
print('ignoring commandline args after '..arg[1])
end

if rawget(_G, 'jit') then
jit.off()
jit.flush()
end
end

function run.load_settings()
love.graphics.setFont(love.graphics.newFont(Settings.font_height))

-- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
love.window.setTitle('lines.love - '..Editor_state.filename)
edit in source.lua at line 75

[4.167379]

[4.11]

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

[4.56]

[4.167379]
edit in source.lua at line 228

[4.172434]

[4.57]

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

[4.102]

[4.172434]
edit in run.lua at line 36

[4.875]

[4.178990]

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

[4.179053]

[4.179053]
edit in run.lua at line 126

[4.908]

[4.182051]

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

[4.182113]

[4.182113]
resurrect zombie in main.lua at line 242

[2.889]→[4.925:956](∅→∅),[4.925]→[4.925:956](∅→∅),[4.925]→[4.925:956](∅→∅)

if Current_app == 'run' then
resurrect zombie in main.lua at line 244

[2.961]→[4.1021:1059](∅→∅),[4.1021]→[4.1021:1059](∅→∅),[4.1021]→[4.1021:1059](∅→∅)

elseif Current_app == 'source' then