From baf04a055dbc66b80c29a406907a0a595ac55f00 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 27 Jun 2017 09:02:03 +0200
Subject: Moved ui elements to use new oop lib

---
 config/menus/main.lua | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'config/menus/main.lua')

diff --git a/config/menus/main.lua b/config/menus/main.lua
index 236c011..d65c57d 100644
--- a/config/menus/main.lua
+++ b/config/menus/main.lua
@@ -1,8 +1,8 @@
 local menu = ...
 
-local button = require "not.Button"
-local header = require "not.Header"
-local element = require "not.Element"
+local Button = require "not.Button"
+local Header = require "not.Header"
+local Element = require "not.Element"
 
 local width, height = love.graphics.getWidth()/getScale(), love.graphics.getHeight()/getScale()
 local bx = width/2-29
@@ -10,40 +10,40 @@ local bx = width/2-29
 local awesometwo = love.graphics.newImage("assets/two.png")
 
 return {
-	button:new(menu)
+	Button(menu)
 		:setText("Start")
 		:setPosition(bx, 80)
 		:set("active", function (self)
 				self.parent:open("host")
 			end)
 	,
-	button:new(menu)
+	Button(menu)
 		:setText("Join")
 		:setPosition(bx, 96)
 		:set("isEnabled", function (self)
 				return false
 			end)
 	,
-	button:new(menu)
+	Button(menu)
 		:setText("Settings")
 		:setPosition(bx, 112)
 		:set("active", function (self)
 				self.parent:open("settings")
 			end)
 	,
-	button:new(menu)
+	Button(menu)
 		:setText("Credits")
 		:setPosition(bx, 128)
 		:set("active", function (self)
 				self.parent:open("credits")
 			end)
 	,
-	button:new(menu)
+	Button(menu)
 		:setText("Exit")
 		:setPosition(bx, 144)
 		:set("active", love.event.quit)
 	,
-	element:new(menu)
+	Element(menu)
 		:setPosition(width/2, 15)
 		:set("draw", function (self, scale) 
 				local x,y = self:getPosition()
@@ -52,7 +52,7 @@ return {
 				love.graphics.draw(awesometwo, x*scale, y*scale, 0, scale, scale, 35)
 			end)
 	,
-	header:new(menu)
+	Header(menu)
 		:setText("Roflnauts")
 		:setPosition(width/2,40)
 	,
-- 
cgit v1.1


From 96fef88f56fdcdf95bc5783eb2b3b881ff435ba0 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
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/main.lua | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'config/menus/main.lua')

diff --git a/config/menus/main.lua b/config/menus/main.lua
index d65c57d..85e926f 100644
--- a/config/menus/main.lua
+++ b/config/menus/main.lua
@@ -1,4 +1,4 @@
-local menu = ...
+local menu, background = ...
 
 local Button = require "not.Button"
 local Header = require "not.Header"
@@ -9,7 +9,12 @@ local bx = width/2-29
 
 local awesometwo = love.graphics.newImage("assets/two.png")
 
+if background == nil or not background:is(require "not.MenuBackground") then
+	background = require "not.MenuBackground"(menu)
+end
+
 return {
+	background,
 	Button(menu)
 		:setText("Start")
 		:setPosition(bx, 80)
@@ -56,4 +61,4 @@ return {
 		:setText("Roflnauts")
 		:setPosition(width/2,40)
 	,
-}
\ No newline at end of file
+}
-- 
cgit v1.1


From e39c00b6e26504ba0f5fc4f0129bfceb3afe331f Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Sun, 16 Jul 2017 17:24:09 +0200
Subject: Fixed MusicPlayer bug with win and pause menus

---
 config/menus/main.lua | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'config/menus/main.lua')

diff --git a/config/menus/main.lua b/config/menus/main.lua
index 85e926f..95e44ec 100644
--- a/config/menus/main.lua
+++ b/config/menus/main.lua
@@ -13,6 +13,10 @@ if background == nil or not background:is(require "not.MenuBackground") then
 	background = require "not.MenuBackground"(menu)
 end
 
+-- Wait, only here?
+musicPlayer:setTrack("menu.ogg")
+musicPlayer:play()
+
 return {
 	background,
 	Button(menu)
-- 
cgit v1.1


From b2c2ef1ae1300a2a2610525bf19db227d6d5e54b Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Sun, 16 Jul 2017 20:20:50 +0200
Subject: Music doesn't stop on transition from any-menu to main-menu

---
 config/menus/main.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'config/menus/main.lua')

diff --git a/config/menus/main.lua b/config/menus/main.lua
index 95e44ec..ae2cef2 100644
--- a/config/menus/main.lua
+++ b/config/menus/main.lua
@@ -14,8 +14,10 @@ if background == nil or not background:is(require "not.MenuBackground") then
 end
 
 -- Wait, only here?
-musicPlayer:setTrack("menu.ogg")
-musicPlayer:play()
+if musicPlayer:getCurrentTrack() ~= "menu.ogg" then
+	musicPlayer:setTrack("menu.ogg")
+	musicPlayer:play()
+end
 
 return {
 	background,
-- 
cgit v1.1