resolve conflicts

akkartik

Jul 10, 2024, 7:43 AM

CQVWNL4MQYXJVKECYVKSUMRXYMQVEMYUBHHDTDMEU5GOZ67M7QOAC

Dependencies

• [2] RXMHAZ6V resolve conflicts
• [3] JENSDEKV patch a vector for memory leaks
• [4] LNUHQOGH start passing in Editor_state explicitly
• [5] TYLURRX3 resolve conflicts
• [6] APYPFFS3 call edit rather than App callbacks in tests
• [7] CRBLAWBO resolve conflicts
• [8] 3XNFQDDN Merge lines.love
• [9] R2ASHK5C fix a bad merge
• [10] QMRQL2FO resolve conflicts
• [11] CNCYMM6A make test initializations a little more obvious
• [12] H6QZ7GRR more precise name
• [13] MBAJPTDJ resolve conflicts
• [14] GVJEOWYQ resolve conflicts
• [15] YXQOITYS Merge lines.love
• [16] 7YGYHOEO Merge lines.love
• [17] WKXJNESI resolve conflicts
• [18] TFUNIT6M resolve conflicts
• [19] RRDO6H7H bugfix
• [20] 2CK5QI7W make love event names consistent
• [21] KKQKPGCI resolve conflicts
• [22] 5XA7TKWY pull font into editor
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• replacement in edit.lua at line 379
  [4.10420]→[4.10420:10475](∅→∅)
  − function edit.update_font_settings(State, font_height)
  [4.10420]

  [4.10475]
  + function edit.update_font_settings(State, font_height, font)
• replacement in edit.lua at line 381
  [4.10509]→[4.1640:1696](∅→∅)
  − State.font = love.graphics.newFont(State.font_height)
  [4.10509]

  [4.10575]
  + State.font = font or love.graphics.newFont(State.font_height)
• edit in edit.lua at line 449
  [4.12430]→[2.1423:1423](∅→∅),[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 449
  [4.12430]