resolve conflicts

akkartik

Dec 2, 2023, 6:18 AM

3MJ2PYMWBB37OY3DQ3P6M3CUTJD2ILOR6AWXF2366TZ67B62SB2QC

Dependencies

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

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](∅→∅)
  − State.mouse_down = mouse_button

  − State.mouse_down = nil

  − if State.lines.current_drawing then

  − --? print_and_log(('edit.mouse_press: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))
• edit in source_edit.lua at line 240
  [4.157214]

  [4.4467]
  + State.mouse_down = mouse_button
• edit in source_edit.lua at line 305
  [4.5375]

  [4.20897]
  + State.mouse_down = nil