resolve conflicts

akkartik

Sep 11, 2024, 3:05 AM

QXXISTGENW6IG3HW4LMQJEC55OPJ3BP6JT5MRKYZJA4USZKC6HAAC

Dependencies

• [2] GVJEOWYQ resolve conflicts
• [3] QUCBJJSU don't always pop up keyboard on mobile devices
• [4] EPRDIYDA bugfix in source editor
• [5] RSZD5A7G forgot to add json.lua
• [6] TLOAPLBJ add a license
• [7] LXTTOB33 extract a couple of files
• [8] KKMFQDR4 editing source code from within the app
• [9] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [10] ZLJYLPOT Merge lines.love
• [11] OB5XOXVC deemphasize the source editor
• [12] TOXPJJYY resolve conflicts
• [13] R5QXEHUI somebody stop me
• [14] K2X6G75Z start writing some tests for drawings
• [15] KMSL74GA support selections in the source editor
• [16] R2ASHK5C fix a bad merge
• [17] KG7YVGVR Merge lines.love
• [18] CE4LZV4T drop last couple of manual tests
• [19] ORKN6EOB Merge lines.love
• [20] TVCPXAAU rename
• [21] VXORMHME delete experimental REPL
• [22] VP5KC4XZ Merge lines.love
• [23] SGMA5JLE save the list of tests in repo
• [24] FS2ITYYH record a known issue
• [25] VHQCNMAR several more modules
• [26] FBBHEUQN resolve conflicts
• [27] D2GCFTTT clean up repl functionality
• [28] VHUNJHXB Merge lines.love
• [29] 4SR3Z4Y3 document the version of LÖVE I've been using
• [30] CRBLAWBO resolve conflicts
• [31] ZQDQLLCL bugfix
• [32] N2NUGNN4 include a brief reference enabling many useful apps
• [33] 6VJTQKW7 start supporting LÖVE v12
• [34] BLWAYPKV extract a module
• [35] BULPIBEG beginnings of a module for the text editor
• [36] 73OCE2MC after much struggle, a brute-force undo
• [37] MKPXANB5 bugfix: mouse clicks on file navigator above log browser side
• [38] MBAJPTDJ resolve conflicts
• [39] RXMHAZ6V resolve conflicts
• [40] XX7G2FFJ intermingle freehand line drawings with text
• [41] 2L5MEZV3 experiment: new edit namespace
• [42] OI4FPFIN support drawings in the source editor
• [43] 3PSFWAIL Merge lines.love
• [44] JZR3QMTN Merge lines.love
• [45] ATQO62TF Merge lines.love
• [46] KYNGDE2C consistent names in a few more places
• [47] GX236KZG Revert "deemphasize the source editor"
• [48] 66X36NZN a little more prose describing manual_tests
• [49] 3QNOKBFM beginnings of a test harness
• [50] QMRQL2FO resolve conflicts
• [51] JOPVPUSA editing source code from within the app
• [52] LWPFEZBI Merge lines.love
• [53] 4YDBYBA4 clean up memory leak experiments
• [54] ED4Z6ORC cleaner API for file-system access
• [55] 6LJZN727 handle chords
• [56] T4FRZSYL delete an ancient, unused file
• [57] TBTRYEBP Merge lines.love
• [58] AVTNUQYR basic test-enabled framework
• [59] OGUV4HSA remove some memory leaks from rendered fragments
• [60] OTIBCAUJ love2d scaffold
• [61] KKQKPGCI resolve conflicts
• [62] 2CTN2IEF Merge lines.love

Change contents

• file deletion: source.lua (----------)source.lua (----------)
  [5.2]→[5.177652:177686](∅→∅),[5.2]→[5.177652:177686](∅→∅),[5.177686]→[5.165766:165766](∅→∅)
  − love.keyboard.setTextInput(true) -- bring up keyboard on touch screen

  − --? print('mouse click', x, y)

  − --? print(Editor_state.left, Editor_state.right)

  − --? print(Log_browser_state.left, Log_browser_state.right)
• file deletion: run.lua (----------)run.lua (----------)
  [5.2]→[5.184046:184077](∅→∅),[5.2]→[5.184046:184077](∅→∅),[5.184077]→[5.178044:178044](∅→∅)
  − love.keyboard.setTextInput(true) -- bring up keyboard on touch screen

  − return edit.mouse_press(Editor_state, x,y, mouse_button)
• edit in source_edit.lua at line 237
  [5.5615]→[2.12:85](∅→∅)
  − love.keyboard.setTextInput(true) -- bring up keyboard on touch screen
• edit in source.lua at line 288
  [5.174756]

  [5.174756]
  + love.keyboard.setTextInput(true) -- bring up keyboard on touch screen
• edit in run.lua at line 171
  [5.182946]

  [5.61]
  + love.keyboard.setTextInput(true) -- bring up keyboard on touch screen
• edit in edit.lua at line 149
  [5.1822]→[2.103:176](∅→∅)
  − love.keyboard.setTextInput(true) -- bring up keyboard on touch screen