Merge branch 'master' of git@github.com:ksterker/wastesedge

ksterker · Aug 10, 2009 · 942a140 · 942a140
2 parents 3ebb78e + 596e0b6
commit 942a140
Show file tree

Hide file tree

Showing 47 changed files with 21 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ autom4te.cache/
 config.guess
 config.sub
 configure
+*~
diff --git a/gfx/map/building/barn/outside/bottom.png b/gfx/map/building/barn/outside/bottom.png
diff --git a/gfx/map/building/barn/outside/complete.xcf b/gfx/map/building/barn/outside/complete.xcf
diff --git a/gfx/map/building/barn/outside/complete.xcf.cutspec b/gfx/map/building/barn/outside/complete.xcf.cutspec
@@ -0,0 +1,6 @@
+cutspec = [
+        ((  0,   0, 320, 384), "roof.png"),
+        ((  0, 384, 320, 832), "bottom.png"),
+        ((  0,  64+384,  64, 192+384), "roof_entrance.png")
+# doesn't fit:  ((  0,  , 320, 0), "front.png"),
+]
diff --git a/gfx/map/building/barn/outside/front.png b/gfx/map/building/barn/outside/front.png
diff --git a/gfx/map/building/barn/outside/roof.png b/gfx/map/building/barn/outside/roof.png
diff --git a/gfx/map/building/barn/outside/roof_entrance.png b/gfx/map/building/barn/outside/roof_entrance.png
diff --git a/gfx/map/building/barn/wall/1st-floor-t.png b/gfx/map/building/barn/wall/1st-floor-t.png
diff --git a/gfx/map/building/barn/wall/2nd-floor-b.png b/gfx/map/building/barn/wall/2nd-floor-b.png
diff --git a/gfx/map/building/barn/wall/2nd-floor-t.png b/gfx/map/building/barn/wall/2nd-floor-t.png
diff --git a/gfx/map/decoration/inside/furniture/bathroom/oven.png b/gfx/map/decoration/inside/furniture/bathroom/oven.png
diff --git a/gfx/map/decoration/inside/furniture/clock_frame.xcf b/gfx/map/decoration/inside/furniture/clock_frame.xcf
diff --git a/gfx/map/decoration/inside/furniture/clock_frame1.png b/gfx/map/decoration/inside/furniture/clock_frame1.png
diff --git a/gfx/map/decoration/inside/furniture/clock_frame3.png b/gfx/map/decoration/inside/furniture/clock_frame3.png
diff --git a/gfx/map/decoration/inside/furniture/dwarven/bed.png b/gfx/map/decoration/inside/furniture/dwarven/bed.png
diff --git a/gfx/map/decoration/inside/furniture/dwarven/bed.xcf b/gfx/map/decoration/inside/furniture/dwarven/bed.xcf
diff --git a/gfx/map/decoration/inside/furniture/dwarven/chest.png b/gfx/map/decoration/inside/furniture/dwarven/chest.png
diff --git a/gfx/map/decoration/inside/furniture/dwarven/table.png b/gfx/map/decoration/inside/furniture/dwarven/table.png
diff --git a/gfx/map/decoration/inside/furniture/elven/basin.png b/gfx/map/decoration/inside/furniture/elven/basin.png
diff --git a/gfx/map/decoration/inside/furniture/elven/bed.png b/gfx/map/decoration/inside/furniture/elven/bed.png
diff --git a/gfx/map/decoration/inside/furniture/elven/chest.png b/gfx/map/decoration/inside/furniture/elven/chest.png
diff --git a/gfx/map/decoration/inside/furniture/elven/cupboard.png b/gfx/map/decoration/inside/furniture/elven/cupboard.png
diff --git a/gfx/map/decoration/inside/furniture/elven/rug.png b/gfx/map/decoration/inside/furniture/elven/rug.png
diff --git a/gfx/map/decoration/inside/furniture/kitchen/fire_frame1.png b/gfx/map/decoration/inside/furniture/kitchen/fire_frame1.png
diff --git a/gfx/map/decoration/inside/furniture/kitchen/fire_frame2.png b/gfx/map/decoration/inside/furniture/kitchen/fire_frame2.png
diff --git a/gfx/map/decoration/inside/furniture/kitchen/fire_frame3.png b/gfx/map/decoration/inside/furniture/kitchen/fire_frame3.png
diff --git a/gfx/map/decoration/inside/furniture/kitchen/fire_frame4.png b/gfx/map/decoration/inside/furniture/kitchen/fire_frame4.png
diff --git a/gfx/map/decoration/inside/furniture/kitchen/stove.png b/gfx/map/decoration/inside/furniture/kitchen/stove.png
diff --git a/gfx/map/decoration/inside/furniture/stool.png b/gfx/map/decoration/inside/furniture/stool.png
diff --git a/gfx/map/decoration/inside/furniture/table_alchemy_frame1.png b/gfx/map/decoration/inside/furniture/table_alchemy_frame1.png
diff --git a/gfx/map/decoration/inside/furniture/table_alchemy_frame1.xcf b/gfx/map/decoration/inside/furniture/table_alchemy_frame1.xcf
diff --git a/gfx/map/decoration/inside/furniture/table_alchemy_frame2.png b/gfx/map/decoration/inside/furniture/table_alchemy_frame2.png
diff --git a/gfx/map/wall/inside/clay/wall-bl.png b/gfx/map/wall/inside/clay/wall-bl.png
diff --git a/gfx/map/wall/inside/clay/wall-br.png b/gfx/map/wall/inside/clay/wall-br.png
diff --git a/gfx/map/wall/inside/clay/wall-t.xcf b/gfx/map/wall/inside/clay/wall-t.xcf
diff --git a/gfx/map/wall/inside/clay/wall-tl.png b/gfx/map/wall/inside/clay/wall-tl.png
diff --git a/gfx/map/wall/inside/clay/wall-tr.png b/gfx/map/wall/inside/clay/wall-tr.png
diff --git a/gfx/map/wall/inside/clay/wall-b.xcf → gfx/map/wall/inside/clay/wall.xcf b/gfx/map/wall/inside/clay/wall-b.xcf → gfx/map/wall/inside/clay/wall.xcf
diff --git a/gfx/map/wall/inside/clay/wall.xcf.cutspec b/gfx/map/wall/inside/clay/wall.xcf.cutspec
@@ -0,0 +1,6 @@
+cutspec = [
+    ((  0,   0,  67, 148), "wall-tl.png"),
+    (( 67,   0, 134, 148), "wall-tr.png"),
+    ((  0, 148,  67, 340), "wall-bl.png"),
+    (( 67, 148, 134, 340), "wall-br.png")
+    ]
diff --git a/gfx/map/wall/inside/stone/wall-bl.png b/gfx/map/wall/inside/stone/wall-bl.png
diff --git a/gfx/map/wall/inside/stone/wall-br.png b/gfx/map/wall/inside/stone/wall-br.png
diff --git a/gfx/map/wall/inside/stone/wall-tl.png b/gfx/map/wall/inside/stone/wall-tl.png
diff --git a/gfx/map/wall/inside/stone/wall-tr.png b/gfx/map/wall/inside/stone/wall-tr.png
diff --git a/gfx/map/wall/inside/stone/wall-complete.xcf → gfx/map/wall/inside/stone/wall.xcf b/gfx/map/wall/inside/stone/wall-complete.xcf → gfx/map/wall/inside/stone/wall.xcf
diff --git a/gfx/map/wall/inside/stone/wall.xcf.cutspec b/gfx/map/wall/inside/stone/wall.xcf.cutspec
@@ -0,0 +1,8 @@
+cutspec = [
+        ((  0,   0,  64, 168), "wall-tl.png"),
+        ((192,   0, 256, 168), "wall-tr.png"),
+        ((  0, 168,  64, 336), "wall-bl.png"),
+        ((192, 168, 256, 336), "wall-br.png"),
+        (( 64, 212, 192, 336), "wall1-h.png"),
+        (( 64,  0,  192, 124), "wall2-h.png"),
+]
diff --git a/gfx/map/wall/inside/stone/wall1-h.png b/gfx/map/wall/inside/stone/wall1-h.png
diff --git a/gfx/map/wall/inside/stone/wall2-h.png b/gfx/map/wall/inside/stone/wall2-h.png