From 43fa5953e4c9f226c2579097b3f42bd97bc587c4 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 20 Aug 2016 19:02:38 +0200 Subject: Config files directory; soon to be moved --- config/menumain.lua | 1 + 1 file changed, 1 insertion(+) create mode 100644 config/menumain.lua (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua new file mode 100644 index 0000000..a4374ad --- /dev/null +++ b/config/menumain.lua @@ -0,0 +1 @@ +return {"Start", "Join", "Settings", "Credits", "Exit"} \ No newline at end of file -- cgit v1.1 From 6e9aa28e70ec842db643a06609454fff54b5d86a Mon Sep 17 00:00:00 2001 From: Aki Date: Mon, 22 Aug 2016 02:24:32 +0200 Subject: Werking! --- config/menumain.lua | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index a4374ad..7c8ddf9 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -1 +1,28 @@ -return {"Start", "Join", "Settings", "Credits", "Exit"} \ No newline at end of file +local button = require "button" + +return { + button + :new("start") + :setPosition(10,40) + :set("active", function () + changeScene(Menu:new("menustart")) + end) + , + button + :new("join") + :setPosition(10,50) + , + button + :new("settings") + :setPosition(10,60) + , + button + :new("credits") + :setPosition(10,70) + , + button + :new("exit") + :setPosition(10,80) + :set("active", love.event.quit) + , +} \ No newline at end of file -- cgit v1.1 From e57a5b0b77c1ba3a2f05371c551d0e61fc9ce709 Mon Sep 17 00:00:00 2001 From: Aki Date: Mon, 22 Aug 2016 17:10:20 +0200 Subject: Graphics, animation, general improvements --- config/menumain.lua | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index 7c8ddf9..543a858 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -1,28 +1,44 @@ +local menu = ... + local button = require "button" +local width, height = love.graphics.getWidth()/getRealScale(), love.graphics.getHeight()/getRealScale() +local button_x = width/2-29 + return { - button - :new("start") - :setPosition(10,40) + button:new(menu) + :setText("start") + :setPosition(button_x,60) :set("active", function () changeScene(Menu:new("menustart")) end) , - button - :new("join") - :setPosition(10,50) + button:new(menu) + :setText("join") + :setPosition(button_x,76) , - button - :new("settings") - :setPosition(10,60) + button:new(menu) + :setText("settings") + :setPosition(button_x,92) , - button - :new("credits") - :setPosition(10,70) + button:new(menu) + :setText("credits") + :setPosition(button_x,108) , - button - :new("exit") - :setPosition(10,80) + button:new(menu) + :setText("exit") + :setPosition(button_x,124) :set("active", love.event.quit) , + button:new(menu) + :setText("NEVER") + :setPosition(button_x,140) + :set("focus", function (self, next) + if next then + self.parent:next() + else + self.parent:previous() + end + end) + , } \ No newline at end of file -- cgit v1.1 From 3aeabc496465cbd2569d9b0f5687242f374b4375 Mon Sep 17 00:00:00 2001 From: Aki Date: Mon, 22 Aug 2016 17:23:18 +0200 Subject: change elements not menu object --- config/menumain.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index 543a858..def1ab7 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -9,8 +9,8 @@ return { button:new(menu) :setText("start") :setPosition(button_x,60) - :set("active", function () - changeScene(Menu:new("menustart")) + :set("active", function (self) + self.parent:load("menustart") end) , button:new(menu) -- cgit v1.1 From 213c783bdde0fe5bf9709e19168a8e5049c7b13a Mon Sep 17 00:00:00 2001 From: Aki Date: Mon, 22 Aug 2016 18:27:14 +0200 Subject: game title --- config/menumain.lua | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index def1ab7..629284c 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -1,44 +1,38 @@ local menu = ... local button = require "button" +local header = require "header" local width, height = love.graphics.getWidth()/getRealScale(), love.graphics.getHeight()/getRealScale() local button_x = width/2-29 return { button:new(menu) - :setText("start") - :setPosition(button_x,60) + :setText("Start") + :setPosition(button_x, 80) :set("active", function (self) self.parent:load("menustart") end) , button:new(menu) - :setText("join") - :setPosition(button_x,76) + :setText("Join") + :setPosition(button_x, 96) , button:new(menu) - :setText("settings") - :setPosition(button_x,92) + :setText("Settings") + :setPosition(button_x, 112) , button:new(menu) - :setText("credits") - :setPosition(button_x,108) + :setText("Credits") + :setPosition(button_x, 128) , button:new(menu) - :setText("exit") - :setPosition(button_x,124) + :setText("Exit") + :setPosition(button_x, 144) :set("active", love.event.quit) , - button:new(menu) - :setText("NEVER") - :setPosition(button_x,140) - :set("focus", function (self, next) - if next then - self.parent:next() - else - self.parent:previous() - end - end) + header:new(menu) + :setText("Roflnauts") + :setPosition(width/2,40) , } \ No newline at end of file -- cgit v1.1 From d41d75e723cfd7d49456da1e27d98f0c806afaca Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 23 Aug 2016 18:15:55 +0200 Subject: 2 --- config/menumain.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index 629284c..24f66ef 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -2,6 +2,7 @@ local menu = ... local button = require "button" local header = require "header" +local element = require "element" local width, height = love.graphics.getWidth()/getRealScale(), love.graphics.getHeight()/getRealScale() local button_x = width/2-29 @@ -31,6 +32,17 @@ return { :setPosition(button_x, 144) :set("active", love.event.quit) , + element:new(menu) + :setPosition(width/2, 15) + :set("sprite", love.graphics.newImage("assets/two.png")) + :set("draw", function (self, scale) + local x,y = self:getPosition() + love.graphics.setColor(255, 255, 255, 255) + love.graphics.setFont(Bold) + love.graphics.print("1", (x-17)*scale, y*scale, 0, scale*2, scale*2, 12) + love.graphics.print("1", (x+13)*scale, y*scale, 0, scale*2, scale*2, 12) + end) + , header:new(menu) :setText("Roflnauts") :setPosition(width/2,40) -- cgit v1.1 From 6bd45fd9a32439b50b114c39eee569a58d354b73 Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 23 Aug 2016 18:21:12 +0200 Subject: Obsolete; bug --- config/menumain.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index 24f66ef..f442c8d 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -34,7 +34,6 @@ return { , element:new(menu) :setPosition(width/2, 15) - :set("sprite", love.graphics.newImage("assets/two.png")) :set("draw", function (self, scale) local x,y = self:getPosition() love.graphics.setColor(255, 255, 255, 255) -- cgit v1.1 From 9b8f5e3d356be281d8ef25227b087bb99b07b58d Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 23 Aug 2016 19:24:06 +0200 Subject: start > select --- config/menumain.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index f442c8d..2d92817 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -12,7 +12,7 @@ return { :setText("Start") :setPosition(button_x, 80) :set("active", function (self) - self.parent:load("menustart") + self.parent:load("menuselect") end) , button:new(menu) -- cgit v1.1 From 1213e1e2831805ebb5d193702e02c59c2927e54a Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 24 Aug 2016 13:29:13 +0200 Subject: Almost the same functionality --- config/menumain.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index 2d92817..cb53714 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -5,31 +5,31 @@ local header = require "header" local element = require "element" local width, height = love.graphics.getWidth()/getRealScale(), love.graphics.getHeight()/getRealScale() -local button_x = width/2-29 +local bx = width/2-29 return { button:new(menu) :setText("Start") - :setPosition(button_x, 80) + :setPosition(bx, 80) :set("active", function (self) self.parent:load("menuselect") end) , button:new(menu) :setText("Join") - :setPosition(button_x, 96) + :setPosition(bx, 96) , button:new(menu) :setText("Settings") - :setPosition(button_x, 112) + :setPosition(bx, 112) , button:new(menu) :setText("Credits") - :setPosition(button_x, 128) + :setPosition(bx, 128) , button:new(menu) :setText("Exit") - :setPosition(button_x, 144) + :setPosition(bx, 144) :set("active", love.event.quit) , element:new(menu) -- cgit v1.1 From aafcac7057e0ef7904d96446f88b2d26b12e0ab5 Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 24 Aug 2016 14:53:05 +0200 Subject: I don't regret this --- config/menumain.lua | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index cb53714..c0607d6 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -18,14 +18,23 @@ return { button:new(menu) :setText("Join") :setPosition(bx, 96) + :set("active", function (self) + self:blink() + end) , button:new(menu) :setText("Settings") :setPosition(bx, 112) + :set("active", function (self) + self:blink() + end) , button:new(menu) :setText("Credits") :setPosition(bx, 128) + :set("active", function (self) + self:blink() + end) , button:new(menu) :setText("Exit") -- cgit v1.1 From b19ec990880a3f2529ac8a7833337a0984094a23 Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 24 Aug 2016 19:03:40 +0200 Subject: Autostart+new menu --- config/menumain.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index c0607d6..2ca2c59 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -12,7 +12,7 @@ return { :setText("Start") :setPosition(bx, 80) :set("active", function (self) - self.parent:load("menuselect") + self.parent:load("menuhost") end) , button:new(menu) -- cgit v1.1 From 96b4407ae6410affd0db1e6d6d657d4f65d32235 Mon Sep 17 00:00:00 2001 From: Aki Date: Sun, 28 Aug 2016 20:41:48 +0200 Subject: No blinking; buttons enabled/disabled --- config/menumain.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index 2ca2c59..e1bd89f 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -18,22 +18,22 @@ return { button:new(menu) :setText("Join") :setPosition(bx, 96) - :set("active", function (self) - self:blink() + :set("isEnabled", function (self) + return false end) , button:new(menu) :setText("Settings") :setPosition(bx, 112) - :set("active", function (self) - self:blink() + :set("isEnabled", function (self) + return false end) , button:new(menu) :setText("Credits") :setPosition(bx, 128) - :set("active", function (self) - self:blink() + :set("isEnabled", function (self) + return false end) , button:new(menu) -- cgit v1.1 From adb0938f960312fef6f73640526e94d9bd3ce4ba Mon Sep 17 00:00:00 2001 From: Aki Date: Sun, 28 Aug 2016 23:48:31 +0200 Subject: Credits menu --- config/menumain.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index e1bd89f..70666b3 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -32,8 +32,8 @@ return { button:new(menu) :setText("Credits") :setPosition(bx, 128) - :set("isEnabled", function (self) - return false + :set("active", function (self) + self.parent:load("menucredits") end) , button:new(menu) -- cgit v1.1 From 35262a7245bcd9ebf937d07ab3326655d96e5d2e Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 6 Oct 2016 14:43:11 +0200 Subject: Fixed scaling of fullscreen menu in different ratios --- config/menumain.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config/menumain.lua') diff --git a/config/menumain.lua b/config/menumain.lua index 70666b3..e312b51 100644 --- a/config/menumain.lua +++ b/config/menumain.lua @@ -4,7 +4,7 @@ local button = require "button" local header = require "header" local element = require "element" -local width, height = love.graphics.getWidth()/getRealScale(), love.graphics.getHeight()/getRealScale() +local width, height = love.graphics.getWidth()/getScale(), love.graphics.getHeight()/getScale() local bx = width/2-29 return { @@ -25,8 +25,8 @@ return { button:new(menu) :setText("Settings") :setPosition(bx, 112) - :set("isEnabled", function (self) - return false + :set("active", function (self) + self.parent:load("menusettings") end) , button:new(menu) -- cgit v1.1