Button is work, very very nice

37 files changed, 14 insertions, 3 deletions

diff --git a/assets/fonts/OpenSans-Bold.ttf b/assets/fonts/OpenSans-Bold.ttf
new file mode 100644
index 0000000..3a53300
--- /dev/null
+++ b/assets/fonts/OpenSans-Bold.ttf
diff --git a/assets/fonts/OpenSans-BoldItalic.ttf b/assets/fonts/OpenSans-BoldItalic.ttf
new file mode 100644
index 0000000..5133a56
--- /dev/null
+++ b/assets/fonts/OpenSans-BoldItalic.ttf
diff --git a/assets/fonts/OpenSans-ExtraBold.ttf b/assets/fonts/OpenSans-ExtraBold.ttf
new file mode 100644
index 0000000..2b4ba63
--- /dev/null
+++ b/assets/fonts/OpenSans-ExtraBold.ttf
diff --git a/assets/fonts/OpenSans-ExtraBoldItalic.ttf b/assets/fonts/OpenSans-ExtraBoldItalic.ttf
new file mode 100644
index 0000000..b6a9f4f
--- /dev/null
+++ b/assets/fonts/OpenSans-ExtraBoldItalic.ttf
diff --git a/assets/fonts/OpenSans-Italic.ttf b/assets/fonts/OpenSans-Italic.ttf
new file mode 100644
index 0000000..6d869c5
--- /dev/null
+++ b/assets/fonts/OpenSans-Italic.ttf
diff --git a/assets/fonts/OpenSans-Light.ttf b/assets/fonts/OpenSans-Light.ttf
new file mode 100644
index 0000000..1bd1532
--- /dev/null
+++ b/assets/fonts/OpenSans-Light.ttf
diff --git a/assets/fonts/OpenSans-LightItalic.ttf b/assets/fonts/OpenSans-LightItalic.ttf
new file mode 100644
index 0000000..5081650
--- /dev/null
+++ b/assets/fonts/OpenSans-LightItalic.ttf
diff --git a/assets/fonts/OpenSans-Medium.ttf b/assets/fonts/OpenSans-Medium.ttf
new file mode 100644
index 0000000..117ce67
--- /dev/null
+++ b/assets/fonts/OpenSans-Medium.ttf
diff --git a/assets/fonts/OpenSans-MediumItalic.ttf b/assets/fonts/OpenSans-MediumItalic.ttf
new file mode 100644
index 0000000..5d23fed
--- /dev/null
+++ b/assets/fonts/OpenSans-MediumItalic.ttf
diff --git a/assets/fonts/OpenSans-Regular.ttf b/assets/fonts/OpenSans-Regular.ttf
new file mode 100644
index 0000000..705966c
--- /dev/null
+++ b/assets/fonts/OpenSans-Regular.ttf
diff --git a/assets/fonts/OpenSans-SemiBold.ttf b/assets/fonts/OpenSans-SemiBold.ttf
new file mode 100644
index 0000000..5d39dde
--- /dev/null
+++ b/assets/fonts/OpenSans-SemiBold.ttf
diff --git a/assets/fonts/OpenSans-SemiBoldItalic.ttf b/assets/fonts/OpenSans-SemiBoldItalic.ttf
new file mode 100644
index 0000000..367ab79
--- /dev/null
+++ b/assets/fonts/OpenSans-SemiBoldItalic.ttf
diff --git a/assets/fonts/OpenSans_Condensed-Bold.ttf b/assets/fonts/OpenSans_Condensed-Bold.ttf
new file mode 100644
index 0000000..b0054ae
--- /dev/null
+++ b/assets/fonts/OpenSans_Condensed-Bold.ttf
diff --git a/assets/fonts/OpenSans_Condensed-BoldItalic.ttf b/assets/fonts/OpenSans_Condensed-BoldItalic.ttf
new file mode 100644
index 0000000..6402128
--- /dev/null
+++ b/assets/fonts/OpenSans_Condensed-BoldItalic.ttf
diff --git a/assets/fonts/OpenSans_Condensed-ExtraBold.ttf b/assets/fonts/OpenSans_Condensed-ExtraBold.ttf
new file mode 100644
index 0000000..cb468b5
--- /dev/null
+++ b/assets/fonts/OpenSans_Condensed-ExtraBold.ttf
diff --git a/assets/fonts/OpenSans_Condensed-ExtraBoldItalic.ttf b/assets/fonts/OpenSans_Condensed-ExtraBoldItalic.ttf
new file mode 100644
index 0000000..d22b11e
--- /dev/null
+++ b/assets/fonts/OpenSans_Condensed-ExtraBoldItalic.ttf
diff --git a/assets/fonts/OpenSans_Condensed-Italic.ttf b/assets/fonts/OpenSans_Condensed-Italic.ttf
new file mode 100644
index 0000000..7a40de1
--- /dev/null
+++ b/assets/fonts/OpenSans_Condensed-Italic.ttf
diff --git a/assets/fonts/OpenSans_Condensed-Light.ttf b/assets/fonts/OpenSans_Condensed-Light.ttf
new file mode 100644
index 0000000..2b9c16f
--- /dev/null
+++ b/assets/fonts/OpenSans_Condensed-Light.ttf
diff --git a/assets/fonts/OpenSans_Condensed-LightItalic.ttf b/assets/fonts/OpenSans_Condensed-LightItalic.ttf
new file mode 100644
index 0000000..23c6280
--- /dev/null
+++ b/assets/fonts/OpenSans_Condensed-LightItalic.ttf
diff --git a/assets/fonts/OpenSans_Condensed-Medium.ttf b/assets/fonts/OpenSans_Condensed-Medium.ttf
new file mode 100644
index 0000000..e42ee36
--- /dev/null
+++ b/assets/fonts/OpenSans_Condensed-Medium.ttf
diff --git a/assets/fonts/OpenSans_Condensed-MediumItalic.ttf b/assets/fonts/OpenSans_Condensed-MediumItalic.ttf
new file mode 100644
index 0000000..830c187
--- /dev/null
+++ b/assets/fonts/OpenSans_Condensed-MediumItalic.ttf
diff --git a/assets/fonts/OpenSans_Condensed-Regular.ttf b/assets/fonts/OpenSans_Condensed-Regular.ttf
new file mode 100644
index 0000000..4f2fb27
--- /dev/null
+++ b/assets/fonts/OpenSans_Condensed-Regular.ttf
diff --git a/assets/fonts/OpenSans_Condensed-SemiBold.ttf b/assets/fonts/OpenSans_Condensed-SemiBold.ttf
new file mode 100644
index 0000000..45f2c21
--- /dev/null
+++ b/assets/fonts/OpenSans_Condensed-SemiBold.ttf
diff --git a/assets/fonts/OpenSans_Condensed-SemiBoldItalic.ttf b/assets/fonts/OpenSans_Condensed-SemiBoldItalic.ttf
new file mode 100644
index 0000000..8dd9bcb
--- /dev/null
+++ b/assets/fonts/OpenSans_Condensed-SemiBoldItalic.ttf
diff --git a/assets/fonts/OpenSans_SemiCondensed-Bold.ttf b/assets/fonts/OpenSans_SemiCondensed-Bold.ttf
new file mode 100644
index 0000000..b60406e
--- /dev/null
+++ b/assets/fonts/OpenSans_SemiCondensed-Bold.ttf
diff --git a/assets/fonts/OpenSans_SemiCondensed-BoldItalic.ttf b/assets/fonts/OpenSans_SemiCondensed-BoldItalic.ttf
new file mode 100644
index 0000000..eb97f18
--- /dev/null
+++ b/assets/fonts/OpenSans_SemiCondensed-BoldItalic.ttf
diff --git a/assets/fonts/OpenSans_SemiCondensed-ExtraBold.ttf b/assets/fonts/OpenSans_SemiCondensed-ExtraBold.ttf
new file mode 100644
index 0000000..b9b6bda
--- /dev/null
+++ b/assets/fonts/OpenSans_SemiCondensed-ExtraBold.ttf
diff --git a/assets/fonts/OpenSans_SemiCondensed-ExtraBoldItalic.ttf b/assets/fonts/OpenSans_SemiCondensed-ExtraBoldItalic.ttf
new file mode 100644
index 0000000..2c8f934
--- /dev/null
+++ b/assets/fonts/OpenSans_SemiCondensed-ExtraBoldItalic.ttf
diff --git a/assets/fonts/OpenSans_SemiCondensed-Italic.ttf b/assets/fonts/OpenSans_SemiCondensed-Italic.ttf
new file mode 100644
index 0000000..601a1fa
--- /dev/null
+++ b/assets/fonts/OpenSans_SemiCondensed-Italic.ttf
diff --git a/assets/fonts/OpenSans_SemiCondensed-Light.ttf b/assets/fonts/OpenSans_SemiCondensed-Light.ttf
new file mode 100644
index 0000000..fcef5fd
--- /dev/null
+++ b/assets/fonts/OpenSans_SemiCondensed-Light.ttf
diff --git a/assets/fonts/OpenSans_SemiCondensed-LightItalic.ttf b/assets/fonts/OpenSans_SemiCondensed-LightItalic.ttf
new file mode 100644
index 0000000..db6b275
--- /dev/null
+++ b/assets/fonts/OpenSans_SemiCondensed-LightItalic.ttf
diff --git a/assets/fonts/OpenSans_SemiCondensed-Medium.ttf b/assets/fonts/OpenSans_SemiCondensed-Medium.ttf
new file mode 100644
index 0000000..e75244a
--- /dev/null
+++ b/assets/fonts/OpenSans_SemiCondensed-Medium.ttf
diff --git a/assets/fonts/OpenSans_SemiCondensed-MediumItalic.ttf b/assets/fonts/OpenSans_SemiCondensed-MediumItalic.ttf
new file mode 100644
index 0000000..1caac86
--- /dev/null
+++ b/assets/fonts/OpenSans_SemiCondensed-MediumItalic.ttf
diff --git a/assets/fonts/OpenSans_SemiCondensed-Regular.ttf b/assets/fonts/OpenSans_SemiCondensed-Regular.ttf
new file mode 100644
index 0000000..565ccde
--- /dev/null
+++ b/assets/fonts/OpenSans_SemiCondensed-Regular.ttf
diff --git a/assets/fonts/OpenSans_SemiCondensed-SemiBold.ttf b/assets/fonts/OpenSans_SemiCondensed-SemiBold.ttf
new file mode 100644
index 0000000..082c1a8
--- /dev/null
+++ b/assets/fonts/OpenSans_SemiCondensed-SemiBold.ttf
diff --git a/assets/fonts/OpenSans_SemiCondensed-SemiBoldItalic.ttf b/assets/fonts/OpenSans_SemiCondensed-SemiBoldItalic.ttf
new file mode 100644
index 0000000..b829909
--- /dev/null
+++ b/assets/fonts/OpenSans_SemiCondensed-SemiBoldItalic.ttf
diff --git a/assets/scripts/mainMenu.lua b/assets/scripts/mainMenu.lua
index 2f6b342..d08d82a 100644
--- a/assets/scripts/mainMenu.lua
+++ b/assets/scripts/mainMenu.lua
@@ -1,18 +1,29 @@
 movementSpeed = 3;
 bannerTextureWidth = 509;
+buttonHeight = 50;
+buttonWidth = 110;
+bigButtonWidth = 150;
+bigButtonHeight = buttonHeight;
 
 function Setup()
     setRenderPlayer(false)
     setBgImage("assets/backgrounds/city-background-1.png")
 end
 
-function TestButtonFunction()
-    setBgImage("assets/gui/mainMenu_banner.png")
+function Local2PButton()
+end
+
+function MultiplayerButton()
+end
+
+function SettingsButton()
 end
 
 function Update()
     queueTextureForRender("assets/gui/mainMenu_banner.png", WIDTH // 2 - bannerTextureWidth // 2, 0)
-    queueButtonForRender("Local 2P", 0, 0, 100, 50, "TestButtonFunction");
+    queueButtonForRender("Local 2P", WIDTH // 2 - buttonWidth // 2, HEIGHT // 2 - buttonHeight // 2, buttonWidth, buttonHeight, "Local2PButton");
+    queueButtonForRender("Multiplayer", WIDTH // 2 - bigButtonWidth // 2, HEIGHT // 2 - bigButtonHeight // 2 + 55, bigButtonWidth, bigButtonHeight, "MultiplayerButton");
+    queueButtonForRender("Settings", WIDTH // 2 - buttonWidth // 2, HEIGHT // 2 - buttonHeight // 2 + 55 + 55, buttonWidth, buttonHeight, "SettingsButton");
 
     -- if keys[getKeycodeByName("RIGHT")] or keys[getKeycodeByName("D")] then
     --     movePlayer(movementSpeed, 0)