[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 c8dd4ff 133/237: Finished m
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 c8dd4ff 133/237: Finished map forest. |
Date: |
Mon, 25 Jul 2016 18:15:06 +0000 (UTC) |
tag: Release_0-3-1
commit c8dd4ffac2caf70f4e27bf760f06baea39928af1
Author: adondev <adondev>
Commit: adondev <adondev>
Finished map forest.
---
gfx/mapobjects/terrains/Makefile.am | 4 ++--
gfx/mapobjects/terrains/forest_br.mobj | Bin 0 -> 16808 bytes
gfx/mapobjects/terrains/forest_br_leaves.mobj | Bin 0 -> 21178 bytes
gfx/mapobjects/terrains/forest_top.mobj | Bin 0 -> 11638 bytes
gfx/mapobjects/terrains/forest_top_leaves.mobj | Bin 0 -> 16034 bytes
gfx/mapobjects/terrains/forest_tr.mobj | Bin 14689 -> 0 bytes
gfx/mapobjects/terrains/forest_tr_leaves.mobj | Bin 13292 -> 0 bytes
maps/test.map | Bin 2796 -> 2843 bytes
8 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gfx/mapobjects/terrains/Makefile.am
b/gfx/mapobjects/terrains/Makefile.am
index 768d980..04d5776 100755
--- a/gfx/mapobjects/terrains/Makefile.am
+++ b/gfx/mapobjects/terrains/Makefile.am
@@ -7,7 +7,7 @@ pkgdata_DATA = grass1.mobj grass2.mobj ground-stone-1.mobj
ground-stone2.mobj \
road_to_stone_bot-left.mobj road_to_stone_left.mobj
grass_medium-height_front.mobj \
grass_medium-height.mobj forest_bot.mobj forest_bot_leaves.mobj
forest_left.mobj \
forest_left_leaves.mobj forest_mid.mobj forest_mid_leaves.mobj \
- stone_to_grass.mobj grass_to_stone.mobj forest_tr.mobj \
- forest_tr_leaves.mobj
+ stone_to_grass.mobj grass_to_stone.mobj forest_br.mobj \
+ forest_br_leaves.mobj forest_top.mobj forest_top_leaves.mobj
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/terrains/forest_br.mobj
b/gfx/mapobjects/terrains/forest_br.mobj
new file mode 100644
index 0000000..406c6ee
Binary files /dev/null and b/gfx/mapobjects/terrains/forest_br.mobj differ
diff --git a/gfx/mapobjects/terrains/forest_br_leaves.mobj
b/gfx/mapobjects/terrains/forest_br_leaves.mobj
new file mode 100644
index 0000000..6928547
Binary files /dev/null and b/gfx/mapobjects/terrains/forest_br_leaves.mobj
differ
diff --git a/gfx/mapobjects/terrains/forest_top.mobj
b/gfx/mapobjects/terrains/forest_top.mobj
new file mode 100644
index 0000000..d4b86db
Binary files /dev/null and b/gfx/mapobjects/terrains/forest_top.mobj differ
diff --git a/gfx/mapobjects/terrains/forest_top_leaves.mobj
b/gfx/mapobjects/terrains/forest_top_leaves.mobj
new file mode 100644
index 0000000..cea2fbb
Binary files /dev/null and b/gfx/mapobjects/terrains/forest_top_leaves.mobj
differ
diff --git a/gfx/mapobjects/terrains/forest_tr.mobj
b/gfx/mapobjects/terrains/forest_tr.mobj
deleted file mode 100644
index b718009..0000000
Binary files a/gfx/mapobjects/terrains/forest_tr.mobj and /dev/null differ
diff --git a/gfx/mapobjects/terrains/forest_tr_leaves.mobj
b/gfx/mapobjects/terrains/forest_tr_leaves.mobj
deleted file mode 100644
index e4c1ed5..0000000
Binary files a/gfx/mapobjects/terrains/forest_tr_leaves.mobj and /dev/null
differ
diff --git a/maps/test.map b/maps/test.map
index 242b856..cae6fa7 100755
Binary files a/maps/test.map and b/maps/test.map differ
- [adonthell-wastesedge-commits] Release_0-3-1 0933dbf 063/237: How could I forget them ... ? ; ), (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 0933dbf 063/237: How could I forget them ... ? ; ), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a681af9 028/237: Modularized event scripts, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 18d2266 131/237: FIXED installation, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7b028da 127/237: UPDATED intro sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 290bfde 086/237: ADDED portraits of Talan and Player, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f3b822a 070/237: Furniturized the houses., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dfdc8cc 035/237: Finished Orloth's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 398bec8 143/237: IMPROVED Bjarn's dialogue and text bubbles, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c0d92f8 138/237: Further cleaning up of dialogues, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a1e51e2 061/237: ADDED Jelom, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c8dd4ff 133/237: Finished map forest.,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 bcd3b16 141/237: FIXED previous commit of old stuff, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 e167248 062/237: Fixed a bug in displaying bubbles, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8e16709 166/237: ADDED some Barn <-> Silverhair teleport magic :), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 793fc3f 150/237: *** empty log message ***, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 238ff56 140/237: FIXED spelling in init.py, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9cad88a 080/237: Some changes to the dialogues (shortened player answers, splitted long NPC answers, etc.), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9bab4a2 103/237: REMOVED files that were no longer needed, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 148aeb5 129/237: Small corrections, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 eda8c0a 179/237: Added vine, and some events, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 eb9a718 182/237: ADDED extro cutscene, Kai Sterker, 2016/07/25