resolve conflicts

akkartik

Oct 26, 2025, 6:38 AM

APOBVVLTVZI3J5LJOZLYTLCTOOTBRHXPORJCYI5O2F77L75DSS6AC

Dependencies

• [2] CD7JC76C resolve conflicts
• [3] K55LM3DP resolve conflicts
• [4] 73OCE2MC after much struggle, a brute-force undo
• [5] LXTTOB33 extract a couple of files
• [6] KKMFQDR4 editing source code from within the app
• [7] ZLJYLPOT Merge lines.love
• [8] F4RUTOND split up editor tests between LÖVE 11 and LÖVE 12
• [9] 2L5MEZV3 experiment: new edit namespace
• [10] 66X36NZN a little more prose describing manual_tests
• [11] CE4LZV4T drop last couple of manual tests
• [12] VXORMHME delete experimental REPL
• [13] LWPFEZBI Merge lines.love
• [14] FS2ITYYH record a known issue
• [15] T4FRZSYL delete an ancient, unused file
• [16] 36Z442IV back to commit 8123959e52f without code editing
• [17] PJ5PQAQE record support for multiple versions
• [18] OGUV4HSA remove some memory leaks from rendered fragments
• [19] FYJXSWXV resolve conflicts
• [20] SGMA5JLE save the list of tests in repo
• [21] T42Y5MLO explicitly specify app name
• [22] XX7G2FFJ intermingle freehand line drawings with text
• [23] ORKN6EOB Merge lines.love
• [24] D2GCFTTT clean up repl functionality
• [25] K2X6G75Z start writing some tests for drawings
• [26] BULPIBEG beginnings of a module for the text editor
• [27] RUB7L6GY resolve conflicts
• [28] 6VJTQKW7 start supporting LÖVE v12
• [29] ONHKBLLC Merge lines.love
• [30] VSGPLJFA resolve conflicts
• [31] VP5KC4XZ Merge lines.love
• [32] VHQCNMAR several more modules
• [33] 4SR3Z4Y3 document the version of LÖVE I've been using
• [34] VXRYVZ74 Merge text.love
• [35] 4YDBYBA4 clean up memory leak experiments
• [36] 6LJZN727 handle chords
• [37] BLWAYPKV extract a module
• [38] 3QNOKBFM beginnings of a test harness
• [39] BRBXUGRG resolve conflicts
• [40] QMRQL2FO resolve conflicts
• [41] N2NUGNN4 include a brief reference enabling many useful apps
• [42] ED4Z6ORC cleaner API for file-system access
• [43] OTIBCAUJ love2d scaffold
• [44] JOPVPUSA editing source code from within the app
• [45] R5QXEHUI somebody stop me
• [46] 3PSFWAIL Merge lines.love
• [47] R6MNUXDJ pijul bug
• [48] KKQKPGCI resolve conflicts
• [49] VHUNJHXB Merge lines.love
• [50] RXNR3U5E Merge text.love
• [51] X43ZIKR3 Merge text.love
• [52] 4Y2QDDAZ resolve conflicts
• [53] AVTNUQYR basic test-enabled framework
• [54] 2EELKVO2 resolve conflicts
• [55] RSZD5A7G forgot to add json.lua
• [56] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [57] 2CTN2IEF Merge lines.love
• [58] KMSL74GA support selections in the source editor
• [59] 2CFLXLIE Merge text.love
• [60] VLTU33KW resolve conflicts
• [61] MBAJPTDJ resolve conflicts
• [62] CZ6X73VY merge bugfix
• [63] TLOAPLBJ add a license
• [64] 5T2AKBEX resolve conflicts
• [65] VZPH3XJK update source editor
• [66] TVCPXAAU rename
• [67] 5255G4IV resolve conflicts

Change contents

• file deletion: source_edit.lua (----------)source_edit.lua (----------)
  [4.2]→[4.165788:165827](∅→∅),[4.2]→[4.165788:165827](∅→∅),[4.165827]→[4.152503:152503](∅→∅)
  −

  − Hand_icon = love.mouse.getSystemCursor('hand')

  − Arrow_icon = love.mouse.getSystemCursor('arrow')

  −

  − button_handlers = {},

  − local x, y = love.mouse.getPosition()

  − if mouse_hover_on_any_button(State, x,y) then

  − love.mouse.setCursor(Hand_icon)

  − else

  − love.mouse.setCursor(Arrow_icon)

  − end

  − Drawing.update(State, dt)

  − }

  − return result

  −