Merge pull request #49 from APRO-Project/development

First fully functional and fun release

build.gradle

@@ -13,7 +13,7 @@ allprojects {
     }
 
     group 'com.cyberbot.bomberman'
-    version '1.0.0-alpha'
+    version '1.0.0-release'
 
     ext {
         appName = "bomberman"

client/core/assets/map/bomberman_main.tmx

@@ -22,24 +22,24 @@
  </layer>
  <layer id="3" name="floor" width="15" height="15">
   <data encoding="csv">
-0,0,0,3,3,3,3,3,3,0,0,0,0,0,0,
-0,0,0,0,3,3,3,3,18,0,0,19,0,0,0,
-14,0,0,3,3,3,3,17,0,0,0,4,0,0,0,
-3,14,0,3,3,16,0,0,0,0,0,25,4,26,0,
-3,3,3,17,3,0,0,0,0,0,0,0,0,0,0,
-3,3,18,0,0,0,0,0,0,0,0,0,0,0,0,
-3,17,3,0,0,0,0,0,0,0,0,0,0,21,4,
-3,0,0,0,0,13,3,14,0,0,0,0,27,4,4,
-3,0,0,0,0,3,3,3,0,0,0,0,4,4,4,
-0,0,0,0,0,15,3,16,0,0,0,19,4,4,4,
-0,0,0,0,0,0,0,21,0,21,4,4,4,4,4,
-0,0,0,0,0,0,27,4,4,4,4,4,4,4,4,
-0,0,0,0,0,0,0,4,4,4,4,4,4,0,4,
-0,0,0,0,0,0,27,4,4,4,4,4,0,0,4,
-0,0,0,0,0,0,4,4,4,4,4,4,4,4,4
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,27,4,28,0,0,0,0,0,0,
+0,0,0,0,0,19,0,4,0,0,0,0,0,0,0,
+0,0,0,0,27,4,4,4,28,0,0,0,0,0,0,
+0,0,0,19,0,4,0,22,0,0,0,23,0,0,0,
+0,0,27,4,4,4,28,0,0,0,13,3,14,0,0,
+0,19,0,4,0,22,0,0,0,23,0,3,0,0,0,
+0,4,4,4,28,0,0,0,24,3,3,3,3,18,0,
+0,22,0,22,0,0,0,0,0,17,0,3,0,0,0,
+0,0,0,0,0,0,0,0,0,0,15,3,16,0,0,
+0,0,0,0,0,21,0,0,0,0,0,17,0,0,0,
+0,0,0,0,27,4,28,0,0,0,0,0,0,0,0,
+0,0,0,0,0,4,0,20,0,0,0,0,0,0,0,
+0,0,0,0,27,4,4,4,4,4,28,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer id="4" name="walls" width="15" height="15" visible="0">
+ <layer id="4" name="walls" width="15" height="15">
   <data encoding="csv">
 9,8,8,8,8,8,8,8,8,8,8,8,8,8,10,
 7,0,0,5,5,6,5,5,5,5,5,5,0,0,7,

client/core/assets/skins/skin.atlas

@@ -6,7 +6,7 @@ filter: Nearest,Nearest
 repeat: none
 button_checked
   rotate: false
-  xy: 68, 54
+  xy: 68, 36
   size: 16, 16
   split: 3, 3, 3, 3
   orig: 16, 16
@@ -28,6 +28,14 @@ button_up
   orig: 16, 16
   offset: 0, 0
   index: -1
+label_background
+  rotate: false
+  xy: 68, 54
+  size: 16, 16
+  split: 0, 17, 0, 17
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
 placeholder
   rotate: false
   xy: 68, 108
@@ -53,7 +61,7 @@ progress_bar_fill
   index: -1
 separator
   rotate: false
-  xy: 68, 36
+  xy: 68, 18
   size: 16, 16
   split: 1, 1, 1, 1
   orig: 16, 16