From 1c5d6addf64ec4d41230b8f447df9b59be0ff28d Mon Sep 17 00:00:00 2001 From: MrDev023 Date: Fri, 20 Jan 2017 15:31:43 +0100 Subject: [PATCH] Bug fixes --- .gitignore | 1 - .idea/modules.xml | 1 + .idea/workspace.xml | 432 ++++++------------ libs/lwjgl.jar | Bin 0 -> 3164507 bytes out/production/Global-Gam-Jam-2017/OpenAL.dll | Bin 0 -> 727040 bytes .../Global-Gam-Jam-2017/OpenAL32.dll | Bin 0 -> 640000 bytes out/production/Global-Gam-Jam-2017/glfw.dll | Bin 0 -> 222208 bytes out/production/Global-Gam-Jam-2017/glfw32.dll | Bin 0 -> 199680 bytes .../Global-Gam-Jam-2017/jemalloc.dll | Bin 0 -> 208896 bytes .../Global-Gam-Jam-2017/jemalloc32.dll | Bin 0 -> 164352 bytes .../Global-Gam-Jam-2017/libglfw.dylib | Bin 0 -> 99212 bytes out/production/Global-Gam-Jam-2017/libglfw.so | Bin 0 -> 109872 bytes .../Global-Gam-Jam-2017/libjemalloc.dylib | Bin 0 -> 182316 bytes .../Global-Gam-Jam-2017/libjemalloc.so | Bin 0 -> 228080 bytes .../Global-Gam-Jam-2017/liblwjgl.dylib | Bin 0 -> 1075004 bytes .../Global-Gam-Jam-2017/liblwjgl.so | Bin 0 -> 1213280 bytes .../Global-Gam-Jam-2017/libopenal.dylib | Bin 0 -> 425616 bytes .../Global-Gam-Jam-2017/libopenal.so | Bin 0 -> 561240 bytes out/production/Global-Gam-Jam-2017/lwjgl.dll | Bin 0 -> 1110528 bytes out/production/Global-Gam-Jam-2017/lwjgl.jar | Bin 0 -> 3164507 bytes .../Global-Gam-Jam-2017/lwjgl32.dll | Bin 0 -> 965632 bytes .../Global-Gam-Jam-2017/shaders/fbo.frag | 12 + .../Global-Gam-Jam-2017/shaders/fbo.vert | 18 + .../Global-Gam-Jam-2017/shaders/main.frag | 14 + .../Global-Gam-Jam-2017/shaders/main.vert | 20 + .../Global-Gam-Jam-2017/textures/default.png | Bin 0 -> 195 bytes 26 files changed, 198 insertions(+), 300 deletions(-) create mode 100644 libs/lwjgl.jar create mode 100644 out/production/Global-Gam-Jam-2017/OpenAL.dll create mode 100644 out/production/Global-Gam-Jam-2017/OpenAL32.dll create mode 100644 out/production/Global-Gam-Jam-2017/glfw.dll create mode 100644 out/production/Global-Gam-Jam-2017/glfw32.dll create mode 100644 out/production/Global-Gam-Jam-2017/jemalloc.dll create mode 100644 out/production/Global-Gam-Jam-2017/jemalloc32.dll create mode 100644 out/production/Global-Gam-Jam-2017/libglfw.dylib create mode 100644 out/production/Global-Gam-Jam-2017/libglfw.so create mode 100644 out/production/Global-Gam-Jam-2017/libjemalloc.dylib create mode 100644 out/production/Global-Gam-Jam-2017/libjemalloc.so create mode 100644 out/production/Global-Gam-Jam-2017/liblwjgl.dylib create mode 100644 out/production/Global-Gam-Jam-2017/liblwjgl.so create mode 100644 out/production/Global-Gam-Jam-2017/libopenal.dylib create mode 100644 out/production/Global-Gam-Jam-2017/libopenal.so create mode 100644 out/production/Global-Gam-Jam-2017/lwjgl.dll create mode 100644 out/production/Global-Gam-Jam-2017/lwjgl.jar create mode 100644 out/production/Global-Gam-Jam-2017/lwjgl32.dll create mode 100644 out/production/Global-Gam-Jam-2017/shaders/fbo.frag create mode 100644 out/production/Global-Gam-Jam-2017/shaders/fbo.vert create mode 100644 out/production/Global-Gam-Jam-2017/shaders/main.frag create mode 100644 out/production/Global-Gam-Jam-2017/shaders/main.vert create mode 100644 out/production/Global-Gam-Jam-2017/textures/default.png diff --git a/.gitignore b/.gitignore index 1d1a742..aaedf82 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ .mtj.tmp/ # Package Files # -*.jar *.war *.ear *.iml diff --git a/.idea/modules.xml b/.idea/modules.xml index 8b2f945..9f51c46 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,7 @@ + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a173c19..66bc3d7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,10 @@ - - - + + + + - @@ -157,28 +183,25 @@ - - - - - - - @@ -190,178 +213,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + @@ -377,7 +239,7 @@