Merge lines.love

Dependencies

• [2] 7OVYFH6I Merge lines.love
• [3] APX2PY6G stop tracking wallclock time
• [4] AVTNUQYR basic test-enabled framework
• [5] HRWN5V6J Devine's suggestion to try to live with just freehand
• [6] KKMFQDR4 editing source code from within the app
• [7] Z4KNS42N to open a file without a terminal, drag it on!
• [8] S7ZZA3YE ugh, handle absolute as well as relative paths
• [9] YT5P6TO6 bugfix: save previous file when dropping a new one on
• [10] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
• [11] JRLBUB6L more intuitive point delete from polygons
• [12] KVHUFUFV reorg
• [13] ZLEPKWDJ fork: capture frontend for a note-taking system
• [14] 2Y7YH7UP infrastructure for caching LÖVE text objects
• [15] 57OGXVHZ Merge lines.love
• [16] JCSLDGAH beginnings of support for multiple shapes
• [*] OTIBCAUJ love2d scaffold

Change contents

• replacement in main.lua at line 122
  [4.598]→[4.598:634](∅→∅)
  − Last_focus_time = App.getTime()
  [4.598]

  [4.634]
  + Last_focus_time = Current_time
• edit in main.lua at line 161
  [4.188787]→[4.188787:188836](∅→∅),[4.188787]→[4.188787:188836](∅→∅)
  − if App.getTime() < Last_focus_time + 0.01 then
• resurrect zombie in main.lua at line 162
  [3.619]→[4.188836:189596](∅→∅),[4.188836]→[4.188836:189596](∅→∅),[4.188836]→[4.188836:189596](∅→∅)
  + return

  + end

  + --

  + if chord == 'C-e' then

  + -- carefully save settings

  + if Current_app == 'run' then

  + local source_settings = Settings.source

  + Settings = run.settings()

  + Settings.source = source_settings

  + if run.quit then run.quit() end

  + Current_app = 'source'

  + elseif Current_app == 'source' then

  + Settings.source = source.settings()

  + if source.quit then source.quit() end

  + Current_app = 'run'

  + else

  + assert(false, 'unknown app "'..Current_app..'"')

  + end

  + Settings.current_app = Current_app

  + love.filesystem.write('config', json.encode(Settings))

  + -- reboot

  + load_file_from_source_or_save_directory('main.lua')

  + App.undo_initialize()

  + App.run_tests_and_initialize()

  + return
• edit in main.lua at line 266
  [4.268]→[2.78:78](∅→∅),[4.188051]→[3.450:485](∅→∅),[4.188051]→[3.450:485](∅→∅),[4.188051]→[3.450:485](∅→∅)
  −

  − Last_focus_time = Current_time
• resolve order conflict in main.lua at line 266
  [4.268]