From b2f26d744b2b6860664ca15b455e089384294085 Mon Sep 17 00:00:00 2001
From: AnonymusRaccoon <tr.tristan-roux@outlook.fr>
Date: Thu, 27 Feb 2020 15:01:35 +0100
Subject: [PATCH 1/2] Adding a teams panel to the left

---
 CMakeLists.txt        | 2 +-
 lib/gamacon           | 2 +-
 prefabs/game.gcprefab | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dea20d..0e50dc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -207,7 +207,7 @@ add_executable(My3D
         lib/gamacon/src/components/clickable_component.c
         lib/gamacon/include/components/clickable_component.h
         lib/gamacon/src/systems/clickable_system.c
-)
+        lib/gamacon/src/sfml_renderer/sfml_events.c)
 
 add_compile_options(-W -Wall -Wextra -Wshadow)
 
diff --git a/lib/gamacon b/lib/gamacon
index 334073e..c5759b5 160000
--- a/lib/gamacon
+++ b/lib/gamacon
@@ -1 +1 @@
-Subproject commit 334073ea43a7d84d5f7dfb63d23d48e802e80b68
+Subproject commit c5759b518c9592dc26da5502ead27010237e8958
diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab
index d28d973..4710917 100644
--- a/prefabs/game.gcprefab
+++ b/prefabs/game.gcprefab
@@ -1,7 +1,7 @@
 <gc_scene>
     <data>
-        <sprite src="assets/sprites/grass.png" />
-        <sprite name="button_background" src="assets/sprites/grass.png" />
+        <sprite name="panel" src="assets/ui/panel.png" />
+		<sprite name="button_background" src="assets/ui/button_background.png" />
         <sprite name="cobblestone" src="assets/sprites/cobblestone.png" />
         <sprite name="mossy_cobblestone" src="assets/sprites/cobblestone_mossy.png" />
         <sprite name="command_block" src="assets/sprites/command_block.png" />
@@ -19,5 +19,7 @@
                 <Rect height="auto" width="auto" top="0" left="0" />
             </renderer>
         </gc_entity>
+		<panel src="panel" x="0%" y="50%" width="50%" height="120%"/>
+		<text text="TEAMS" x="12%" y="10"/>
     </gc_entities>
 </gc_scene>
\ No newline at end of file

From 1c5e1ef0e2241fa96effc5b077938eb71efdbfcd Mon Sep 17 00:00:00 2001
From: AnonymusRaccoon <tr.tristan-roux@outlook.fr>
Date: Thu, 27 Feb 2020 15:07:33 +0100
Subject: [PATCH 2/2] Fixing the panel's title position

---
 lib/gamacon           | 2 +-
 prefabs/game.gcprefab | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/gamacon b/lib/gamacon
index c5759b5..162d9cb 160000
--- a/lib/gamacon
+++ b/lib/gamacon
@@ -1 +1 @@
-Subproject commit c5759b518c9592dc26da5502ead27010237e8958
+Subproject commit 162d9cb919d649c4b584d4fa66a75de55174e03a
diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab
index 4710917..5c57517 100644
--- a/prefabs/game.gcprefab
+++ b/prefabs/game.gcprefab
@@ -19,7 +19,7 @@
                 <Rect height="auto" width="auto" top="0" left="0" />
             </renderer>
         </gc_entity>
-		<panel src="panel" x="0%" y="50%" width="50%" height="120%"/>
-		<text text="TEAMS" x="12%" y="10"/>
+		<panel src="panel" x="100%" y="50%" width="50%" height="120%"/>
+		<text text="TEAMS" x="88%" y="40"/>
     </gc_entities>
 </gc_scene>
\ No newline at end of file