resolve conflicts

akkartik

Dec 12, 2024, 7:33 AM

ME5XRPZPAJJRBAMBUTJ23QAJCCFTOLXCTY5BRCQZYMXYBSCFIFYQC

Dependencies

• [2] GVOLLPQF bugfix: initial textinput event on iOS
• [3] 27JP3RRT resolve conflicts
• [4] LPOO23FQ resolve conflicts
• [5] 3CMM7CXD resolve conflicts
• [6] 7EJUTFDQ wire up touch handlers
• [7] ORKN6EOB Merge lines.love
• [8] 36Z442IV back to commit 8123959e52f without code editing
• [9] Z2XCPTSM initialize Error_message with everything else
• [10] T7QIIGQ6 attempt at better error recovery
• [11] 75BKRBP3 more reliable textinput events on iOS
• [12] 6HDECB5Y fix a regression 2 commits ago
• [13] 442XD5KJ merge bugfix
• [14] RHARLLIQ Merge text0
• [15] JYAEYMKZ get rid of a special case
• [16] F2P336NO resolve conflicts
• [17] DKDZZ6VU resolve conflicts
• [18] JOPVPUSA editing source code from within the app
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 20
  [6.120]→[3.11:11](∅→∅),[6.120]→[3.11:11](∅→∅),[3.11]→[6.0:128](∅→∅),[6.195]→[6.0:128](∅→∅),[6.195]→[6.0:128](∅→∅)
  −

  − -- Available modes: run, error

  − if Mode == nil then -- might have already been initialized elsewhere

  − Mode = 'run'

  − end
• edit in main.lua at line 203
  [4.311]→[4.311:348](∅→∅)
  − if Mode == 'error' then return end
• resurrect zombie in main.lua at line 238
  [6.1203]→[2.27:228](∅→∅),[6.1203]→[2.27:228](∅→∅)
  + if OS == 'iOS' then

  + love.keyboard.setTextInput(true) -- magic. iOS is prone to losing textinput events.

  + -- https://github.com/love2d/love/issues/1959

  + end