resolve conflicts

akkartik

Nov 17, 2024, 1:19 AM

RIJI7U3QDJV6HAACHR5XOTFJRHTD2MLOYWI7UCQZ4OHULRGHQGIQC

Dependencies

[2] BWZW73XT unstash a stashed file
[3] GO2QWWUI pad out overflow buttons to prevent fat fingering
[4] 7XEHYCLT mark buffer as unsaved after clear
[5] ZDDB4DUM order copy and paste buttons correctly
[6] VP5KC4XZ Merge lines.love
[7] E75L5QGU ok/cancel buttons in file dialog
[8] CZQ3NJ4N Merge text0
[9] CZ6X73VY merge bugfix
[10] W4EQ6IW4 simplify state management for menus
[11] OC4P6P36 greatly simplify slider implementation
[12] OGUV4HSA remove some memory leaks from rendered fragments
[13] KKQKPGCI resolve conflicts
[14] Q4CJ4WWU switch to a single global output editor
[15] AZMYKWMH resolve conflicts
[16] 36Z442IV back to commit 8123959e52f without code editing
[17] FIUQJVL2 first draft of load/save buttons
[18] TQUPMJPK add numeric suffix to stashed files
[19] QXXISTGE resolve conflicts
[20] SLMSBVJW resolve conflicts
[21] XX7G2FFJ intermingle freehand line drawings with text
[22] D2GCFTTT clean up repl functionality
[23] 6LJZN727 handle chords
[24] K2X6G75Z start writing some tests for drawings
[25] CE4LZV4T drop last couple of manual tests
[26] VAVXKWZV aggregate global state inside a 'pane' object
[27] FLXBLICQ fix a long-standing issue with tooltips
[28] TBTRYEBP Merge lines.love
[29] RK2ASPN7 add lots of buttons to the toolbar
[30] G42WRYFR new handler: mousemoved
[31] DDWCYLPL explicitly state stance on autosave
[32] D43U7GQ4 alter on-disk representation (manifest files)
[33] URM35DJS rip out the canvas
[34] T4FRZSYL delete an ancient, unused file
[35] ZLJYLPOT Merge lines.love
[36] 6MQCFHXM remember when someone deletes an example
[37] 2KACFSV7 bugfix: print(nil)
[38] KKMFQDR4 editing source code from within the app
[39] W3RRTO4P extract a second helper for buttons
[40] ED4Z6ORC cleaner API for file-system access
[41] WICFZ4UZ 'clear' button now clears the entire pane
[42] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[43] VHUNJHXB Merge lines.love
[44] CAG7PP5Y Merge text.love
[45] UEG224LH debug animations
[46] I52S4E5F running `print` now appends to output editor
[47] NVZTMKER partition handlers between screen regions
[48] LXTTOB33 extract a couple of files
[49] DHPAIM7J resolve conflicts
[50] HVXZLNCC send errors from event handlers to output editor
[51] Z5M23NTK implement second, 'output' editor
[52] 2CFLXLIE Merge text.love
[53] MZ3DMYPD start sketching out a scrollbar
[54] PCHTG7YU resolve conflicts
[55] VXORMHME delete experimental REPL
[56] LRDM35CE app running again
[57] VVGWHJBZ fix app identity so successive versions share data
[58] YT7NMQ6Z delete dead code
[59] MMNPQU6X delete some unused code
[60] VLTU33KW resolve conflicts
[61] FHZ5AG3M resolve conflicts
[62] BULPIBEG beginnings of a module for the text editor
[63] TOXPJJYY resolve conflicts
[64] 2L5MEZV3 experiment: new edit namespace
[65] EZHO4TSW new file-system format for freewheeling apps
[66] HZENSQEQ resolve conflicts
[67] 72OBZ3VM bundle support for .wav files
[68] ADXY3K5Z wire up new-style car.* handlers
[69] 3V2R6YS6 merge bugfix
[70] 6VJTQKW7 start supporting LÖVE v12
[71] RJPNFXVQ new fork: a personal dashboard for mobile devices
[72] OL7ZCZWD Merge text.love
[73] NM2SILGF start implementing stashed files
[74] 5MEJ7XNH lay out buttons based on device dimensions
[75] IP4LD33D mouse events for scrollbar
[76] 6RYGW5H3 bugfix: output border color
[77] VHQCNMAR several more modules
[78] KJLZCK2R resolve conflicts
[79] 375Q6NPJ extract a couple of constants
[80] AVTNUQYR basic test-enabled framework
[81] UUAIVZ4U 2 bugfixes in font rendering
[82] 5RUFNRJO start of the visual skeleton
[83] 3QNOKBFM beginnings of a test harness
[84] 3PSFWAIL Merge lines.love
[85] SIASJPGR save the list of open files across restart
[86] GYFNSF33 new menu option: revert local changes
[87] JIERZ45W resolve conflicts
[88] S7CSVBHZ resolve conflicts
[89] 5OVKHVY6 nice way to make on.* handlers more discoverable
[90] GVX7YSQY initial script after splitting up text-zoom
[91] PUXFYOQ4 rename a function
[92] 4QFVRJ5U get rid of pane transition animations
[93] 57HKHZ7Z include the tool that's mentioned in representation.md
[94] RBWTXOQS get rid of example screens
[95] LRG2TNA7 screens now run
[96] I2YECDRF decouple menu font from output buffer
[97] BLWAYPKV extract a module
[98] 66X36NZN a little more prose describing manual_tests
[99] KMSL74GA support selections in the source editor
[100] RXMHAZ6V resolve conflicts
[101] 4Y2QDDAZ resolve conflicts
[102] ORKN6EOB Merge lines.love
[103] Q3EQI5LI some keyboard shortcuts on non-mobile devices
[104] SIJ5I4NZ extract a helper for buttons
[105] YV2GBDNW preserve settings across restart
[106] VEAVIL4X resize handler
[107] KQ22RW43 resolve conflicts
[108] RLXBO23F swap copy and paste menu buttons
[109] JOPVPUSA editing source code from within the app
[110] 2IJLEJGT indicate local modifications in editor title bar
[111] YR7AXEYB add keyboard shortcuts for common operations
[112] PN6VP3LV escape hatch when print is overridden
[113] VUF2SX7B implement carousel buttons for inserting/switching current pane
[114] WR2WMEPE implement 'Run' button
[115] 2Q437U4F starting to experiment with animated pane transitions
[116] TVCPXAAU rename
[117] SGMA5JLE save the list of tests in repo
[118] R5QXEHUI somebody stop me
[119] OTIBCAUJ love2d scaffold
[120] ZENSSO3D pass remaining love handlers through
[121] BTMACW42 resolve conflicts
[122] N2NUGNN4 include a brief reference enabling many useful apps
[123] 47VXAH2H delete some old code
[124] SW5GN5LP suggest a default layout for freewheeling apps
[125] G6WO7RL4 resolve conflicts
[126] JOY24JW6 indicate local modifications in load/save dialog
[127] SYWQBIO5 resolve conflicts
[128] LWPFEZBI Merge lines.love
[129] MBAJPTDJ resolve conflicts
[130] PRE6XPRN responsively increase/decrease font height
[131] ZM7NOBRM new fork: carousel shell
[132] LGIEVJE6 activate buttons for some time
[133] QLJY3CKC bugfix: use border color in scrollbars
[134] 6RYG2FQJ switch all handlers to run either the app or editor
[135] FS2ITYYH record a known issue
[136] TLOAPLBJ add a license
[137] ROYQO45B mount old location of screens if possible
[138] 73OCE2MC after much struggle, a brute-force undo
[139] FVXR2WIW 'run_screen' for loading one screen from another
[140] 7LXXQBNE resolve conflicts
[141] GWLETNMW Mike's suggested button layout
[142] 2DVVKKVA flesh out Readme
[143] YRN76EXV load stashed files
[144] CMZDG7CJ bugfix: tapping in scrollbar area
[145] RSZD5A7G forgot to add json.lua
[146] ESOJS6ZW extract a function
[147] QWPQUVBR provide a place to set the font
[148] BH4QJ5CH extract functions for computing editor dimensions
[149] VXRYVZ74 Merge text.love
[150] OOSUBWKX subject people to a tutorial
[151] QSHQIVF3 resolve conflicts
[152] 4GX6NAY4 some very basic animations for switching panes
[153] FMSRUE5S only show tooltips when window in focus
[154] JV27LDDK sliders for font size and color settings
[155] PJ5PQAQE record support for multiple versions
[156] R6MNUXDJ pijul bug
[157] 6DJMOJKE support event handlers
[158] 4YDBYBA4 clean up memory leak experiments
[159] 4SR3Z4Y3 document the version of LÖVE I've been using
[160] 3DRVHB7C run script on startup; new button to switch to source editor
[161] SJXIMERS type out a filename to load/save

Change contents

file deletion: 0075-clear_pane (----------)0075-clear_pane (----------)

[6.2]→[6.904:943](∅→∅),[6.2]→[6.904:943](∅→∅),[6.943]→[6.674:674](∅→∅)

Current_pane.editor_state.next_save = Current_time + 3
edit.clear(Current_pane.output_editor_state)
resurrect zombie in 0021-draw_menu at line 16

[6.4587]→[6.0:29](∅→∅),[6.4587]→[6.0:29](∅→∅),[6.4587]→[6.0:29](∅→∅)

x, y = copy_button(x, y, r)
edit in 0021-draw_menu at line 17

[6.29]

[2.1271]

x, y = paste_button(x, y, r)
edit in 0021-draw_menu at line 41

[6.5795]→[3.1125:1128](∅→∅),[6.29]→[5.0:30](∅→∅),[6.29]→[5.0:30](∅→∅)

end
x, y = paste_button(x, y, r)
resolve order conflict in 0021-draw_menu at line 41

[6.2898]