resolve conflicts

akkartik

Sep 11, 2024, 3:26 AM

7LXXQBNEBHSY34L4JBNKXA77CPFJEP2TWMK6B26BBNAMXVCXOMWAC

Dependencies

• [2] 2RWR3GM4 another missed rename
• [3] KJLZCK2R resolve conflicts
• [4] QXXISTGE resolve conflicts
• [5] 2CTN2IEF Merge lines.love
• [6] AFDLKNAP resolve conflicts
• [7] YGCT2D2O start loading settings as applicable
• [8] BULPIBEG beginnings of a module for the text editor
• [9] ORKN6EOB Merge lines.love
• [10] BLWAYPKV extract a module
• [11] QD4LOFQR Merge text.love
• [12] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [13] ATQO62TF Merge lines.love
• [14] KG7YVGVR Merge lines.love
• [15] VXORMHME delete experimental REPL
• [16] ED4Z6ORC cleaner API for file-system access
• [17] R5QXEHUI somebody stop me
• [18] 3QNOKBFM beginnings of a test harness
• [19] 36Z442IV back to commit 8123959e52f without code editing
• [20] TWGLHVSY Merge text.love
• [21] JZR3QMTN Merge lines.love
• [22] 6VJTQKW7 start supporting LÖVE v12
• [23] Z2VZTIXY redo version checks
• [24] KQ22RW43 resolve conflicts
• [25] R6MNUXDJ pijul bug
• [26] T4FRZSYL delete an ancient, unused file
• [27] D2GCFTTT clean up repl functionality
• [28] VXRYVZ74 Merge text.love
• [29] 75O55MGV disable vsync
• [30] TOXPJJYY resolve conflicts
• [31] VHUNJHXB Merge lines.love
• [32] 2CFLXLIE Merge text.love
• [33] N2NUGNN4 include a brief reference enabling many useful apps
• [34] VHQCNMAR several more modules
• [35] SGMA5JLE save the list of tests in repo
• [36] XX7G2FFJ intermingle freehand line drawings with text
• [37] CE4LZV4T drop last couple of manual tests
• [38] KMSL74GA support selections in the source editor
• [39] EKJUHVHB hoist out some common settings
• [40] TBTRYEBP Merge lines.love
• [41] CAG7PP5Y Merge text.love
• [42] MBAJPTDJ resolve conflicts
• [43] VP5KC4XZ Merge lines.love
• [44] TVCPXAAU rename
• [45] 4SR3Z4Y3 document the version of LÖVE I've been using
• [46] K2X6G75Z start writing some tests for drawings
• [47] C3GUE45I Merge text.love
• [48] 4Y2QDDAZ resolve conflicts
• [49] VLTU33KW resolve conflicts
• [50] FS2ITYYH record a known issue
• [51] JRETETTL Merge lines.love
• [52] VSGPLJFA resolve conflicts
• [53] QUCBJJSU don't always pop up keyboard on mobile devices
• [54] 3PSFWAIL Merge lines.love
• [55] HOUCPP7P Merge text.love
• [56] 6LJZN727 handle chords
• [57] KKMFQDR4 editing source code from within the app
• [58] 2L5MEZV3 experiment: new edit namespace
• [59] CZ6X73VY merge bugfix
• [60] 73OCE2MC after much struggle, a brute-force undo
• [61] CRBLAWBO resolve conflicts
• [62] ZLJYLPOT Merge lines.love
• [63] KKQKPGCI resolve conflicts
• [64] TLOAPLBJ add a license
• [65] PJ5PQAQE record support for multiple versions
• [66] YDUIKWSF Merge text.love
• [67] LXTTOB33 extract a couple of files
• [68] LWPFEZBI Merge lines.love
• [69] JOPVPUSA editing source code from within the app
• [70] WZZLGNXE correct comment; vsync is hard to reason about
• [71] RXMHAZ6V resolve conflicts
• [72] FBBHEUQN resolve conflicts
• [73] PWCZAAMT no, turn vsync back on
• [74] 2ZCXBDLY Merge text.love
• [75] AVTNUQYR basic test-enabled framework
• [76] OGUV4HSA remove some memory leaks from rendered fragments
• [77] OTIBCAUJ love2d scaffold
• [78] RSZD5A7G forgot to add json.lua
• [79] 4YDBYBA4 clean up memory leak experiments
• [80] ULKNZUZK resolve conflicts
• [81] 66X36NZN a little more prose describing manual_tests

Change contents

• file deletion: source.lua (----------)source.lua (----------)
  [5.2]→[5.177715:177749](∅→∅),[5.2]→[5.177715:177749](∅→∅),[5.177749]→[5.165829:165829](∅→∅)
  − 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.183867:183898](∅→∅),[5.2]→[5.183867:183898](∅→∅),[5.183898]→[5.178107:178107](∅→∅)
  − love.keyboard.setTextInput(true) -- bring up keyboard on touch screen

  − return edit.mouse_press(Editor_state, x,y, mouse_button)
• edit in main.lua at line 43
  [5.75]→[5.2351:2424](∅→∅),[5.187143]→[5.2351:2424](∅→∅)
  − love.keyboard.setTextInput(true) -- bring up keyboard on touch screen
• edit in main.lua at line 221
  [5.6894]

  [2.8]
  + love.keyboard.setTextInput(true) -- bring up keyboard on touch screen