resolve conflicts

akkartik

Oct 26, 2025, 6:29 AM

K55LM3DPVFNOUQEWDFZ7TYESMTLPIDPEDZ5QSWOXHFQIXSSQHJEQC

Dependencies

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

Change contents

• file deletion: source_edit.lua (----------)source_edit.lua (----------)
  [4.2]→[4.165725:165764](∅→∅),[4.2]→[4.165725:165764](∅→∅),[4.165764]→[4.152440:152440](∅→∅)
  −

  − 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

  −
• edit in source_edit.lua at line 24
  [4.16955]

  [4.16955]
  +

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

  + Arrow_icon = love.mouse.getSystemCursor('arrow')
• edit in source_edit.lua at line 108
  [4.155363]

  [4.155363]
  +

  + button_handlers = {},
• edit in source_edit.lua at line 218
  [4.156691]

  [4.20062]
  + 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