resolve conflicts

akkartik

Dec 29, 2023, 10:53 PM

IS3FHU6QWF2EE435AVPAIASB4IQM3GSTHU5XFWSIKEDVF4PFEZHQC

Dependencies

• [2] GX6ZCSI7 document the freewheeling protocol
• [3] KWW63AXQ Merge text0
• [4] O2E2MUT2 resolve conflicts
• [5] VSGPLJFA resolve conflicts
• [6] N2NUGNN4 include a brief reference enabling many useful apps
• [7] QMRQL2FO resolve conflicts
• [8] QF3HGULO Merge text.love
• [9] 2JLMNZZI Merge text.love
• [10] KKQKPGCI resolve conflicts
• [11] HXH4AIF2 primitives for writing tests
• [12] G4FCGDN6 rename
• [13] 36Z442IV back to commit 8123959e52f without code editing
• [14] HNRU45ZM inline a function
• [15] X43ZIKR3 Merge text.love
• [16] YJ6ASFBG yet another fork trying to integrate my live framework with everything else
• [17] QW7YRY25 Merge text0
• [18] R2ASHK5C fix a bad merge
• [19] MPETAKZ2 insert space for loading settings
• [20] FM5LDKGT Merge text.love
• [21] OV6FE23R Merge text0
• [*] OTIBCAUJ love2d scaffold
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• edit in reference.md at line 491
  [6.1123]→[6.1377:1377](∅→∅)
  −
• resolve order conflict in reference.md at line 491
  [2.1843]
• edit in main.lua at line 107
  [6.184]

  [6.184]
  + love.graphics.setFont(love.graphics.newFont(font_height))

  + -- set up desired window dimensions and make window resizable
• edit in main.lua at line 117
  [6.3172]→[5.11:70](∅→∅),[6.3172]→[5.11:70](∅→∅),[6.3172]→[5.11:70](∅→∅),[6.166]→[5.71:232](∅→∅),[6.166]→[5.71:232](∅→∅),[6.166]→[5.71:232](∅→∅)
  − local font = love.graphics.newFont(settings.font_height)

  − Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, settings.font_height, math.floor(settings.font_height*1.3))
• edit in main.lua at line 133
  [6.4163]→[5.233:283](∅→∅),[6.4163]→[5.233:283](∅→∅),[6.4163]→[5.233:283](∅→∅),[6.41]→[5.284:427](∅→∅),[6.41]→[5.284:427](∅→∅),[6.41]→[5.284:427](∅→∅)
  − local font = love.graphics.newFont(font_height)

  − Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
• edit in edit.lua at line 108
  [6.58]→[4.16:16](∅→∅)
  −
• resurrect zombie in edit.lua at line 108
  [6.84]→[6.1603:1639](∅→∅),[6.84]→[6.1603:1639](∅→∅)
  + love.graphics.setFont(State.font)
• resolve order conflict in edit.lua at line 108
  [6.58]

  [6.1603]