From baf04a055dbc66b80c29a406907a0a595ac55f00 Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 27 Jun 2017 09:02:03 +0200 Subject: Moved ui elements to use new oop lib --- config/menus/settings.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'config/menus/settings.lua') diff --git a/config/menus/settings.lua b/config/menus/settings.lua index ae0403d..a1c6507 100644 --- a/config/menus/settings.lua +++ b/config/menus/settings.lua @@ -1,15 +1,15 @@ local menu = ... -local button = require "not.Button" -local selector = require "not.Selector" -local element = require "not.Element" +local Button = require "not.Button" +local Selector = require "not.Selector" +local Element = require "not.Element" local width, height = love.graphics.getWidth()/getRealScale(), love.graphics.getHeight()/getRealScale() local bx = width/2-29 local keys = {"Left", "Right", "Up", "Down", "Attack", "Jump"} -local dimmer = element:new(menu) +local dimmer = Element(menu) :setPosition(width/2, 15) :set("visible", false) :set("currentControl", "Left") -- it actually means control that is being set CURRENTLY @@ -65,7 +65,7 @@ local controlreleased = function(self, set, action, key) end local a = { - button:new(menu) + Button(menu) :setText("Keyboard 1") :setPosition(bx,80) :set("setNumber", function () return 1 end) @@ -74,7 +74,7 @@ local a = { :set("stopChange", stopChange) :set("active", startChange) , - button:new(menu) + Button(menu) :setText("Keyboard 2") :setPosition(bx,96) :set("setNumber", function () return 2 end) @@ -83,7 +83,7 @@ local a = { :set("stopChange", stopChange) :set("active", startChange) , - button:new(menu) + Button(menu) :setText("Gamepad 1") :setPosition(bx,112) :set("setNumber", function () return 3 end) @@ -92,7 +92,7 @@ local a = { :set("stopChange", stopChange) :set("active", startChange) , - button:new(menu) + Button(menu) :setText("Gamepad 2") :setPosition(bx,128) :set("setNumber", function () return 4 end) @@ -101,7 +101,7 @@ local a = { :set("stopChange", stopChange) :set("active", startChange) , - button:new(menu) + Button(menu) :setText("Go back") :setPosition(bx,144) :set("active", function (self) -- cgit v1.1 From 75e30a649bd41029e48344969225e8ff329a86b4 Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 27 Jun 2017 14:40:08 +0200 Subject: Indention in settings menu --- config/menus/settings.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/menus/settings.lua') diff --git a/config/menus/settings.lua b/config/menus/settings.lua index a1c6507..96c12cd 100644 --- a/config/menus/settings.lua +++ b/config/menus/settings.lua @@ -74,7 +74,7 @@ local a = { :set("stopChange", stopChange) :set("active", startChange) , - Button(menu) + Button(menu) :setText("Keyboard 2") :setPosition(bx,96) :set("setNumber", function () return 2 end) @@ -83,7 +83,7 @@ local a = { :set("stopChange", stopChange) :set("active", startChange) , - Button(menu) + Button(menu) :setText("Gamepad 1") :setPosition(bx,112) :set("setNumber", function () return 3 end) -- cgit v1.1 From 96fef88f56fdcdf95bc5783eb2b3b881ff435ba0 Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 14 Jul 2017 21:54:46 +0200 Subject: Background in menu moved to separate class Weird noise added to menu configs to use single MenuBackground instance Initial pause menu added --- config/menus/settings.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'config/menus/settings.lua') diff --git a/config/menus/settings.lua b/config/menus/settings.lua index 96c12cd..59f9234 100644 --- a/config/menus/settings.lua +++ b/config/menus/settings.lua @@ -1,4 +1,4 @@ -local menu = ... +local menu, background = ... local Button = require "not.Button" local Selector = require "not.Selector" @@ -64,7 +64,12 @@ local controlreleased = function(self, set, action, key) end end +if background == nil or not background:is(require "not.MenuBackground") then + background = require "not.MenuBackground"(menu) +end + local a = { + background, Button(menu) :setText("Keyboard 1") :setPosition(bx,80) @@ -111,4 +116,4 @@ local a = { dimmer } -return a \ No newline at end of file +return a -- cgit v1.1 From a6810abd1c8cc9956cb4b8cc2f00258780eee3a8 Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 1 Aug 2017 04:10:11 +0200 Subject: Ingame settings now support changing display modes --- config/menus/settings.lua | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'config/menus/settings.lua') diff --git a/config/menus/settings.lua b/config/menus/settings.lua index 59f9234..7102bea 100644 --- a/config/menus/settings.lua +++ b/config/menus/settings.lua @@ -68,8 +68,29 @@ if background == nil or not background:is(require "not.MenuBackground") then background = require "not.MenuBackground"(menu) end +local displayTypes = {["fullscreen"] = "fullscreen", ["1"] = "1x", ["2"] = "2x", ["3"] = "3x", ["4"] = "4x", ["5"] = "5x"} +local displayButton = Button(menu) +:set("types", displayTypes) +:setText(displayTypes[Settings.current.display]) +:setPosition(bx,64) +:set("enabled", true) +:set("isEnabled", function (self) return self.enabled end) +:set("active", function (self) + self.parent.inputBreakTimer = 0.2 + if Settings.current.display == "fullscreen" then + Settings.current.display = "1" + elseif Settings.current.display == "5" then + Settings.current.display = "fullscreen" + else + Settings.current.display = tostring(tonumber(Settings.current.display) + 1) + end + self:setText(self.types[Settings.current.display]) + Settings.reload() +end) + local a = { background, + displayButton, Button(menu) :setText("Keyboard 1") :setPosition(bx,80) -- cgit v1.1