resolve conflicts

akkartik

Aug 16, 2025, 10:07 PM

JYXWR7VK66OTBGXTN3BINCP57QBDSEQQHZFFW43VNCXZGL2T5WSQC

Dependencies

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

Change contents

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

[5.2]→[5.18:64](∅→∅),[5.2]→[5.0:32](∅→∅),[5.32]→[5.33:33](∅→∅),[5.2]→[5.18:64](∅→∅),[5.64]→[5.33:33](∅→∅)

t.window.usedpiscale = false
end
edit in conf.lua at line 3

[2.50]

[2.50]

t.window.usedpiscale = false