pijul nest
guest › [sign in] [explore]

resolve conflicts

akkartik
May 14, 2025, 5:12 AM
636S4NZRS3MO6QRVRHH7I6Y7AZWIJH7UIQGSZS4LR6XYXK4JNXHAC

Dependencies

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

Change contents

  • file deletion: conf.lua (----------)
    [3.2]→[3.0:32](∅→∅),[3.32]→[3.33:33](∅→∅)
    function love.conf(t)
    t.identity = 'template-live-editor-mobile'
    end