resolve conflicts

akkartik

Jul 10, 2024, 7:36 AM

GYTD7DDWTRLQYLADZWVAJ6PQELUD4NEFPZ7PW7QAXPKGHWEDLIPAC

Dependencies

• [2] TWSPUEHF resolve conflicts
• [3] JENSDEKV patch a vector for memory leaks
• [4] VYIA2JFX resolve conflicts
• [5] OWE64YJ2 Merge lines.love
• [6] 2CK5QI7W make love event names consistent
• [7] RRDO6H7H bugfix
• [8] KNWMKLNJ Merge lines.love
• [9] APYPFFS3 call edit rather than App callbacks in tests
• [10] CNCYMM6A make test initializations a little more obvious
• [11] 54HQZ536 resolve conflicts
• [12] 5CDHNEKR Merge lines.love
• [13] CIK3U5S6 Merge lines.love
• [14] 5XA7TKWY pull font into editor
• [15] APOMBXMU resolve conflicts
• [16] H6QZ7GRR more precise name
• [17] Z5WOBP27 Merge lines.love
• [18] VOJISLDC resolve conflicts
• [19] XQV3PNH2 resolve conflicts
• [20] KF72R2XX resolve conflicts
• [21] 235D5R3Z resolve conflicts
• [22] LNUHQOGH start passing in Editor_state explicitly
• [23] P4NJ2KS7 resolve conflicts
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• replacement in edit.lua at line 542
  [4.15555]→[4.15555:15610](∅→∅)
  − function edit.update_font_settings(State, font_height)
  [4.15555]

  [4.15610]
  + function edit.update_font_settings(State, font_height, font)
• replacement in edit.lua at line 544
  [4.15644]→[4.230:286](∅→∅)
  − State.font = love.graphics.newFont(State.font_height)
  [4.15644]

  [4.15710]
  + State.font = font or love.graphics.newFont(State.font_height)
• edit in edit.lua at line 612
  [4.17561]→[2.330:330](∅→∅),[4.264]→[3.62:126](∅→∅),[4.264]→[3.62:126](∅→∅),[4.6146]→[3.0:61](∅→∅),[4.6146]→[3.0:61](∅→∅)
  −

  − State.font = font or love.graphics.newFont(State.font_height)

  − function edit.update_font_settings(State, font_height, font)
• resolve order conflict in edit.lua at line 612
  [4.17561]