From 8272b153ff9c6f5dfb83e8c647485e962212485e Mon Sep 17 00:00:00 2001 From: MrDev023 Date: Fri, 20 Jan 2017 22:34:01 +0100 Subject: [PATCH] Bug fixes and add Label --- .idea/workspace.xml | 416 +++++++++++------- .../Global-Gam-Jam-2017/shaders/main.frag | 4 +- res/shaders/main.frag | 4 +- src/globalgamejam/game/MainGame.java | 37 +- src/globalgamejam/gui/ActionGUI.java | 33 ++ src/globalgamejam/gui/GUI.java | 18 +- src/globalgamejam/gui/GUILabel.java | 253 +++-------- src/globalgamejam/gui/IActionGUI.java | 1 + src/globalgamejam/gui/Image.java | 92 ---- src/globalgamejam/render/DisplayManager.java | 2 +- src/globalgamejam/render/Texture.java | 68 ++- src/globalgamejam/tiles/Tile.java | 16 +- 12 files changed, 481 insertions(+), 463 deletions(-) create mode 100644 src/globalgamejam/gui/ActionGUI.java delete mode 100644 src/globalgamejam/gui/Image.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c8158fd..a1e3487 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,18 @@ - - + + + + + + + + + + + + @@ -242,6 +279,28 @@