resolve conflicts

akkartik

Oct 26, 2025, 5:55 AM

WPE23OJFEECRINPNNTBIF2354PM2EYB75CEAY4E3XAGP5FDD67AQC

Dependencies

• [2] 53GCKYYS resolve conflicts
• [3] AIVC47JF experiment: switch mouse icon over buttons
• [4] LJW6E6DU resolve conflicts
• [5] LNUHQOGH start passing in Editor_state explicitly
• [6] VYIA2JFX resolve conflicts
• [7] FWPU6TTQ resolve conflicts
• [8] PJEQCTBL add state arg to Drawing.update
• [9] 5CDHNEKR Merge lines.love
• [10] APOMBXMU resolve conflicts
• [11] XQV3PNH2 resolve conflicts
• [12] OWE64YJ2 Merge lines.love
• [13] 2L5MEZV3 experiment: new edit namespace
• [14] 3R6VAVPX resolve conflicts
• [15] 54HQZ536 resolve conflicts
• [16] ZDPKT7VB resolve conflicts
• [17] GYTD7DDW resolve conflicts
• [18] Z5WOBP27 Merge lines.love
• [19] VOJISLDC resolve conflicts
• [20] 235D5R3Z resolve conflicts
• [21] KNWMKLNJ Merge lines.love
• [22] TWSPUEHF resolve conflicts
• [23] P4NJ2KS7 resolve conflicts
• [24] KF72R2XX resolve conflicts
• [25] 4ATFJ4RX resolve conflicts
• [26] CIK3U5S6 Merge lines.love
• [27] O47TQ6W6 resolve conflicts

Change contents

• edit in edit.lua at line 214
  [4.2857]

  [4.2857]
  + 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
• edit in edit.lua at line 622
  [4.17561]→[2.539:539](∅→∅),[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 622
  [4.17561]