resolve conflicts

akkartik

Oct 26, 2025, 6:09 AM

G2LAMLBUE5WQUYUCB5RTS2STJEJHF2Q4JMX56Y5TYQKUXHCIJ4EQC

Dependencies

• [2] 2EELKVO2 resolve conflicts
• [3] AIVC47JF experiment: switch mouse icon over buttons
• [4] TYLURRX3 resolve conflicts
• [5] GVJEOWYQ resolve conflicts
• [6] CRBLAWBO resolve conflicts
• [7] KFEUQWHX resolve conflicts
• [8] FBBHEUQN resolve conflicts
• [9] QMRQL2FO resolve conflicts
• [10] MD3W5IRA new fork: rip out drawing support
• [11] 3XNFQDDN Merge lines.love
• [12] KKQKPGCI resolve conflicts
• [13] PJEQCTBL add state arg to Drawing.update
• [14] MBAJPTDJ resolve conflicts
• [15] CQVWNL4M resolve conflicts
• [16] QZUFJMD5 resolve conflicts
• [17] VP5KC4XZ Merge lines.love
• [18] 2L5MEZV3 experiment: new edit namespace
• [19] R2ASHK5C fix a bad merge
• [20] 7YGYHOEO Merge lines.love
• [21] TGZAJUEF bring back a set of constants
• [22] RXMHAZ6V resolve conflicts
• [23] UHB4GARJ left/right margin -> left/right coordinates
• [24] YXQOITYS Merge lines.love
• [25] LNUHQOGH start passing in Editor_state explicitly
• [26] 2Y5GGGJ4 correct a mis-named threshold
• [27] S7CSVBHZ resolve conflicts
• [28] WKXJNESI resolve conflicts
• [29] KKMFQDR4 editing source code from within the app
• [30] TFUNIT6M resolve conflicts
• [31] FHZ5AG3M resolve conflicts

Change contents

• edit in edit.lua at line 9
  [4.103]→[3.33:130](∅→∅),[4.103]→[3.33:130](∅→∅)
  −

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

  − Arrow_icon = love.mouse.getSystemCursor('arrow')
• edit in edit.lua at line 449
  [4.12430]→[2.3270:3270](∅→∅),[4.4252]→[3.159:333](∅→∅),[4.4252]→[3.159:333](∅→∅),[4.4252]→[3.159:333](∅→∅)
  −

  − 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
• resolve order conflict in edit.lua at line 449
  [4.12430]