merged ui into master

.gitignore

@@ -10,6 +10,8 @@ hs_err_pid*
 /desktop/out/
 /gentest/out/
 notes/ignored/
+scripts/
+/*.jar
 
 ## Robovm
 /ios/robovm-build/

ChangeLog.txt

@@ -14,4 +14,23 @@
 	v4:
 		* Changed level generation drastically
 	v5:
-
+		+ Added/fixed/finalized inventory screen
+		- Removed crafting screen temporarily
+	v6:
+		+ Added crafting screen
+		+ Added recipes for all tool variants
+		* Forced player to view instructions
+		* Fixed ores to actually appear in the map (soon to be obsolete in 1.6/1.7)
+		* Removed excessive stamina drain from tools
+		* Improved a number of tile and item sprites
+	v7:
+		* Fixed a whole bunch of bugs in a whole bunch of areas
+		* Updated interaction bounds
+		- Decreased stamina
+		- Decreased hurt cooldown
+		* Made all prompt menus screens instead of popups
+		- Decreased chat message display time
+		+ Made Chat screen scroll to display more messages
+		* Made items in your inventory but not hotbar stay out of your hotbar if you 
+pickup another item of the same type
+		+ Added command to clear chat

build.gradle

@@ -2,7 +2,7 @@ allprojects {
 	apply plugin: "java"
 	apply plugin: "idea"
 
-	version = '1.5.5'
+	version = '1.5.8'
 	ext {
 		appName = "miniventure"
 		gdxVersion = '1.9.8'
@@ -23,7 +23,7 @@ allprojects {
 	}
 }
 
-project(":core:game") {
+project(":core:common") {
 	dependencies {
 		compile "com.badlogicgames.gdx:gdx:$gdxVersion"
 		compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
@@ -38,18 +38,18 @@ project(":core:game") {
 
 project(":core:client") {
 	dependencies {
-		compile project(":core:game")
+		compile project(":core:common")
 		compile "com.kotcrab.vis:vis-ui:1.4.0"
 	}
 }
 
 project(":core:server") {
 	dependencies {
-		compile project(":core:game")
+		compile project(":core:common")
 	}
 }
 
-project(":desktop") {
+project(":core:desktop") {
 	dependencies {
 		compile project(":core:client")
 		compile project(":core:server")
@@ -59,9 +59,3 @@ project(":desktop") {
 		compile "com.badlogicgames.gdx:gdx-tools:$gdxVersion"
 	}
 }
-
-project(":gentest") {
-	dependencies {
-		compile project(":core:game")
-	}
-}