From: Stephen Groundwater <slacker@gluebox.com>
Date: Wed, 5 Oct 2005 02:50:57 +0000 (+0000)
Subject: adjusted photos, added gwater and kendrick
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b70c66e9612689b51c90c1c1576ff37124815bde;p=supertux.git

adjusted photos, added gwater and kendrick

SVN-Revision: 2807
---

diff --git a/data/credits.txt b/data/credits.txt
index 0a8df8e42..5e91242fc 100644
--- a/data/credits.txt
+++ b/data/credits.txt
@@ -11,6 +11,7 @@
 -Original Developer
 
 	Bill Kendrick
+!images/credits/bill.jpg
 
 
 -Programming
@@ -49,6 +50,7 @@
 	Benjamin P. \"litespeed\" Jung
 
 	Stephen Groundwater
+!images/credits/gwater.jpg
 
 
 -Level Design
diff --git a/data/images/credits/bill.jpg b/data/images/credits/bill.jpg
new file mode 100644
index 000000000..5ab06497c
Binary files /dev/null and b/data/images/credits/bill.jpg differ
diff --git a/data/images/credits/gwater.jpg b/data/images/credits/gwater.jpg
new file mode 100644
index 000000000..4171fda6a
Binary files /dev/null and b/data/images/credits/gwater.jpg differ
diff --git a/data/images/credits/matze.jpg b/data/images/credits/matze.jpg
index 71fa7a3e5..93bc36d55 100644
Binary files a/data/images/credits/matze.jpg and b/data/images/credits/matze.jpg differ
diff --git a/data/images/credits/wansti.jpg b/data/images/credits/wansti.jpg
index 346d57c00..b13dcccad 100644
Binary files a/data/images/credits/wansti.jpg and b/data/images/credits/wansti.jpg differ
diff --git a/data/images/worldmap.strf b/data/images/worldmap.strf
index 7009feebc..6cb228ffa 100644
--- a/data/images/worldmap.strf
+++ b/data/images/worldmap.strf
@@ -1186,7 +1186,7 @@
     (images
       (region "worldmap/forest/castlemap.png" 96 192 32 32)
  )         
-     (stop #f)
+     (stop #t)
      (north #f)
      (south #t)
      (west  #f)
diff --git a/data/images/worldmap/forest/gr2.png b/data/images/worldmap/forest/gr2.png
index 87075343a..34a757d4a 100644
Binary files a/data/images/worldmap/forest/gr2.png and b/data/images/worldmap/forest/gr2.png differ
diff --git a/data/images/worldmap/forest/gr3.png b/data/images/worldmap/forest/gr3.png
index dc4f767c6..8b1ac7fe3 100644
Binary files a/data/images/worldmap/forest/gr3.png and b/data/images/worldmap/forest/gr3.png differ
diff --git a/data/images/worldmap/forest/gr4.png b/data/images/worldmap/forest/gr4.png
index 6347d332d..64bf6893b 100644
Binary files a/data/images/worldmap/forest/gr4.png and b/data/images/worldmap/forest/gr4.png differ
diff --git a/data/images/worldmap/forest/gr5.png b/data/images/worldmap/forest/gr5.png
index 738a1b9c3..e6a048545 100644
Binary files a/data/images/worldmap/forest/gr5.png and b/data/images/worldmap/forest/gr5.png differ
diff --git a/data/images/worldmap/forest/gr6.png b/data/images/worldmap/forest/gr6.png
index 793af7733..5f6ed7814 100644
Binary files a/data/images/worldmap/forest/gr6.png and b/data/images/worldmap/forest/gr6.png differ
diff --git a/data/levels/world2/worldmap.stwm b/data/levels/world2/worldmap.stwm
index 646a4bee8..c13ee3f40 100644
--- a/data/levels/world2/worldmap.stwm
+++ b/data/levels/world2/worldmap.stwm
@@ -39,4 +39,10 @@
     (y 5)
     (name "level6.stl")
   )
+  (level
+    (x 32)
+    (y 17)
+    (sprite "images/worldmap/common/torch.sprite")
+    (name "castle.stl")
+  )
 )