pijul nest
guest › [sign in] [explore]

Merge lines.love

[?]
Mar 25, 2023, 5:59 PM
5MDZYVB3ANANHTNBIAPHRPDEHWINH6VYVFA25KT7NAIS2VGWLAIQC

Dependencies

  • [2] MMXLYY3Y Merge lines.love
  • [3] OMLASW7K experiment at avoiding some merge conflicts
  • [4] YMNOUE2M ugh, missed deleting an arg
  • [5] J6UWSVHB bugfix: window title
  • [6] X3CQLBTR set window title within each app
  • [7] KKMFQDR4 editing source code from within the app
  • [8] 7VGDIPLC more robust state validation
  • [9] 2CK5QI7W make love event names consistent

Change contents

  • edit in source.lua at line 75
    [4.167316]→[4.11:67](∅→∅)
    love.window.setTitle('lines-and-links.love - source')
  • resurrect zombie in source.lua at line 75
    [4.167316]→[3.12:104](∅→∅),[4.167316]→[3.12:104](∅→∅),[4.57]→[3.105:108](∅→∅),[4.57]→[3.105:108](∅→∅)
    -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
  • edit in source.lua at line 79
    [3.104]
    [3.105]
    love.window.setTitle('lines-and-links.love - source')
  • edit in source.lua at line 228
    [4.172371]→[4.68:124](∅→∅)
    love.window.setTitle('lines-and-links.love - source')
  • resurrect zombie in source.lua at line 228
    [4.172371]→[3.109:201](∅→∅),[4.172371]→[3.109:201](∅→∅),[4.104]→[3.202:205](∅→∅),[4.104]→[3.202:205](∅→∅)
    -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
  • edit in source.lua at line 232
    [3.201]
    [3.202]
    love.window.setTitle('lines-and-links.love - source')
  • edit in run.lua at line 36
    [4.48]
    [2.16]
    -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
  • edit in run.lua at line 126
    [4.81]→[2.90:163](∅→∅)
    love.window.setTitle('lines-and-links.love - '..Editor_state.filename)
  • resurrect zombie in run.lua at line 126
    [4.81]→[3.306:398](∅→∅),[4.81]→[3.306:398](∅→∅),[4.182292]→[3.399:402](∅→∅),[4.182292]→[3.399:402](∅→∅)
    -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
  • edit in run.lua at line 130
    [3.398]
    [3.399]
    love.window.setTitle('lines-and-links.love - '..Editor_state.filename)
  • edit in run.lua at line 221
    [4.48]→[3.210:302](∅→∅),[4.48]→[3.210:302](∅→∅)
    -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
  • resolve order conflict in run.lua at line 221
    [4.184045]