resolve conflicts

akkartik

Dec 2, 2023, 6:04 AM

WKXJNESIMLTTUCTCT7Y32R4ESTKREY7L5JDZ43MWIPM5DVM47R5AC

Dependencies

• [2] KKQKPGCI resolve conflicts
• [3] XZ6QVCTT manually maintain mouse button press state
• [4] KYNGDE2C consistent names in a few more places
• [5] 7YGYHOEO Merge lines.love
• [6] LNUHQOGH start passing in Editor_state explicitly
• [7] 6XCJX4DZ bugfix: inscript's bug
• [8] 3XNFQDDN Merge lines.love
• [9] UD7HNQL7 purge unused button infrastructure
• [10] 4EGQRXDA bugfix: naming points
• [11] R2ASHK5C fix a bad merge
• [12] MD3W5IRA new fork: rip out drawing support
• [13] 7FPELAZB ah, I see the problem
• [14] ONHKBLLC Merge lines.love
• [15] QJISOCHJ some temporary logging to catch a bug
• [16] YXQOITYS Merge lines.love
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• edit in edit.lua at line 154
  [4.1861]

  [4.1861]
  + State.mouse_down = mouse_button
• edit in edit.lua at line 203
  [4.3727]

  [4.1929]
  + State.mouse_down = nil
• edit in edit.lua at line 458
  [4.12430]→[2.8766:8766](∅→∅),[4.2703]→[3.63:88](∅→∅),[4.2703]→[3.63:88](∅→∅),[4.2703]→[3.63:88](∅→∅),[4.4581]→[3.28:62](∅→∅),[4.4581]→[3.28:62](∅→∅),[4.4581]→[3.28:62](∅→∅)
  −

  − State.mouse_down = nil

  − State.mouse_down = mouse_button
• resolve order conflict in edit.lua at line 458
  [4.12430]