[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 7a8047a 075/237: Moved tran
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 7a8047a 075/237: Moved transition files to their real place. |
Date: |
Mon, 25 Jul 2016 18:14:58 +0000 (UTC) |
tag: Release_0-3-1
commit 7a8047a5e09a3f82969aba126effd0e69ec09ae9
Author: adondev <adondev>
Commit: adondev <adondev>
Moved transition files to their real place.
---
gfx/mapobjects/floorings/Makefile.am | 3 ++-
gfx/mapobjects/{furnitures => floorings}/terracotta-trans.mobj | Bin
1686 -> 1686 bytes
.../{furnitures => floorings}/woodenplanks_2_trans_1.mobj | Bin
1888 -> 1888 bytes
.../{furnitures => floorings}/woodenplanks_2_trans_2.mobj | Bin
1893 -> 1893 bytes
gfx/mapobjects/{furnitures => floorings}/woodenplanks_trans.mobj | Bin
1789 -> 1789 bytes
gfx/mapobjects/furnitures/Makefile.am | 3 +--
maps/test.map | Bin
2432 -> 2466 bytes
7 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gfx/mapobjects/floorings/Makefile.am
b/gfx/mapobjects/floorings/Makefile.am
index e323c6e..2364a7d 100755
--- a/gfx/mapobjects/floorings/Makefile.am
+++ b/gfx/mapobjects/floorings/Makefile.am
@@ -3,6 +3,7 @@ pkgdatadir = $(gamedatadir)/gfx/mapobjects/floorings
pkgdata_DATA = woodenplanks.mobj bath-floor2b.mobj bath-floor2a.mobj \
bath-floor1b.mobj bath-floor1a.mobj terracotta-tiles-1.mobj \
terracotta-tiles-3.mobj terracotta-tiles-3.mobj woodenplanks_2_1.mobj \
- woodenplanks_2_2.mobj
+ woodenplanks_2_2.mobj terracotta-trans.mobj \
+ woodenplanks_2_trans_1.mobj woodenplanks_2_trans_2.mobj
woodenplanks_trans.mobj
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/furnitures/terracotta-trans.mobj
b/gfx/mapobjects/floorings/terracotta-trans.mobj
similarity index 100%
rename from gfx/mapobjects/furnitures/terracotta-trans.mobj
rename to gfx/mapobjects/floorings/terracotta-trans.mobj
diff --git a/gfx/mapobjects/furnitures/woodenplanks_2_trans_1.mobj
b/gfx/mapobjects/floorings/woodenplanks_2_trans_1.mobj
similarity index 100%
rename from gfx/mapobjects/furnitures/woodenplanks_2_trans_1.mobj
rename to gfx/mapobjects/floorings/woodenplanks_2_trans_1.mobj
diff --git a/gfx/mapobjects/furnitures/woodenplanks_2_trans_2.mobj
b/gfx/mapobjects/floorings/woodenplanks_2_trans_2.mobj
similarity index 100%
rename from gfx/mapobjects/furnitures/woodenplanks_2_trans_2.mobj
rename to gfx/mapobjects/floorings/woodenplanks_2_trans_2.mobj
diff --git a/gfx/mapobjects/furnitures/woodenplanks_trans.mobj
b/gfx/mapobjects/floorings/woodenplanks_trans.mobj
similarity index 100%
rename from gfx/mapobjects/furnitures/woodenplanks_trans.mobj
rename to gfx/mapobjects/floorings/woodenplanks_trans.mobj
diff --git a/gfx/mapobjects/furnitures/Makefile.am
b/gfx/mapobjects/furnitures/Makefile.am
index e84ed7e..12e716d 100755
--- a/gfx/mapobjects/furnitures/Makefile.am
+++ b/gfx/mapobjects/furnitures/Makefile.am
@@ -10,7 +10,6 @@ pkgdata_DATA = bar.mobj barrel_wooden_with-tap.mobj
clock.mobj cupboard.mobj ove
silverhair_basin.mobj silverhair_chest.mobj stone_bed.mobj stone_v.mobj
\
crate.mobj barrel_wooden.mobj crate2.mobj barrel_wooden2.mobj
dwarf_chest.mobj \
normal-cupboard.mobj chest-wooden.mobj silverhair_rug-1.mobj
silverhair_rug-2.mobj \
- silverhair_rug-3.mobj silverhair_rug-4.mobj terracotta-trans.mobj \
- woodenplanks_2_trans_1.mobj woodenplanks_2_trans_2.mobj
woodenplanks_trans.mobj
+ silverhair_rug-3.mobj silverhair_rug-4.mobj
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/maps/test.map b/maps/test.map
index cc9eb03..f731905 100755
Binary files a/maps/test.map and b/maps/test.map differ
- [adonthell-wastesedge-commits] Release_0-3-1 13286b8 110/237: UPDATED scripts after removal of map_engine, (continued)
- [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
- [adonthell-wastesedge-commits] Release_0-3-1 3ad0ff2 043/237: Some bugfixes and little updates, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d13c53f 052/237: Speed improvements, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 be10dec 068/237: Added guards house interior., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9d5c3db 072/237: Continued furniturizing, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a51967 079/237: Continued map., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7a8047a 075/237: Moved transition files to their real place.,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 91abdcd 136/237: FIXED Makefile.am (intro.py was missing), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 30316f6 132/237: ADDED initial dialogue with Talan to get into the inn, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7a0f9fe 050/237: Minor changes to the map., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 21f36d0 059/237: Slight fix., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b40a92e 134/237: ADDED Lucia's schedule and furnitures, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 64e91d5 033/237: UPDATE to some schedules and dialogues, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d6dfa6e 064/237: Added characters portraits, Kai Sterker, 2016/07/25
- [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