Merge text.love

[?]

Sep 4, 2023, 10:30 PM

GQBMVYD4N5Y7CH5TPB5QBZQCNAA6B7HWX4TVDTCNVGBAAMA2W6OQC

Dependencies

[2] 2JLMNZZI Merge text.love
[3] 3SB6YT3A Merge lines.love
[4] JOPVPUSA editing source code from within the app
[5] B6DS4GZC Merge lines.love
[6] OGUV4HSA remove some memory leaks from rendered fragments
[7] 2CFLXLIE Merge text.love
[8] WB6SIB7H Merge lines.love
[9] R5QXEHUI somebody stop me
[10] AVTNUQYR basic test-enabled framework
[11] UAYCSFSK Merge text.love
[12] TLOAPLBJ add a license
[13] EHADZNMB show any error after switching to source editor
[14] MD3W5IRA new fork: rip out drawing support
[15] JZR3QMTN Merge lines.love
[16] D2GCFTTT clean up repl functionality
[17] SGMA5JLE save the list of tests in repo
[18] IGBTDA6Y Merge text.love
[19] FS2ITYYH record a known issue
[20] RSZD5A7G forgot to add json.lua
[21] HWTLXESC Merge lines.love
[22] UGXRAL54 Merge text.love
[23] RO35V4H4 Merge text.love
[24] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
[25] TVCPXAAU rename
[26] VHUNJHXB Merge lines.love
[27] 6LJZN727 handle chords
[28] T4FRZSYL delete an ancient, unused file
[29] 2344TV56 Merge lines.love
[30] 2L5MEZV3 experiment: new edit namespace
[31] KWHC65JI Merge lines.love
[32] 36Z442IV back to commit 8123959e52f without code editing
[33] XX7G2FFJ intermingle freehand line drawings with text
[34] QD4LOFQR Merge text.love
[35] KMSL74GA support selections in the source editor
[36] VXRYVZ74 Merge text.love
[37] K2X6G75Z start writing some tests for drawings
[38] ED4Z6ORC cleaner API for file-system access
[39] X43ZIKR3 Merge text.love
[40] BULPIBEG beginnings of a module for the text editor
[41] K74U4BAU Merge lines.love
[42] 4SR3Z4Y3 document the version of LÖVE I've been using
[43] ONHKBLLC Merge lines.love
[44] VP5KC4XZ Merge lines.love
[45] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[46] RU4HIK43 Merge lines.love
[47] 73OCE2MC after much struggle, a brute-force undo
[48] YDUIKWSF Merge text.love
[49] Q6RXCILQ Merge text.love
[50] VBU5YHLR Merge lines.love
[51] 3PSFWAIL Merge lines.love
[52] 66X36NZN a little more prose describing manual_tests
[53] 2TQUKHBC Merge lines.love
[54] ZLJYLPOT Merge lines.love
[55] N2NUGNN4 include a brief reference enabling many useful apps
[56] JCRUUD2S Merge text.love
[57] LXTTOB33 extract a couple of files
[58] KKMFQDR4 editing source code from within the app
[59] 2CTN2IEF Merge lines.love
[60] VXORMHME delete experimental REPL
[61] LWPFEZBI Merge lines.love
[62] ORKN6EOB Merge lines.love
[63] OTIBCAUJ love2d scaffold
[64] BLWAYPKV extract a module
[65] FM5LDKGT Merge text.love
[66] PJ5PQAQE record support for multiple versions
[67] 3QNOKBFM beginnings of a test harness
[68] 4YDBYBA4 clean up memory leak experiments
[69] CE4LZV4T drop last couple of manual tests
[70] VHQCNMAR several more modules
[*] C3GUE45I Merge text.love

Change contents

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

[4.2]→[4.177715:177749](∅→∅),[4.2]→[4.177715:177749](∅→∅),[4.177749]→[4.165829:165829](∅→∅)

if Error_message then
local height = math.min(20*Editor_state.line_height, App.screen.height*0.2)
App.color{r=0.8,g=0,b=0}
love.graphics.rectangle('fill', 150, App.screen.height - height-10, App.screen.width, height+10)
App.color{r=0,g=0,b=0}
love.graphics.print(Error_message, 150+10, App.screen.height - height)
end
end

function source.update(dt)
Cursor_time = Cursor_time + dt
if App.mouse_x() < Editor_state.right then
edit.update(Editor_state, dt)
elseif Show_log_browser_side then
log_browser.update(Log_browser_state, dt)
end
end

function source.quit()
edit.quit(Editor_state)
log_browser.quit(Log_browser_state)
edit in main.lua at line 243

[4.189132]→[4.363:429](∅→∅),[4.189132]→[4.363:429](∅→∅),[4.189284]→[4.430:456](∅→∅),[4.189284]→[4.430:456](∅→∅)

-- preserve any Error_message when going from run to source
Error_message = nil
resolve order conflict in main.lua at line 243

[72.67]

[4.223]