resolve conflicts

akkartik

Feb 17, 2024, 5:28 AM

GVJEOWYQMHB2YEI5O6YUGHWDNSEINZJY7XM7D5HOFC2MN24J4YRQC

Dependencies

• [2] MBAJPTDJ resolve conflicts
• [3] 2J5CURWY ensure tapping on editor brings up soft keyboard
• [4] BULPIBEG beginnings of a module for the text editor
• [5] OI4FPFIN support drawings in the source editor
• [6] TVCPXAAU rename
• [7] K2X6G75Z start writing some tests for drawings
• [8] TBTRYEBP Merge lines.love
• [9] XX7G2FFJ intermingle freehand line drawings with text
• [10] KMSL74GA support selections in the source editor
• [11] 3QNOKBFM beginnings of a test harness
• [12] SGMA5JLE save the list of tests in repo
• [13] AVTNUQYR basic test-enabled framework
• [14] 73OCE2MC after much struggle, a brute-force undo
• [15] 6VJTQKW7 start supporting LÖVE v12
• [16] D2GCFTTT clean up repl functionality
• [17] YXQOITYS Merge lines.love
• [18] WKXJNESI resolve conflicts
• [19] ONHKBLLC Merge lines.love
• [20] REAIVN7W Merge lines.love
• [21] R5QXEHUI somebody stop me
• [22] ED4Z6ORC cleaner API for file-system access
• [23] VP5KC4XZ Merge lines.love
• [24] N2NUGNN4 include a brief reference enabling many useful apps
• [25] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [26] 66X36NZN a little more prose describing manual_tests
• [27] 7YGYHOEO Merge lines.love
• [28] TOXPJJYY resolve conflicts
• [29] 4YDBYBA4 clean up memory leak experiments
• [30] VHQCNMAR several more modules
• [31] ORKN6EOB Merge lines.love
• [32] LIKTH6HM update stale source X-(
• [33] JOPVPUSA editing source code from within the app
• [34] 3XNFQDDN Merge lines.love
• [35] 2CTN2IEF Merge lines.love
• [36] TFUNIT6M resolve conflicts
• [37] T4FRZSYL delete an ancient, unused file
• [38] OGUV4HSA remove some memory leaks from rendered fragments
• [39] R2ASHK5C fix a bad merge
• [40] CE4LZV4T drop last couple of manual tests
• [41] BLWAYPKV extract a module
• [42] LDFXFRUO bring a few things in sync between run and source
• [43] 2TQUKHBC Merge lines.love
• [44] Z3TDYADA mouse button state in source editor
• [45] 5SM6DRHK port inscript's bugfix to source editor
• [46] OTIBCAUJ love2d scaffold
• [47] KKQKPGCI resolve conflicts
• [48] KYNGDE2C consistent names in a few more places
• [49] QMRQL2FO resolve conflicts
• [50] LXTTOB33 extract a couple of files
• [51] 3MJ2PYMW resolve conflicts
• [52] FS2ITYYH record a known issue
• [53] KKMFQDR4 editing source code from within the app
• [54] 3PSFWAIL Merge lines.love
• [55] TLOAPLBJ add a license
• [56] LNUHQOGH start passing in Editor_state explicitly
• [57] VHUNJHXB Merge lines.love
• [58] 4SR3Z4Y3 document the version of LÖVE I've been using
• [59] NBTKJTI5 resolve conflicts
• [60] VXORMHME delete experimental REPL
• [61] 6LJZN727 handle chords
• [62] ZLJYLPOT Merge lines.love
• [63] RSZD5A7G forgot to add json.lua
• [64] 2L5MEZV3 experiment: new edit namespace
• [65] LWPFEZBI Merge lines.love

Change contents

• file deletion: source_edit.lua (----------)source_edit.lua (----------)
  [4.2]→[4.165725:165764](∅→∅),[4.2]→[4.165725:165764](∅→∅),[4.165764]→[4.152440:152440](∅→∅)
  − love.keyboard.setTextInput(true) -- bring up keyboard on touch screen

  − if State.search_term then return end
• edit in source_edit.lua at line 241
  [4.5615]

  [4.157175]
  + love.keyboard.setTextInput(true) -- bring up keyboard on touch screen
• edit in edit.lua at line 155
  [4.1822]

  [4.1822]
  + love.keyboard.setTextInput(true) -- bring up keyboard on touch screen
• edit in edit.lua at line 457
  [4.12430]→[2.5247:5247](∅→∅),[4.721]→[3.74:147](∅→∅),[4.721]→[3.74:147](∅→∅)
  −

  − love.keyboard.setTextInput(true) -- bring up keyboard on touch screen
• resolve order conflict in edit.lua at line 457
  [4.12430]