resolve conflicts

akkartik

Dec 19, 2023, 5:56 AM

FYRGHNLC4YQBRP7OZMPILETW6T4BXINL3VDVWKWP3B6NBCBT7A7QC

Dependencies

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

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](∅→∅)

button(State, 'link', {x=State.left+lo, y=y, w=hi-lo, h=State.line_height,
icon = icon.hyperlink_decoration,
onpress1 = function()
if file_exists(filename) then
source.switch_to_file(filename)
end
end,
})
replacement in source_text.lua at line 37

[4.869]→[4.8:111](∅→∅)

button(State, 'link', {x=State.left+lo, y=y, w=hi-lo, h=State.line_height, bg={r=1,g=1,b=1},

[4.869]

[4.969]

button(State, 'link', {x=State.left+lo, y=y, w=hi-lo, h=State.line_height,