resolve conflicts

akkartik

Jan 22, 2024, 4:25 PM

BTMACW42PWH7OJ6QVZNOQ4VYNL63JRVCNXDIMTBJ2QKKYQAP7QEAC

Dependencies

• [2] RBWTXOQS get rid of example screens
• [3] Q4CJ4WWU switch to a single global output editor
• [4] C6YRDNPE use available abbreviations in example
• [5] AZMYKWMH resolve conflicts
• [6] MMNPQU6X delete some unused code
• [7] KJLZCK2R resolve conflicts
• [8] VEAVIL4X resize handler
• [9] OTIBCAUJ love2d scaffold
• [10] RU4HIK43 Merge lines.love
• [11] 4SR3Z4Y3 document the version of LÖVE I've been using
• [12] IP4LD33D mouse events for scrollbar
• [13] 2L5MEZV3 experiment: new edit namespace
• [14] VLTU33KW resolve conflicts
• [15] UUAIVZ4U 2 bugfixes in font rendering
• [16] OL7ZCZWD Merge text.love
• [17] URM35DJS rip out the canvas
• [18] D2GCFTTT clean up repl functionality
• [19] CZQ3NJ4N Merge text0
• [20] CAG7PP5Y Merge text.love
• [21] 6VJTQKW7 start supporting LÖVE v12
• [22] SGMA5JLE save the list of tests in repo
• [23] AVTNUQYR basic test-enabled framework
• [24] 2Q437U4F starting to experiment with animated pane transitions
• [25] 4YDBYBA4 clean up memory leak experiments
• [26] OGUV4HSA remove some memory leaks from rendered fragments
• [27] MZ3DMYPD start sketching out a scrollbar
• [28] YV2GBDNW preserve settings across restart
• [29] 4GX6NAY4 some very basic animations for switching panes
• [30] VSGPLJFA resolve conflicts
• [31] ED4Z6ORC cleaner API for file-system access
• [32] ZLJYLPOT Merge lines.love
• [33] 6MQCFHXM remember when someone deletes an example
• [34] YT7NMQ6Z delete dead code
• [35] SIASJPGR save the list of open files across restart
• [36] PUXFYOQ4 rename a function
• [37] CMZDG7CJ bugfix: tapping in scrollbar area
• [38] KKQKPGCI resolve conflicts
• [39] QMRQL2FO resolve conflicts
• [40] 5RUFNRJO start of the visual skeleton
• [41] VHQCNMAR several more modules
• [42] GVX7YSQY initial script after splitting up text-zoom
• [43] GWLETNMW Mike's suggested button layout
• [44] TLOAPLBJ add a license
• [45] LWPFEZBI Merge lines.love
• [46] UEG224LH debug animations
• [47] 47VXAH2H delete some old code
• [48] E75L5QGU ok/cancel buttons in file dialog
• [49] WR2WMEPE implement 'Run' button
• [50] G42WRYFR new handler: mousemoved
• [51] I2YECDRF decouple menu font from output buffer
• [52] HVXZLNCC send errors from event handlers to output editor
• [53] MJ6KKFVT give example panes a name
• [54] LRDM35CE app running again
• [55] OGDDLU5B close all menus when tapping any button
• [56] I27BLL75 new car.quit callback for user scripts
• [57] 73OCE2MC after much struggle, a brute-force undo
• [58] 6RYGW5H3 bugfix: output border color
• [59] R5QXEHUI somebody stop me
• [60] Z5M23NTK implement second, 'output' editor
• [61] ESOJS6ZW extract a function
• [62] VHUNJHXB Merge lines.love
• [63] OTJQKAQZ bugfix: update output font (and menus)
• [64] 4QFVRJ5U get rid of pane transition animations
• [65] D43U7GQ4 alter on-disk representation (manifest files)
• [66] OE26XIQO bring back syntax highlighting (but so ugly)
• [67] NVZTMKER partition handlers between screen regions
• [68] VP5KC4XZ Merge lines.love
• [69] 2CFLXLIE Merge text.love
• [70] BULPIBEG beginnings of a module for the text editor
• [71] SIJ5I4NZ extract a helper for buttons
• [72] CE4LZV4T drop last couple of manual tests
• [73] 36Z442IV back to commit 8123959e52f without code editing
• [74] LGIEVJE6 activate buttons for some time
• [75] 5MEJ7XNH lay out buttons based on device dimensions
• [76] X2YWEIZS bugfix: missing variable in a button
• [77] TBTRYEBP Merge lines.love
• [78] JV27LDDK sliders for font size and color settings
• [79] VUF2SX7B implement carousel buttons for inserting/switching current pane
• [80] EZHO4TSW new file-system format for freewheeling apps
• [81] VAVXKWZV aggregate global state inside a 'pane' object
• [82] 5OVKHVY6 nice way to make on.* handlers more discoverable
• [83] K2X6G75Z start writing some tests for drawings
• [84] VXRYVZ74 Merge text.love
• [85] 72OBZ3VM bundle support for .wav files
• [86] ZM7NOBRM new fork: carousel shell
• [87] JOPVPUSA editing source code from within the app
• [88] OOSUBWKX subject people to a tutorial
• [89] W3RRTO4P extract a second helper for buttons
• [90] LXR2FNDC resolve conflicts
• [91] ADXY3K5Z wire up new-style car.* handlers
• [92] VQYLKEGD handle still narrower screens on phones
• [93] T4FRZSYL delete an ancient, unused file
• [94] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [95] OC4P6P36 greatly simplify slider implementation
• [96] QLJY3CKC bugfix: use border color in scrollbars
• [97] ORKN6EOB Merge lines.love
• [98] LXTTOB33 extract a couple of files
• [99] RJPNFXVQ new fork: a personal dashboard for mobile devices
• [100] BLWAYPKV extract a module
• [101] FM5LDKGT Merge text.love
• [102] ROYQO45B mount old location of screens if possible
• [103] PJ5PQAQE record support for multiple versions
• [104] 6LJZN727 handle chords
• [105] TFUNIT6M resolve conflicts
• [106] I52S4E5F running `print` now appends to output editor
• [107] TOXPJJYY resolve conflicts
• [108] VVGWHJBZ fix app identity so successive versions share data
• [109] FIUQJVL2 first draft of load/save buttons
• [110] SW5GN5LP suggest a default layout for freewheeling apps
• [111] 5LN2NUSE resolve conflicts
• [112] 6DJMOJKE support event handlers
• [113] W4EQ6IW4 simplify state management for menus
• [114] KMSL74GA support selections in the source editor
• [115] PN6VP3LV escape hatch when print is overridden
• [116] RK2ASPN7 add lots of buttons to the toolbar
• [117] 6RYG2FQJ switch all handlers to run either the app or editor
• [118] FS2ITYYH record a known issue
• [119] 2DVVKKVA flesh out Readme
• [120] 57HKHZ7Z include the tool that's mentioned in representation.md
• [121] 3QNOKBFM beginnings of a test harness
• [122] 66X36NZN a little more prose describing manual_tests
• [123] Q6RXCILQ Merge text.love
• [124] PRE6XPRN responsively increase/decrease font height
• [125] RSZD5A7G forgot to add json.lua
• [126] 3DRVHB7C run script on startup; new button to switch to source editor
• [127] LRG2TNA7 screens now run
• [128] KKMFQDR4 editing source code from within the app
• [129] VXORMHME delete experimental REPL
• [130] TVCPXAAU rename
• [131] XX7G2FFJ intermingle freehand line drawings with text
• [132] ZENSSO3D pass remaining love handlers through
• [133] 3PSFWAIL Merge lines.love
• [134] XIFRMKAL some larger examples using shared abbreviations
• [135] SJXIMERS type out a filename to load/save
• [136] YEANRUAF clean up the examples and fix a bug
• [137] N2NUGNN4 include a brief reference enabling many useful apps

Change contents

• file deletion: 0106-stop_button (----------)0106-stop_button (----------)
  [6.2]→[6.0:40](∅→∅),[6.2]→[6.0:40](∅→∅),[6.40]→[6.41:41](∅→∅)
  − local w = Font:getWidth('stop')+10

  − end

  − return x+w+10, y
• file deletion: 0078-Example_panes (----------)0078-Example_panes (----------)
  [6.2]→[6.1671:1713](∅→∅),[6.2]→[6.1671:1713](∅→∅),[6.1713]→[6.1:1](∅→∅)
  − ' for _,id in ipairs(touches()) do',

  − ' local x,y = touch(id)',

  − ' if trails[id] then',

  − ' table.insert(trails[id], 1, {x=x, y=y, r=100})',

  − 'end end',

  − ' for id,trail in pairs(trails) do',

  − ' for i=#trail,1,-1 do',

  − ' local c = trail[i]',

  − ' c.r = c.r - 10',

  − ' if c.r <= 0 then table.remove(trail, i) end',

  − ' end',

  − ' if #trail == 0 then trails[id] = nil end',

  − ' end',

  − 'end',

  − '',

  − 'function car.touchpressed(id, x,y, ...)',

  − ' trails[id] = {r=rand(), g=rand(), b=rand()}',

  − 'end',
• edit in 0032-update_font_settings at line 19
  [6.1113]→[5.1246:1319](∅→∅),[6.1113]→[5.1246:1319](∅→∅)
  − edit.update_font_settings(pane.output_editor_state, Font_height, Font)
• edit in 0032-update_font_settings at line 20
  [6.1118]→[3.1182:1243](∅→∅),[6.1118]→[3.1182:1243](∅→∅)
  − edit.update_font_settings(Output_editor_state, Font_height)
• resurrect zombie in 0032-update_font_settings at line 20
  [3.1243]→[3.1243:1267](∅→∅),[3.1243]→[3.1243:1267](∅→∅)
  + update_output_editor()
• edit in 0032-update_font_settings at line 20
  [6.1118]

  [3.1243]
  + edit.update_font_settings(Output_editor_state, Font_height, Font)
• edit in 0032-update_font_settings at line 22
  [6.1118]→[5.1320:1324](∅→∅)
  − end
• resolve order conflict in 0032-update_font_settings at line 22
  [3.1267]
• edit in 0032-update_font_settings at line 22
  [0.203]
  + end
• edit in 0021-draw_menu at line 14
  [6.313]→[5.1487:1560](∅→∅),[6.313]→[5.1487:1560](∅→∅)
  − local w = Font:getWidth('code')+10

  − local w2 = Font:getWidth('>>')+10
• edit in 0021-draw_menu at line 18
  [6.4651]→[5.1561:1636](∅→∅),[6.4651]→[5.1561:1636](∅→∅)
  − local w = Font:getWidth('screen')+10

  − local w2 = Font:getWidth('>>')+10
• replacement in 0021-draw_menu at line 30
  [6.5795]→[5.1637:1641](∅→∅)
  − end
  [6.5795]
  + end