resolve conflicts

akkartik

Dec 19, 2023, 5:56 AM

FYRGHNLC4YQBRP7OZMPILETW6T4BXINL3VDVWKWP3B6NBCBT7A7QC

Dependencies

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

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,