Update items and textures

diff --git a/android/assets/allitems.png b/android/assets/allitems.png
index 58dfb47c48bc12170ae9205e25e4c21236b4c5a9..e829d77ccd9eb477ad96b18b17c681934a64251b 100644 (file)
Binary files a/android/assets/allitems.png and b/android/assets/allitems.png differ

diff --git a/android/assets/background.png b/android/assets/background.png
index 1774f866d5d9ae1c782cd8c4c1b9d9efc57cb003..9dd527e0ddaad1935622c6f181f670d81e9259c6 100644 (file)
Binary files a/android/assets/background.png and b/android/assets/background.png differ

diff --git a/android/assets/background_top.png b/android/assets/background_top.png
new file mode 100644 (file)
index 0000000..1a5d850
Binary files /dev/null and b/android/assets/background_top.png differ

diff --git a/android/assets/buttons.png b/android/assets/buttons.png
index 85280145266dfeec22639de196235b9e66315d18..a99c61139dea7524470d98b8c558fdf2c18d904f 100644 (file)
Binary files a/android/assets/buttons.png and b/android/assets/buttons.png differ

diff --git a/android/assets/gui.png b/android/assets/gui.png
index 6542140a28333c67aa397c6bfea79ba760122510..8423be2ac07cf387550814589ce08dc6b73b9f83 100644 (file)
Binary files a/android/assets/gui.png and b/android/assets/gui.png differ

diff --git a/android/assets/items.png b/android/assets/items.png
deleted file mode 100644 (file)
index 1da9653..0000000
Binary files a/android/assets/items.png and /dev/null differ

diff --git a/android/assets/json/game_items.json b/android/assets/json/game_items.json
index aa7bb3e9854a0c2d9ace9153361b90065a28a07d..042f0c9bbea1a77cde66481caaf6ec8fde516cc2 100644 (file)
--- a/android/assets/json/game_items.json
+++ b/android/assets/json/game_items.json
@@ -71,8 +71,9 @@
     "log_oak": {
       "hp": 180
     },
-    "leaves": {
-      "hp": 21
+    "leaves_oak": {
+      "hp": 21,
+      "transparent": true
     },
     "sponge": {
       "hp": 54
@@ -272,7 +273,7 @@
       "background": false,
       "transparent": true,
       "fluid": true,
-      "texture": "water_still",
+      "texture": "water_flow",
       "meta": "water",
       "animated": true,
       "frames": 16
@@ -284,7 +285,7 @@
       "background": false,
       "transparent": true,
       "fluid": true,
-      "texture": "water_still",
+      "texture": "water_flow",
       "meta": "water",
       "animated": true,
       "frames": 16,
@@ -297,7 +298,7 @@
       "background": false,
       "transparent": true,
       "fluid": true,
-      "texture": "water_still",
+      "texture": "water_flow",
       "meta": "water",
       "animated": true,
       "frames": 16,
@@ -310,7 +311,7 @@
       "background": false,
       "transparent": true,
       "fluid": true,
-      "texture": "water_still",
+      "texture": "water_flow",
       "meta": "water",
       "animated": true,
       "frames": 16,
@@ -321,7 +322,7 @@
       "collision": false,
       "background": false,
       "fluid": true,
-      "texture": "lava_still",
+      "texture": "lava_flow",
       "meta": "lava",
       "animated": true,
       "frames": 16
@@ -332,7 +333,7 @@
       "collision": false,
       "background": false,
       "fluid": true,
-      "texture": "lava_still",
+      "texture": "lava_flow",
       "meta": "lava",
       "animated": true,
       "frames": 16,
@@ -344,7 +345,7 @@
       "collision": false,
       "background": false,
       "fluid": true,
-      "texture": "lava_still",
+      "texture": "lava_flow",
       "meta": "lava",
       "animated": true,
       "frames": 16,
@@ -356,7 +357,7 @@
       "collision": false,
       "background": false,
       "fluid": true,
-      "texture": "lava_still",
+      "texture": "lava_flow",
       "meta": "lava",
       "animated": true,
       "frames": 16,
@@ -431,7 +432,7 @@
       "name": "Wood",
       "type": "block"
     },
-    "leaves": {
+    "leaves_oak": {
       "name": "Leaves",
       "type": "block"
     },

diff --git a/android/assets/mobs/char/0_0.png b/android/assets/mobs/char/0_0.png
index 6ff1ff57a2f2ae0d836c7a6c373a758406ca89c0..bae953dcdc5368098bf5f9c7caa01b9706de5df6 100644 (file)
Binary files a/android/assets/mobs/char/0_0.png and b/android/assets/mobs/char/0_0.png differ

diff --git a/android/assets/mobs/char/0_1.png b/android/assets/mobs/char/0_1.png
index 5a3162528d1860732f775c6829890345b53dbf59..eff8cc6bedb36bdd12033da1ffce19c8de82f56b 100644 (file)
Binary files a/android/assets/mobs/char/0_1.png and b/android/assets/mobs/char/0_1.png differ

diff --git a/android/assets/mobs/char/0_2.png b/android/assets/mobs/char/0_2.png
index 0eb4f935d652fcb44af0e2bc8816690f6113b000..3ee74ab2a88b052fd689e039d92988f863fca279 100644 (file)
Binary files a/android/assets/mobs/char/0_2.png and b/android/assets/mobs/char/0_2.png differ

diff --git a/android/assets/mobs/char/0_3.png b/android/assets/mobs/char/0_3.png
index 660f3cbe425037773364a33341f94ccf73eb06be..4da236a23502c766f46aaf82ec1bf0d31b81be7a 100644 (file)
Binary files a/android/assets/mobs/char/0_3.png and b/android/assets/mobs/char/0_3.png differ

diff --git a/android/assets/mobs/char/1_0.png b/android/assets/mobs/char/1_0.png
index 2995fa703d84beacf09327e6acc348065605ff62..2c1a2b2fed5c4608f6dc14efd814be8ad0fe0e4c 100644 (file)
Binary files a/android/assets/mobs/char/1_0.png and b/android/assets/mobs/char/1_0.png differ

diff --git a/android/assets/mobs/char/1_1.png b/android/assets/mobs/char/1_1.png
index 680573089fce41a345f6b43f80687f36561fb37f..eff8cc6bedb36bdd12033da1ffce19c8de82f56b 100644 (file)
Binary files a/android/assets/mobs/char/1_1.png and b/android/assets/mobs/char/1_1.png differ

diff --git a/android/assets/mobs/char/1_2.png b/android/assets/mobs/char/1_2.png
index d0701b5e5e5d7ddf9a9153511de302d96e49896a..c17356229ba3aed591d9af21439adae137958760 100644 (file)
Binary files a/android/assets/mobs/char/1_2.png and b/android/assets/mobs/char/1_2.png differ

diff --git a/android/assets/mobs/char/1_3.png b/android/assets/mobs/char/1_3.png
index c0ef26c076837a956f16376d8dfec1baf9271768..3ee37e47a8c50a9a450ef40873424cdd672670ab 100644 (file)
Binary files a/android/assets/mobs/char/1_3.png and b/android/assets/mobs/char/1_3.png differ

diff --git a/android/assets/mobs/pig/0_0.png b/android/assets/mobs/pig/0_0.png
index 75c3b89dcdaa6d252daf1d452da100af630383fa..5c80806f2627a1a0d01ebc322a67304d1a87e45a 100644 (file)
Binary files a/android/assets/mobs/pig/0_0.png and b/android/assets/mobs/pig/0_0.png differ

diff --git a/android/assets/mobs/pig/0_1.png b/android/assets/mobs/pig/0_1.png
index a36c37e417f7a3fea08f59962e96a38e1389b4b4..4e64f8889264062b67916c1e47d38a421e6aae4c 100644 (file)
Binary files a/android/assets/mobs/pig/0_1.png and b/android/assets/mobs/pig/0_1.png differ

diff --git a/android/assets/mobs/pig/1_0.png b/android/assets/mobs/pig/1_0.png
index 8ef2387642956f8052f0c5e0a908a1763bf26f8a..ed31acc4e030350bee66ed803edafcb0724cb9ba 100644 (file)
Binary files a/android/assets/mobs/pig/1_0.png and b/android/assets/mobs/pig/1_0.png differ

diff --git a/android/assets/mobs/pig/1_1.png b/android/assets/mobs/pig/1_1.png
index c549d26759395af6878d82cf9f4321024e7eb313..5a7acc5b67ffba360a5e820a68967426208df728 100644 (file)
Binary files a/android/assets/mobs/pig/1_1.png and b/android/assets/mobs/pig/1_1.png differ

diff --git a/android/assets/terrain.png b/android/assets/terrain.png
deleted file mode 100644 (file)
index f17c02a..0000000
Binary files a/android/assets/terrain.png and /dev/null differ

diff --git a/android/assets/textures/blocks/lava.png b/android/assets/textures/blocks/lava.png
deleted file mode 100644 (file)
index 6585048..0000000
Binary files a/android/assets/textures/blocks/lava.png and /dev/null differ

diff --git a/android/assets/textures/blocks/lava_12.png b/android/assets/textures/blocks/lava_12.png
deleted file mode 100644 (file)
index ca2bd32..0000000
Binary files a/android/assets/textures/blocks/lava_12.png and /dev/null differ

diff --git a/android/assets/textures/blocks/lava_16.png b/android/assets/textures/blocks/lava_16.png
deleted file mode 100644 (file)
index 6585048..0000000
Binary files a/android/assets/textures/blocks/lava_16.png and /dev/null differ

diff --git a/android/assets/textures/blocks/lava_4.png b/android/assets/textures/blocks/lava_4.png
deleted file mode 100644 (file)
index 1e46885..0000000
Binary files a/android/assets/textures/blocks/lava_4.png and /dev/null differ

diff --git a/android/assets/textures/blocks/lava_8.png b/android/assets/textures/blocks/lava_8.png
deleted file mode 100644 (file)
index 0b638e9..0000000
Binary files a/android/assets/textures/blocks/lava_8.png and /dev/null differ

diff --git a/android/assets/textures/blocks/leaves.png b/android/assets/textures/blocks/leaves.png
deleted file mode 100644 (file)
index 58c2104..0000000
Binary files a/android/assets/textures/blocks/leaves.png and /dev/null differ

diff --git a/android/assets/textures/blocks/water.png b/android/assets/textures/blocks/water.png
deleted file mode 100644 (file)
index 9fff324..0000000
Binary files a/android/assets/textures/blocks/water.png and /dev/null differ

diff --git a/android/assets/textures/blocks/water_12.png b/android/assets/textures/blocks/water_12.png
deleted file mode 100644 (file)
index 24f9187..0000000
Binary files a/android/assets/textures/blocks/water_12.png and /dev/null differ

diff --git a/android/assets/textures/blocks/water_16.png b/android/assets/textures/blocks/water_16.png
deleted file mode 100644 (file)
index 9fff324..0000000
Binary files a/android/assets/textures/blocks/water_16.png and /dev/null differ

diff --git a/android/assets/textures/blocks/water_4.png b/android/assets/textures/blocks/water_4.png
deleted file mode 100644 (file)
index e6a9432..0000000
Binary files a/android/assets/textures/blocks/water_4.png and /dev/null differ

diff --git a/android/assets/textures/blocks/water_8.png b/android/assets/textures/blocks/water_8.png
deleted file mode 100644 (file)
index 4dc9f38..0000000
Binary files a/android/assets/textures/blocks/water_8.png and /dev/null differ