resolve conflicts

akkartik

Dec 2, 2023, 6:00 AM

P4NJ2KS7VESEFNWQNOTYRUBBIJSZY22FECP5PQRC6ULYGHFJQL4QC

Dependencies

• [2] APOMBXMU resolve conflicts
• [3] XZ6QVCTT manually maintain mouse button press state
• [4] 4EGQRXDA bugfix: naming points
• [5] KYNGDE2C consistent names in a few more places
• [6] Z5WOBP27 Merge lines.love
• [7] OWE64YJ2 Merge lines.love
• [8] KNWMKLNJ Merge lines.love
• [9] LNUHQOGH start passing in Editor_state explicitly
• [10] QJISOCHJ some temporary logging to catch a bug
• [11] CIK3U5S6 Merge lines.love
• [12] 5CDHNEKR Merge lines.love
• [13] 7FPELAZB ah, I see the problem
• [14] 6XCJX4DZ bugfix: inscript's bug
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• edit in edit.lua at line 238
  [4.3491]

  [4.3491]
  + State.mouse_down = mouse_button
• edit in edit.lua at line 303
  [4.5972]

  [4.5972]
  + State.mouse_down = nil
• edit in edit.lua at line 624
  [4.17561]→[2.567:567](∅→∅),[4.2703]→[3.63:88](∅→∅),[4.2703]→[3.63:88](∅→∅),[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 624
  [4.17561]