[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 7b03aa9 081/237: Done some
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 7b03aa9 081/237: Done some map work. |
Date: |
Mon, 25 Jul 2016 18:14:58 +0000 (UTC) |
tag: Release_0-3-1
commit 7b03aa90a3ce96aa68a5e4a9bf36e39676ea7e37
Author: adondev <adondev>
Commit: adondev <adondev>
Done some map work.
---
gfx/mapobjects/terrains/Makefile.am | 3 ++-
gfx/mapobjects/terrains/forest_bot.mobj | Bin 0 -> 14035 bytes
gfx/mapobjects/terrains/forest_bot_leaves.mobj | Bin 0 -> 12618 bytes
gfx/mapobjects/terrains/forest_left.mobj | Bin 0 -> 4653 bytes
gfx/mapobjects/terrains/forest_left_leaves.mobj | Bin 0 -> 5736 bytes
maps/test.map | Bin 2561 -> 2659 bytes
scripts/init.py | 2 +-
7 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gfx/mapobjects/terrains/Makefile.am
b/gfx/mapobjects/terrains/Makefile.am
index bb8c38f..2d50ae8 100755
--- a/gfx/mapobjects/terrains/Makefile.am
+++ b/gfx/mapobjects/terrains/Makefile.am
@@ -5,6 +5,7 @@ pkgdata_DATA = grass1.mobj grass2.mobj ground-stone-1.mobj
ground-stone2.mobj \
road_sandy.mobj road_sandy_to_grass_bot.mobj
road_sandy_to_grass_top.mobj \
road_sandy_to_grass_left.mobj road_sandy_to_grass_right.mobj \
road_to_stone_bot-left.mobj road_to_stone_left.mobj
grass_medium-height_front.mobj \
- grass_medium-height.mobj
+ grass_medium-height.mobj forest_bot.mobj forest_bot_leaves.mobj
forest_left.mobj \
+ forest_left_leaves.mobj
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/terrains/forest_bot.mobj
b/gfx/mapobjects/terrains/forest_bot.mobj
new file mode 100644
index 0000000..89ce239
Binary files /dev/null and b/gfx/mapobjects/terrains/forest_bot.mobj differ
diff --git a/gfx/mapobjects/terrains/forest_bot_leaves.mobj
b/gfx/mapobjects/terrains/forest_bot_leaves.mobj
new file mode 100644
index 0000000..bcab793
Binary files /dev/null and b/gfx/mapobjects/terrains/forest_bot_leaves.mobj
differ
diff --git a/gfx/mapobjects/terrains/forest_left.mobj
b/gfx/mapobjects/terrains/forest_left.mobj
new file mode 100644
index 0000000..d1bd3a8
Binary files /dev/null and b/gfx/mapobjects/terrains/forest_left.mobj differ
diff --git a/gfx/mapobjects/terrains/forest_left_leaves.mobj
b/gfx/mapobjects/terrains/forest_left_leaves.mobj
new file mode 100644
index 0000000..420eaae
Binary files /dev/null and b/gfx/mapobjects/terrains/forest_left_leaves.mobj
differ
diff --git a/maps/test.map b/maps/test.map
index 6a74ac4..25c0fff 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/init.py b/scripts/init.py
index c5b1798..9fcf6ce 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -1,4 +1,4 @@
-# The themes and fonts we'll use
+### The themes and fonts we'll use
win_manager_add_theme ("original")
win_manager_add_theme ("silverleaf")
- [adonthell-wastesedge-commits] Release_0-3-1 eccdffa 095/237: FIXED installation of follow_character.py, (continued)
- [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, 2016/07/25
- [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 <=
- [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
- [adonthell-wastesedge-commits] Release_0-3-1 a0e6b2a 045/237: Oops! I kept my test files!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 37d1b1d 089/237: Fixed the mess I made yesterday. Sorry., Kai Sterker, 2016/07/25