resolve conflicts

akkartik

Jun 11, 2025, 5:24 AM

AI7XEI4MUWUOJUPGXBSZUBRN5IKXVXLCHLSPU2QBE5WBONGTOZAQC

Dependencies

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

Change contents

file deletion: conf.lua (----------)conf.lua.T42Y5MLOV7WMU (----------)

[4.2]→[4.0:32](∅→∅),[4.32]→[4.33:33](∅→∅),[4.2]→[3.18:64](∅→∅),[3.64]→[4.33:33](∅→∅)

function love.conf(t)
t.identity = 'template-live-editor-mobile'
end