[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 f3b822a 070/237: Furnituriz
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 f3b822a 070/237: Furniturized the houses. |
Date: |
Mon, 25 Jul 2016 18:14:58 +0000 (UTC) |
tag: Release_0-3-1
commit f3b822af0ad8d7fd551d8a38d9304211b25f47f9
Author: adondev <adondev>
Commit: adondev <adondev>
Furniturized the houses.
---
gfx/mapobjects/furnitures/Makefile.am | 8 +++++++-
gfx/mapobjects/furnitures/barrel_wooden.mobj | Bin 0 -> 1037 bytes
gfx/mapobjects/furnitures/barrel_wooden2.mobj | Bin 0 -> 1045 bytes
gfx/mapobjects/furnitures/bed.mobj | Bin 0 -> 2120 bytes
gfx/mapobjects/furnitures/bed_wooden_h.mobj | Bin 0 -> 2226 bytes
gfx/mapobjects/furnitures/bed_wooden_v.mobj | Bin 0 -> 2097 bytes
gfx/mapobjects/furnitures/crate.mobj | Bin 0 -> 1195 bytes
gfx/mapobjects/furnitures/crate2.mobj | Bin 0 -> 1185 bytes
gfx/mapobjects/furnitures/draws_wooden.mobj | Bin 0 -> 1126 bytes
gfx/mapobjects/furnitures/mug_on_table-1.mobj | Bin 0 -> 235 bytes
gfx/mapobjects/furnitures/mug_on_table-2.mobj | Bin 0 -> 235 bytes
gfx/mapobjects/furnitures/noble_bed.mobj | Bin 0 -> 2896 bytes
gfx/mapobjects/furnitures/shelf_bottles1.mobj | Bin 0 -> 344 bytes
gfx/mapobjects/furnitures/shelf_bottles2.mobj | Bin 0 -> 394 bytes
gfx/mapobjects/furnitures/silverhair_basin.mobj | Bin 0 -> 1656 bytes
gfx/mapobjects/furnitures/silverhair_chest.mobj | Bin 0 -> 1146 bytes
gfx/mapobjects/furnitures/silverhair_cupboard.mobj | Bin 0 -> 2010 bytes
gfx/mapobjects/furnitures/stone_bed.mobj | Bin 0 -> 1746 bytes
gfx/mapobjects/furnitures/stone_v.mobj | Bin 0 -> 1456 bytes
gfx/mapobjects/furnitures/stool.mobj | Bin 0 -> 524 bytes
gfx/mapobjects/furnitures/table_alchemy_h.mobj | Bin 0 -> 3215 bytes
gfx/mapobjects/furnitures/table_wooden_v_bot.mobj | Bin 0 -> 702 bytes
gfx/mapobjects/furnitures/table_wooden_v_mid.mobj | Bin 0 -> 1239 bytes
gfx/mapobjects/furnitures/table_wooden_v_top.mobj | Bin 0 -> 776 bytes
gfx/mapobjects/terrains/grass_medium-height.mobj | Bin 0 -> 827 bytes
gfx/mapobjects/terrains/grass_medium-height_front.mobj | Bin 0 -> 235 bytes
maps/test.map | Bin 1951 -> 2273
bytes
27 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/gfx/mapobjects/furnitures/Makefile.am
b/gfx/mapobjects/furnitures/Makefile.am
index 6459965..d86d459 100755
--- a/gfx/mapobjects/furnitures/Makefile.am
+++ b/gfx/mapobjects/furnitures/Makefile.am
@@ -2,6 +2,12 @@ pkgdatadir = $(gamedatadir)/gfx/mapobjects/furnitures
pkgdata_DATA = bar.mobj barrel_wooden_with-tap.mobj clock.mobj cupboard.mobj
oven.mobj \
round-table.mobj shelves_wooden_books.mobj shelves_wooden_filled.mobj \
- water-bucket.mobj bathtub.mobj
+ water-bucket.mobj bathtub.mobj shelf_bottles1.mobj shelf_bottles2.mobj \
+ mug_on_table-1.mobj mug_on_table-2.mobj table_wooden_v_bot.mobj \
+ table_wooden_v_mid.mobj table_wooden_v_top.mobj stool.mobj \
+ bed_wooden_h.mobj bed_wooden_v.mobj bed.mobj table_alchemy_h.mobj \
+ draws_wooden.mobj noble_bed.mobj silverhair_cupboard.mobj \
+ silverhair_basin.mobj silverhair_chest.mobj stone_bed.mobj stone_v.mobj
\
+ crate.mobj barrel_wooden.mobj crate2.mobj barrel_wooden2.mobj
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/furnitures/barrel_wooden.mobj
b/gfx/mapobjects/furnitures/barrel_wooden.mobj
new file mode 100644
index 0000000..cdf4a57
Binary files /dev/null and b/gfx/mapobjects/furnitures/barrel_wooden.mobj differ
diff --git a/gfx/mapobjects/furnitures/barrel_wooden2.mobj
b/gfx/mapobjects/furnitures/barrel_wooden2.mobj
new file mode 100644
index 0000000..ae43dcb
Binary files /dev/null and b/gfx/mapobjects/furnitures/barrel_wooden2.mobj
differ
diff --git a/gfx/mapobjects/furnitures/bed.mobj
b/gfx/mapobjects/furnitures/bed.mobj
new file mode 100644
index 0000000..c351510
Binary files /dev/null and b/gfx/mapobjects/furnitures/bed.mobj differ
diff --git a/gfx/mapobjects/furnitures/bed_wooden_h.mobj
b/gfx/mapobjects/furnitures/bed_wooden_h.mobj
new file mode 100644
index 0000000..a31b54f
Binary files /dev/null and b/gfx/mapobjects/furnitures/bed_wooden_h.mobj differ
diff --git a/gfx/mapobjects/furnitures/bed_wooden_v.mobj
b/gfx/mapobjects/furnitures/bed_wooden_v.mobj
new file mode 100644
index 0000000..8c11d02
Binary files /dev/null and b/gfx/mapobjects/furnitures/bed_wooden_v.mobj differ
diff --git a/gfx/mapobjects/furnitures/crate.mobj
b/gfx/mapobjects/furnitures/crate.mobj
new file mode 100644
index 0000000..a3518b4
Binary files /dev/null and b/gfx/mapobjects/furnitures/crate.mobj differ
diff --git a/gfx/mapobjects/furnitures/crate2.mobj
b/gfx/mapobjects/furnitures/crate2.mobj
new file mode 100644
index 0000000..34094a0
Binary files /dev/null and b/gfx/mapobjects/furnitures/crate2.mobj differ
diff --git a/gfx/mapobjects/furnitures/draws_wooden.mobj
b/gfx/mapobjects/furnitures/draws_wooden.mobj
new file mode 100644
index 0000000..dae335f
Binary files /dev/null and b/gfx/mapobjects/furnitures/draws_wooden.mobj differ
diff --git a/gfx/mapobjects/furnitures/mug_on_table-1.mobj
b/gfx/mapobjects/furnitures/mug_on_table-1.mobj
new file mode 100644
index 0000000..d1a193f
Binary files /dev/null and b/gfx/mapobjects/furnitures/mug_on_table-1.mobj
differ
diff --git a/gfx/mapobjects/furnitures/mug_on_table-2.mobj
b/gfx/mapobjects/furnitures/mug_on_table-2.mobj
new file mode 100644
index 0000000..e35469f
Binary files /dev/null and b/gfx/mapobjects/furnitures/mug_on_table-2.mobj
differ
diff --git a/gfx/mapobjects/furnitures/noble_bed.mobj
b/gfx/mapobjects/furnitures/noble_bed.mobj
new file mode 100644
index 0000000..c7b13c3
Binary files /dev/null and b/gfx/mapobjects/furnitures/noble_bed.mobj differ
diff --git a/gfx/mapobjects/furnitures/shelf_bottles1.mobj
b/gfx/mapobjects/furnitures/shelf_bottles1.mobj
new file mode 100644
index 0000000..f12a192
Binary files /dev/null and b/gfx/mapobjects/furnitures/shelf_bottles1.mobj
differ
diff --git a/gfx/mapobjects/furnitures/shelf_bottles2.mobj
b/gfx/mapobjects/furnitures/shelf_bottles2.mobj
new file mode 100644
index 0000000..6ffd056
Binary files /dev/null and b/gfx/mapobjects/furnitures/shelf_bottles2.mobj
differ
diff --git a/gfx/mapobjects/furnitures/silverhair_basin.mobj
b/gfx/mapobjects/furnitures/silverhair_basin.mobj
new file mode 100644
index 0000000..0ffa330
Binary files /dev/null and b/gfx/mapobjects/furnitures/silverhair_basin.mobj
differ
diff --git a/gfx/mapobjects/furnitures/silverhair_chest.mobj
b/gfx/mapobjects/furnitures/silverhair_chest.mobj
new file mode 100644
index 0000000..df76656
Binary files /dev/null and b/gfx/mapobjects/furnitures/silverhair_chest.mobj
differ
diff --git a/gfx/mapobjects/furnitures/silverhair_cupboard.mobj
b/gfx/mapobjects/furnitures/silverhair_cupboard.mobj
new file mode 100644
index 0000000..83365a2
Binary files /dev/null and b/gfx/mapobjects/furnitures/silverhair_cupboard.mobj
differ
diff --git a/gfx/mapobjects/furnitures/stone_bed.mobj
b/gfx/mapobjects/furnitures/stone_bed.mobj
new file mode 100644
index 0000000..ba7d71f
Binary files /dev/null and b/gfx/mapobjects/furnitures/stone_bed.mobj differ
diff --git a/gfx/mapobjects/furnitures/stone_v.mobj
b/gfx/mapobjects/furnitures/stone_v.mobj
new file mode 100644
index 0000000..e4e9fee
Binary files /dev/null and b/gfx/mapobjects/furnitures/stone_v.mobj differ
diff --git a/gfx/mapobjects/furnitures/stool.mobj
b/gfx/mapobjects/furnitures/stool.mobj
new file mode 100644
index 0000000..9d936a0
Binary files /dev/null and b/gfx/mapobjects/furnitures/stool.mobj differ
diff --git a/gfx/mapobjects/furnitures/table_alchemy_h.mobj
b/gfx/mapobjects/furnitures/table_alchemy_h.mobj
new file mode 100644
index 0000000..180ca19
Binary files /dev/null and b/gfx/mapobjects/furnitures/table_alchemy_h.mobj
differ
diff --git a/gfx/mapobjects/furnitures/table_wooden_v_bot.mobj
b/gfx/mapobjects/furnitures/table_wooden_v_bot.mobj
new file mode 100644
index 0000000..044d6e1
Binary files /dev/null and b/gfx/mapobjects/furnitures/table_wooden_v_bot.mobj
differ
diff --git a/gfx/mapobjects/furnitures/table_wooden_v_mid.mobj
b/gfx/mapobjects/furnitures/table_wooden_v_mid.mobj
new file mode 100644
index 0000000..bc602a5
Binary files /dev/null and b/gfx/mapobjects/furnitures/table_wooden_v_mid.mobj
differ
diff --git a/gfx/mapobjects/furnitures/table_wooden_v_top.mobj
b/gfx/mapobjects/furnitures/table_wooden_v_top.mobj
new file mode 100644
index 0000000..714b3c7
Binary files /dev/null and b/gfx/mapobjects/furnitures/table_wooden_v_top.mobj
differ
diff --git a/gfx/mapobjects/terrains/grass_medium-height.mobj
b/gfx/mapobjects/terrains/grass_medium-height.mobj
new file mode 100644
index 0000000..cb808ba
Binary files /dev/null and b/gfx/mapobjects/terrains/grass_medium-height.mobj
differ
diff --git a/gfx/mapobjects/terrains/grass_medium-height_front.mobj
b/gfx/mapobjects/terrains/grass_medium-height_front.mobj
new file mode 100644
index 0000000..a09d9cf
Binary files /dev/null and
b/gfx/mapobjects/terrains/grass_medium-height_front.mobj differ
diff --git a/maps/test.map b/maps/test.map
index 1549444..295c578 100755
Binary files a/maps/test.map and b/maps/test.map differ
- [adonthell-wastesedge-commits] Release_0-3-1 7a0f9fe 050/237: Minor changes to the map., (continued)
- [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
- [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 <=
- [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, 2016/07/25
- [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