resolve conflicts

akkartik

May 6, 2025, 10:51 PM

ZCIVNEFBEZO22YXQLNGTHULUAY62LZW7P36RPGQ5XZ2G25SUIM2QC

Dependencies

• [2] GVOLLPQF bugfix: initial textinput event on iOS
• [3] X5XUIB72 resolve conflicts
• [4] RT6EV6OP delegate update events to drawings
• [5] JOPVPUSA editing source code from within the app
• [6] CYGNFOA5 Merge text0
• [7] PX7DDEMO autosave slightly less aggressively
• [8] 2L5MEZV3 experiment: new edit namespace
• [9] KKMFQDR4 editing source code from within the app
• [10] 2CTN2IEF Merge lines.love
• [11] LRDM35CE app running again
• [12] 2CK5QI7W make love event names consistent
• [13] A42EMHOQ plumb through all supported args in LÖVE handlers
• [14] XX7G2FFJ intermingle freehand line drawings with text
• [15] AVTNUQYR basic test-enabled framework
• [16] 2EELKVO2 resolve conflicts
• [17] OAHNWDYG .
• [18] ORKN6EOB Merge lines.love
• [19] KVHUFUFV reorg
• [20] LNUHQOGH start passing in Editor_state explicitly
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 237
  [4.524]

  [2.27]
  + function App.keychord_press(chord, key, scancode, is_repeat)
• edit in main.lua at line 242
  [4.524]→[3.336:336](∅→∅),[3.336]→[4.2031:2092](∅→∅),[4.8]→[4.2031:2092](∅→∅)
  −

  − function App.keychord_press(chord, key, scancode, is_repeat)
• resolve order conflict in main.lua at line 242
  [2.228]

  [4.188176]