[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 11972d6 094/237: *** empty
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 11972d6 094/237: *** empty log message *** |
Date: |
Mon, 25 Jul 2016 18:14:59 +0000 (UTC) |
tag: Release_0-3-1
commit 11972d6835127c7da7db6985e7f3417d4a1f8a9b
Author: adondev <adondev>
Commit: adondev <adondev>
*** empty log message ***
---
gfx/mapobjects/terrains/Makefile.am | 3 ++-
gfx/mapobjects/terrains/forest_tr.mobj | Bin 0 -> 14689 bytes
gfx/mapobjects/terrains/forest_tr_leaves.mobj | Bin 0 -> 13292 bytes
gfx/mapobjects/terrains/grass_to_stone.mobj | Bin 0 -> 4010 bytes
gfx/mapobjects/terrains/stone_to_grass.mobj | Bin 0 -> 1682 bytes
scripts/actions/.cvsignore | 1 +
6 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/gfx/mapobjects/terrains/Makefile.am
b/gfx/mapobjects/terrains/Makefile.am
index 5027932..768d980 100755
--- a/gfx/mapobjects/terrains/Makefile.am
+++ b/gfx/mapobjects/terrains/Makefile.am
@@ -7,6 +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 \
- ground_to_grass.mobj grass_to_ground.mobj
+ stone_to_grass.mobj grass_to_stone.mobj forest_tr.mobj \
+ forest_tr_leaves.mobj
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/terrains/forest_tr.mobj
b/gfx/mapobjects/terrains/forest_tr.mobj
new file mode 100644
index 0000000..b718009
Binary files /dev/null and b/gfx/mapobjects/terrains/forest_tr.mobj differ
diff --git a/gfx/mapobjects/terrains/forest_tr_leaves.mobj
b/gfx/mapobjects/terrains/forest_tr_leaves.mobj
new file mode 100644
index 0000000..e4c1ed5
Binary files /dev/null and b/gfx/mapobjects/terrains/forest_tr_leaves.mobj
differ
diff --git a/gfx/mapobjects/terrains/grass_to_stone.mobj
b/gfx/mapobjects/terrains/grass_to_stone.mobj
new file mode 100644
index 0000000..ae604e3
Binary files /dev/null and b/gfx/mapobjects/terrains/grass_to_stone.mobj differ
diff --git a/gfx/mapobjects/terrains/stone_to_grass.mobj
b/gfx/mapobjects/terrains/stone_to_grass.mobj
new file mode 100644
index 0000000..22e73d6
Binary files /dev/null and b/gfx/mapobjects/terrains/stone_to_grass.mobj differ
diff --git a/scripts/actions/.cvsignore b/scripts/actions/.cvsignore
index 3dda729..551aedb 100755
--- a/scripts/actions/.cvsignore
+++ b/scripts/actions/.cvsignore
@@ -1,2 +1,3 @@
Makefile.in
Makefile
+*.pyc
- [adonthell-wastesedge-commits] Release_0-3-1 52a5f4c 038/237: Completed map and connections., (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 52a5f4c 038/237: Completed map and connections., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 aa2d088 057/237: Added erek and fellnir., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 eccdffa 095/237: FIXED installation of follow_character.py, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0df9cb7 084/237: Continued map forest, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 835df8f 083/237: ADDED Janesta's schedule, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 ee9fc6d 107/237: ADDED remaining portraits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 836cc1a 077/237: Updated Orloth, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8461ce1 108/237: FIXED a bug in Orloth's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9da31d1 085/237: OOpps!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 2b67b8c 096/237: Reorganized the schedules structure, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 11972d6 094/237: *** empty log message ***,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 cfd3652 065/237: Adapted schedules and init scripts to the theme and font manager., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7b03aa9 081/237: Done some map work., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a49adb1 102/237: Now getting the_player, characters and quests via the proper API functions, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 53eb6ab 113/237: The player is now saved in character.data too, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 ef12728 074/237: Added transition tiles, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 cf1b9c2 093/237: Adapted the game to the new Python engine, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 161f58d 071/237: Improved the dialogues according to the points discussed in Bavinchove, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 13286b8 110/237: UPDATED scripts after removal of map_engine, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 984f397 125/237: Test add, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0206066 097/237: CHANGED Jeloms dialogue to fit with the new plot, Kai Sterker, 2016/07/25