From 554b344ae0b23ced48e44d6ff8bd66d77b7ebe7f Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Thu, 21 Nov 2019 00:23:07 +0100 Subject: [PATCH 01/22] First steps towards OlympUI --- .gitmodules | 3 + src/conf.lua | 2 +- src/scenes/editor.lua | 86 +++++++++++++++++++++++++++++ src/structs/smart_drawing_batch.lua | 7 ++- src/ui | 1 + 5 files changed, 97 insertions(+), 2 deletions(-) create mode 160000 src/ui diff --git a/.gitmodules b/.gitmodules index 1f02c629..c167d5a2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = src/selene url = https://github.com/Vexatos/Selene.git branch = mathemagics-5.1 +[submodule "src/ui"] + path = src/ui + url = https://github.com/EverestAPI/OlympUI.git diff --git a/src/conf.lua b/src/conf.lua index dec52ba7..dc4c6a49 100644 --- a/src/conf.lua +++ b/src/conf.lua @@ -7,5 +7,5 @@ function love.conf(t) t.window.icon = "assets/logo-256.png" - t.window.vsync = true + t.window.vsync = false end \ No newline at end of file diff --git a/src/scenes/editor.lua b/src/scenes/editor.lua index 5bc7f57d..5767d31d 100644 --- a/src/scenes/editor.lua +++ b/src/scenes/editor.lua @@ -12,6 +12,92 @@ function editorScene:firstEnter() local inputDevice = require("input_device") local standardHotkeys = require("standard_hotkeys") + local ui = require("ui") + local uie = require("ui.elements") + local uiu = require("ui.utils") + + --[[ + uiu.hook(uie.__label.__default, { + calcWidth = (orig, ... -> orig(...) * 3), + calcHeight = (orig, ... -> orig(...) * 3), + + draw = function(orig, self, ...) + love.graphics.setColor(self.style.color) + love.graphics.draw(self._text, self.screenX, self.screenY, 0, 3, 3) + end, + }) + --]] + uie.__label.__default.style.font = love.graphics.newFont(16) + + local root = uie.group({ + uie.row():with({ + style = { + focusedBG = { 0.4, 0.4, 0.4, 0.25 }, + unfocusedBG = { 0.2, 0.2, 0.2, 0.3 } + }, + onDrag = uiu.nop, + root = true + }):with(uiu.fillWidth), + + uie.window("Windowception", + uie.scrollbox( + uie.group({ + uie.window("Child 1", uie.column({ uie.label("Oh no") })):with({ x = 10, y = 10}), + uie.window("Child 2", uie.column({ uie.label("Oh no two") })):with({ x = 30, y = 30}) + }):with({ width = 200, height = 400 }) + ):with({ width = 200, height = 200 }) + ):with({ x = 50, y = 100 }), + + uie.window("Hello, World!", + uie.column({ + uie.label("This is a one-line label."), + + -- Labels use Löve2D Text objects under the hood. + uie.label({ { 1, 1, 1 }, "This is a ", { 1, 0, 0 }, "colored", { 0, 1, 1 }, " label."}), + + -- Multi-line labels aren't subjected to the parent element's spacing property. + uie.label("This is a two-line label.\nThe following label is updated dynamically."), + + -- Dynamically updated label. + uie.label():as("info"), + + uie.button("This is a button.", function(btn) + if btn.counter == nil then + btn.counter = 0 + end + btn.counter = btn.counter + 1 + btn.text = "Pressed " .. tostring(btn.counter) .. " time" .. (btn.counter == 1 and "" or "s") + end), + + uie.button("Disabled"):with({ enabled = false }), + + uie.button("Useless"), + + uie.label("Select an item from the list below."):as("selected"), + uie.list(uiu.map(uiu.listRange(1, 3), function(i) + return { text = string.format("Item %i!", i), data = i } + end), function(list, item) + list.parent._selected.text = "Selected " .. tostring(item) + end) + + }) + ):with({ x = 200, y = 50 }):as("test"), + }):with({ + style = { + bg = { bg = {} }, + padding = 0, + spacing = 0, + radius = 0 + }, + clip = false, + cacheable = false + }) + + ui.init(root, false) + inputDevice.newInputDevice(self.inputDevices, ui) + + self.ui = ui + local viewportHandler = require("viewport_handler") local hotkeyHandler = require("hotkey_handler") local mapLoaderDevice = require("input_devices.map_loader") diff --git a/src/structs/smart_drawing_batch.lua b/src/structs/smart_drawing_batch.lua index bc44be39..e9a13459 100644 --- a/src/structs/smart_drawing_batch.lua +++ b/src/structs/smart_drawing_batch.lua @@ -243,8 +243,10 @@ end local function clearCanvasArea(batch, x, y) local sectionX, sectionY, cellWidth, cellHeight = getSectionStart(batch, x, y) + local previousScissorX, previousScissorY, previousScissorW, previousScissorH = love.graphics.getScissor() love.graphics.setScissor(sectionX, sectionY, cellWidth, cellHeight) love.graphics.clear(0.0, 0.0, 0.0, 0.0) + love.graphics.setScissor(previousScissorX, previousScissorY, previousScissorW, previousScissorH) end -- Assumes Canvas is set for performance reasons @@ -263,8 +265,10 @@ local function redrawCanvasArea(batch, x, y, meta, quad, drawX, drawX, drawY, ro local offsetX = ox or ((jx or 0.0) * meta.realWidth + meta.offsetX) local offsetY = oy or ((jy or 0.0) * meta.realHeight + meta.offsetY) + local previousScissorX, previousScissorY, previousScissorW, previousScissorH = love.graphics.getScissor() love.graphics.setScissor(sectionX, sectionY, cellWidth, cellHeight) love.graphics.clear(0.0, 0.0, 0.0, 0.0) + love.graphics.setScissor(previousScissorX, previousScissorY, previousScissorW, previousScissorH) love.graphics.draw(meta.image, quad, sectionX, sectionY, rot or 0, sx or 1, sy or 1, offsetX, offsetY) end @@ -309,6 +313,7 @@ end function gridCanvasBatchMt.__index:updateDirtyRegions() if #self._dirtyDrawCells > 0 or #self._dirtyScissorCells > 0 then local previousCanvas = love.graphics.getCanvas() + local previousScissorX, previousScissorY, previousScissorW, previousScissorH = love.graphics.getScissor() love.graphics.push() love.graphics.origin() @@ -333,7 +338,7 @@ function gridCanvasBatchMt.__index:updateDirtyRegions() end end - love.graphics.setScissor() + love.graphics.setScissor(previousScissorX, previousScissorY, previousScissorW, previousScissorH) love.graphics.setCanvas(previousCanvas) love.graphics.pop() diff --git a/src/ui b/src/ui new file mode 160000 index 00000000..702af877 --- /dev/null +++ b/src/ui @@ -0,0 +1 @@ +Subproject commit 702af8775fc8e78862fef6c4fca30e8da24eacb6 From e9569e3e07840395151971627fe71802ce7b1f2b Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Thu, 21 Nov 2019 00:44:44 +0100 Subject: [PATCH 02/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index 702af877..f7c54edf 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 702af8775fc8e78862fef6c4fca30e8da24eacb6 +Subproject commit f7c54edf554d66547a88744bb37daea85e7da870 From fe3e10c1b434f92f9956aea50201f13fc27dbd2c Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Thu, 21 Nov 2019 00:58:32 +0100 Subject: [PATCH 03/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index f7c54edf..8592a434 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit f7c54edf554d66547a88744bb37daea85e7da870 +Subproject commit 8592a43480b95c0e249b6f296353f7e50990e310 From 517ee8c3ebcfebfaeb9d26750db49b53f95161fb Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Thu, 21 Nov 2019 14:02:54 +0100 Subject: [PATCH 04/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index 8592a434..c9b7ba97 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 8592a43480b95c0e249b6f296353f7e50990e310 +Subproject commit c9b7ba9771a140953ae0f8b775b2080930cc80df From fe166a0565292d4753e2f6b19312818103161ec8 Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Sat, 23 Nov 2019 01:01:22 +0100 Subject: [PATCH 05/22] Update OlympUI, add top bar --- src/scenes/editor.lua | 52 ++++++++++++++++++++++++++++++++++++------- src/tools/brush.lua | 2 ++ src/ui | 2 +- 3 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/scenes/editor.lua b/src/scenes/editor.lua index 5767d31d..0e46e65d 100644 --- a/src/scenes/editor.lua +++ b/src/scenes/editor.lua @@ -30,14 +30,50 @@ function editorScene:firstEnter() uie.__label.__default.style.font = love.graphics.newFont(16) local root = uie.group({ - uie.row():with({ - style = { - focusedBG = { 0.4, 0.4, 0.4, 0.25 }, - unfocusedBG = { 0.2, 0.2, 0.2, 0.3 } - }, - onDrag = uiu.nop, - root = true - }):with(uiu.fillWidth), + uie.topbar({ + { "File", { + { "New" }, + { }, + { "Open" }, + { "Recent", { + { "Totally" }, + { "Not A Dummy" }, + { "Nested Submenu" } + } }, + { }, + { "Save" }, + { "Save As..." }, + { }, + { "Settings" }, + { }, + { "Quit", (-> love.event.quit()) } + }}, + + { "Edit", { + { "Undo" }, + { "Redo" } + }}, + + { "Map", { + { "Stylegrounds" }, + { "Metadata" }, + { "Save Map Image" } + }}, + + { "Room", { + { "Add" }, + { "Configure" } + }}, + + { "Help", { + { "Update" }, + { "About" } + }}, + + { "Debug", { + { "Uhh" } + }}, + }), uie.window("Windowception", uie.scrollbox( diff --git a/src/tools/brush.lua b/src/tools/brush.lua index 53fd0219..0d9d1b88 100644 --- a/src/tools/brush.lua +++ b/src/tools/brush.lua @@ -83,9 +83,11 @@ function tool.draw() local px, py = viewportHandler.getRoomCoordindates(room) local tx, ty = viewportHandler.pixelToTileCoordinates(px, py) + --[[ local hudText = string.format("Cursor: %s, %s (%s, %s)", tx + 1, ty + 1, px, py) love.graphics.printf(hudText, 20, 120, viewportHandler.viewport.width, "left", 0, fonts.fontScale, fonts.fontScale) + ]]-- viewportHandler.drawRelativeTo(room.x, room.y, function() drawing.callKeepOriginalColor(function() diff --git a/src/ui b/src/ui index c9b7ba97..7434ded0 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit c9b7ba9771a140953ae0f8b775b2080930cc80df +Subproject commit 7434ded01d4cf05a83c8c458f71cf3f740d89073 From 9a14343d3659fee4a7e164d1943bb5de0e957244 Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Sat, 23 Nov 2019 18:36:17 +0100 Subject: [PATCH 06/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index 7434ded0..d6ae82f7 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 7434ded01d4cf05a83c8c458f71cf3f740d89073 +Subproject commit d6ae82f7920db3ba4a33d44f16e3e36bae8d1912 From fdcd89141bd2c4b7caebd5e93800fe9f2a6664f2 Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Mon, 25 Nov 2019 00:17:41 +0100 Subject: [PATCH 07/22] Update OlympUI, add dummy sidebar lists --- src/scenes/editor.lua | 160 ++++++++++++++++++++++++++++++------------ src/ui | 2 +- 2 files changed, 116 insertions(+), 46 deletions(-) diff --git a/src/scenes/editor.lua b/src/scenes/editor.lua index 0e46e65d..72a643bb 100644 --- a/src/scenes/editor.lua +++ b/src/scenes/editor.lua @@ -12,6 +12,10 @@ function editorScene:firstEnter() local inputDevice = require("input_device") local standardHotkeys = require("standard_hotkeys") + local filesystem = require("filesystem") + local loadedState = require("loaded_state") + local fileLocations = require("file_locations") + local ui = require("ui") local uie = require("ui.elements") local uiu = require("ui.utils") @@ -29,20 +33,20 @@ function editorScene:firstEnter() --]] uie.__label.__default.style.font = love.graphics.newFont(16) - local root = uie.group({ + local root = uie.column({ uie.topbar({ { "File", { { "New" }, { }, - { "Open" }, + { "Open", (-> filesystem.openDialog(fileLocations.getCelesteDir(), nil, loadedState.loadFile)) }, { "Recent", { { "Totally" }, { "Not A Dummy" }, { "Nested Submenu" } } }, { }, - { "Save" }, - { "Save As..." }, + { "Save", (-> loadedState.filename and loadedState.saveFile(loadedState.filename)) }, + { "Save As...", (-> loadedState.side and filesystem.saveDialog(loadedState.filename, nil, loadedState.saveFile)) }, { }, { "Settings" }, { }, @@ -75,49 +79,115 @@ function editorScene:firstEnter() }}, }), - uie.window("Windowception", + uie.group({ uie.scrollbox( - uie.group({ - uie.window("Child 1", uie.column({ uie.label("Oh no") })):with({ x = 10, y = 10}), - uie.window("Child 2", uie.column({ uie.label("Oh no two") })):with({ x = 30, y = 30}) - }):with({ width = 200, height = 400 }) - ):with({ width = 200, height = 200 }) - ):with({ x = 50, y = 100 }), - - uie.window("Hello, World!", - uie.column({ - uie.label("This is a one-line label."), - - -- Labels use Löve2D Text objects under the hood. - uie.label({ { 1, 1, 1 }, "This is a ", { 1, 0, 0 }, "colored", { 0, 1, 1 }, " label."}), - - -- Multi-line labels aren't subjected to the parent element's spacing property. - uie.label("This is a two-line label.\nThe following label is updated dynamically."), + uie.list( + uiu.map(uiu.listRange(200, 1, -1), function(i) + return { text = string.format("%i%s", i, i % 7 == 0 and " (something)" or ""), data = i } + end) + ) + ):with({ + calcWidth = (el -> el._inner.width) + }):with(uiu.fillHeight), - -- Dynamically updated label. - uie.label():as("info"), - - uie.button("This is a button.", function(btn) - if btn.counter == nil then - btn.counter = 0 + uie.column({ + uie.listH({ + { "A" }, + { "B" }, + { "C" }, + { "D" }, + { "E" } + }):with(uiu.hook{ + layoutLateLazy = function(orig, el) + local parentWidth = el.parent.innerWidth + if el.width < parentWidth then + el.width = parentWidth + el.innerWidth = parentWidth - el.style.padding * 2 + end + orig(el) end - btn.counter = btn.counter + 1 - btn.text = "Pressed " .. tostring(btn.counter) .. " time" .. (btn.counter == 1 and "" or "s") - end), - - uie.button("Disabled"):with({ enabled = false }), - - uie.button("Useless"), - - uie.label("Select an item from the list below."):as("selected"), - uie.list(uiu.map(uiu.listRange(1, 3), function(i) - return { text = string.format("Item %i!", i), data = i } - end), function(list, item) - list.parent._selected.text = "Selected " .. tostring(item) - end) - - }) - ):with({ x = 200, y = 50 }):as("test"), + }), + + uie.field(""), + + uie.scrollbox( + uie.list( + uiu.map(uiu.listRange(200, 1, -1), function(i) + return { text = string.format("%i%s", i, i % 7 == 0 and " (something)" or ""), data = i } + end) + ):with(uiu.hook{ + layoutLateLazy = function(orig, el) + local parentWidth = el.parent.innerWidth + if el.width < parentWidth then + el.width = parentWidth + el.innerWidth = parentWidth - el.style.padding * 2 + end + orig(el) + end + }) + ):with(uiu.fillHeight(true)) + :with(uiu.hook{ + calcWidth = (orig, el -> el._inner.width), + layoutLateLazy = function(orig, el) + local parentWidth = el.parent.innerWidth + if el.width < parentWidth then + el.width = parentWidth + el.innerWidth = parentWidth - el.style.padding * 2 + end + orig(el) + end + }) + }):with(uiu.fillHeight):with(uiu.rightbound):with({ + style = { + padding = 0 + } + }), + + uie.window("Windowception", + uie.scrollbox( + uie.group({ + uie.window("Child 1", uie.column({ uie.label("Oh no") })):with({ x = 10, y = 10}), + uie.window("Child 2", uie.column({ uie.label("Oh no two") })):with({ x = 30, y = 30}) + }):with({ width = 200, height = 400 }) + ):with({ width = 200, height = 200 }) + ):with({ x = 50, y = 100 }), + + uie.window("Hello, World!", + uie.column({ + uie.label("This is a one-line label."), + + -- Labels use Löve2D Text objects under the hood. + uie.label({ { 1, 1, 1 }, "This is a ", { 1, 0, 0 }, "colored", { 0, 1, 1 }, " label."}), + + -- Multi-line labels aren't subjected to the parent element's spacing property. + uie.label("This is a two-line label.\nThe following label is updated dynamically."), + + -- Dynamically updated label. + uie.label():as("info"), + + uie.button("This is a button.", function(btn) + if btn.counter == nil then + btn.counter = 0 + end + btn.counter = btn.counter + 1 + btn.text = "Pressed " .. tostring(btn.counter) .. " time" .. (btn.counter == 1 and "" or "s") + end), + + uie.button("Disabled"):with({ enabled = false }), + + uie.button("Useless"), + + uie.label("Select an item from the list below."):as("selected"), + uie.list(uiu.map(uiu.listRange(1, 3), function(i) + return { text = string.format("Item %i!", i), data = i } + end), function(list, item) + list.parent._selected.text = "Selected " .. tostring(item) + end) + + }) + ):with({ x = 200, y = 50 }):as("test"), + + }):with(uiu.fillWidth):with(uiu.fillHeight(true)), }):with({ style = { bg = { bg = {} }, @@ -128,7 +198,7 @@ function editorScene:firstEnter() clip = false, cacheable = false }) - + ui.init(root, false) inputDevice.newInputDevice(self.inputDevices, ui) diff --git a/src/ui b/src/ui index d6ae82f7..536b7363 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit d6ae82f7920db3ba4a33d44f16e3e36bae8d1912 +Subproject commit 536b736385d0be879eb2ebee581a9f7aa498c147 From e5cd23b497b9d44a1ed7448163727b1274f72591 Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Mon, 25 Nov 2019 17:06:58 +0100 Subject: [PATCH 08/22] Update OlympUI --- src/scenes/editor.lua | 6 ++++++ src/ui | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/scenes/editor.lua b/src/scenes/editor.lua index 72a643bb..782bf470 100644 --- a/src/scenes/editor.lua +++ b/src/scenes/editor.lua @@ -162,6 +162,12 @@ function editorScene:firstEnter() -- Multi-line labels aren't subjected to the parent element's spacing property. uie.label("This is a two-line label.\nThe following label is updated dynamically."), + uie.label():with({ + update = function(el) + el.text = "FPS: " .. love.timer.getFPS() + end + }), + -- Dynamically updated label. uie.label():as("info"), diff --git a/src/ui b/src/ui index 536b7363..47a25210 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 536b736385d0be879eb2ebee581a9f7aa498c147 +Subproject commit 47a25210d2d6c817a46bb0c3aea77d10c7bf2f32 From 96184ed3072f5bd00f6f64862899c5c00cf86321 Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Mon, 25 Nov 2019 17:28:20 +0100 Subject: [PATCH 09/22] Update OlympUI --- src/scenes/editor.lua | 4 +--- src/ui | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/scenes/editor.lua b/src/scenes/editor.lua index 782bf470..1b1cdadb 100644 --- a/src/scenes/editor.lua +++ b/src/scenes/editor.lua @@ -162,15 +162,13 @@ function editorScene:firstEnter() -- Multi-line labels aren't subjected to the parent element's spacing property. uie.label("This is a two-line label.\nThe following label is updated dynamically."), + -- Dynamically updated label. uie.label():with({ update = function(el) el.text = "FPS: " .. love.timer.getFPS() end }), - -- Dynamically updated label. - uie.label():as("info"), - uie.button("This is a button.", function(btn) if btn.counter == nil then btn.counter = 0 diff --git a/src/ui b/src/ui index 47a25210..bf326d76 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 47a25210d2d6c817a46bb0c3aea77d10c7bf2f32 +Subproject commit bf326d76d21f9fd9e3cd605cfa6700960a096078 From 8802e6921bb075e5a15fcd3bf8efe6f0bee7de9e Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Mon, 25 Nov 2019 23:02:04 +0100 Subject: [PATCH 10/22] Update OlympUI --- src/scenes/editor.lua | 2 +- src/ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scenes/editor.lua b/src/scenes/editor.lua index 1b1cdadb..3a945eb1 100644 --- a/src/scenes/editor.lua +++ b/src/scenes/editor.lua @@ -112,7 +112,7 @@ function editorScene:firstEnter() uie.scrollbox( uie.list( - uiu.map(uiu.listRange(200, 1, -1), function(i) + uiu.map(uiu.listRange(2000, 1, -1), function(i) return { text = string.format("%i%s", i, i % 7 == 0 and " (something)" or ""), data = i } end) ):with(uiu.hook{ diff --git a/src/ui b/src/ui index bf326d76..79a2c6c5 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit bf326d76d21f9fd9e3cd605cfa6700960a096078 +Subproject commit 79a2c6c5346ea0b67fd9b3d8ba0a9cedec7e68ed From 9a0e46dce4eb3ef7ce968f14647e3cb1ce4fd5c0 Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Wed, 4 Dec 2019 18:32:21 +0100 Subject: [PATCH 11/22] Update OlympUI --- src/scenes/editor.lua | 4 ++-- src/ui | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scenes/editor.lua b/src/scenes/editor.lua index 3a945eb1..f3a200ef 100644 --- a/src/scenes/editor.lua +++ b/src/scenes/editor.lua @@ -87,7 +87,7 @@ function editorScene:firstEnter() end) ) ):with({ - calcWidth = (el -> el._inner.width) + calcWidth = (el -> el.inner.width) }):with(uiu.fillHeight), uie.column({ @@ -127,7 +127,7 @@ function editorScene:firstEnter() }) ):with(uiu.fillHeight(true)) :with(uiu.hook{ - calcWidth = (orig, el -> el._inner.width), + calcWidth = (orig, el -> el.inner.width), layoutLateLazy = function(orig, el) local parentWidth = el.parent.innerWidth if el.width < parentWidth then diff --git a/src/ui b/src/ui index 79a2c6c5..5ab10dfb 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 79a2c6c5346ea0b67fd9b3d8ba0a9cedec7e68ed +Subproject commit 5ab10dfb6ddf6277ee5a5df1902875e86dd42904 From 695c75c1e86f898f504c389f2c1e1e500934b61e Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Sun, 8 Dec 2019 00:09:15 +0100 Subject: [PATCH 12/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index 5ab10dfb..44c7346c 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 5ab10dfb6ddf6277ee5a5df1902875e86dd42904 +Subproject commit 44c7346c5099c998dc8b974aaf52cb9e8c6e6c20 From 4d2132287e9ee765bccb6c6a7cc8024445775c8f Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Sun, 2 Feb 2020 13:49:03 +0100 Subject: [PATCH 13/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index 44c7346c..8445390a 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 44c7346c5099c998dc8b974aaf52cb9e8c6e6c20 +Subproject commit 8445390adb4d47ea9d17257809c570492c75347d From df8f8d0a55d96e87cd6e890da02de8e0a532a53d Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Mon, 2 Mar 2020 00:44:10 +0100 Subject: [PATCH 14/22] Update OlympUI --- src/scenes/editor.lua | 2 +- src/ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scenes/editor.lua b/src/scenes/editor.lua index 75f0238a..b9d3bd45 100644 --- a/src/scenes/editor.lua +++ b/src/scenes/editor.lua @@ -112,7 +112,7 @@ function editorScene:firstEnter() uie.scrollbox( uie.list( - uiu.map(uiu.listRange(2000, 1, -1), function(i) + uiu.map(uiu.listRange(200, 1, -1), function(i) return { text = string.format("%i%s", i, i % 7 == 0 and " (something)" or ""), data = i } end) ):with(uiu.hook{ diff --git a/src/ui b/src/ui index 8445390a..5c9b4f69 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 8445390adb4d47ea9d17257809c570492c75347d +Subproject commit 5c9b4f6973c936d5bdd951226bf7b5aec2cf3116 From f5f252239b05689e7e4daf25bd9272411816631d Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Mon, 2 Mar 2020 21:13:44 +0100 Subject: [PATCH 15/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index 5c9b4f69..408cab87 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 5c9b4f6973c936d5bdd951226bf7b5aec2cf3116 +Subproject commit 408cab87a60f4327e7437ad0adc61a9152e88752 From e6da299695b83cbe0dc4c5dd691c2610934a9a8e Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Thu, 12 Mar 2020 13:48:51 +0100 Subject: [PATCH 16/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index 408cab87..7c06d84c 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 408cab87a60f4327e7437ad0adc61a9152e88752 +Subproject commit 7c06d84c5e7c6815b03c0cd13d1950f9515c62b4 From 56b1c3b53880b8318886382f553e1b36afdd34a2 Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Thu, 12 Mar 2020 23:05:00 +0100 Subject: [PATCH 17/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index 7c06d84c..cee50d6c 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 7c06d84c5e7c6815b03c0cd13d1950f9515c62b4 +Subproject commit cee50d6c27815860b83e5410736f6b1388f76b8f From 2d1bdc2fae1f2313b8a8d2f3d12fa22ffd866553 Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Fri, 13 Mar 2020 23:59:00 +0100 Subject: [PATCH 18/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index cee50d6c..483b63dc 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit cee50d6c27815860b83e5410736f6b1388f76b8f +Subproject commit 483b63dc5bc1d0ae85b38e05c02652cf91e2ce16 From 01399ff22a6bb3e05b9caf8a27dbe9ee5b12ff5a Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Sat, 14 Mar 2020 19:52:35 +0100 Subject: [PATCH 19/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index 483b63dc..6ad15eb0 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 483b63dc5bc1d0ae85b38e05c02652cf91e2ce16 +Subproject commit 6ad15eb0fabb54c8fffbd6d8d5276cc485d99f56 From fbfd28330868617c7aa43203be7adb1f2cc4ab34 Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Thu, 14 May 2020 14:41:42 +0200 Subject: [PATCH 20/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index 6ad15eb0..ba0ce032 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 6ad15eb0fabb54c8fffbd6d8d5276cc485d99f56 +Subproject commit ba0ce0326af120442ab0f5180260dd98c88f23d4 From 036f21bd8dcb623bab59605639ddbff42fda2277 Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Thu, 14 May 2020 14:48:30 +0200 Subject: [PATCH 21/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index ba0ce032..54e747cb 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit ba0ce0326af120442ab0f5180260dd98c88f23d4 +Subproject commit 54e747cb7a8fb64aff62beba5e68e7e9679b0570 From d8fcd5db62afa7ad8594b787c9d045eb4dc75fac Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Sat, 5 Dec 2020 01:03:23 +0100 Subject: [PATCH 22/22] Update OlympUI --- src/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui b/src/ui index 54e747cb..df0f4d39 160000 --- a/src/ui +++ b/src/ui @@ -1 +1 @@ -Subproject commit 54e747cb7a8fb64aff62beba5e68e7e9679b0570 +Subproject commit df0f4d393010aac8b57af766444a34b24590c1b3