Merge branch 'master' of github.com:nko2/applied-phlebotinum

timoxley · Aug 28, 2011 · 886dd08 · 886dd08
2 parents 2c7ae95 + a58cede
commit 886dd08
Show file tree

Hide file tree

Showing 14 changed files with 247 additions and 2 deletions.
diff --git a/app/views/stylesheets/style.styl b/app/views/stylesheets/style.styl
@@ -51,4 +51,4 @@ footer
 	// 	padding: y-padding x-padding
 	#world
 		border: 0px solid #eee
-		background: url("/images/road-touched.jpg")
+		background: url("/images/game-bg.png") 50% 50%
diff --git a/public/images/game-bg.png b/public/images/game-bg.png
diff --git a/public/images/sprites/zombie-01-walk.png b/public/images/sprites/zombie-01-walk.png
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
@@ -43,5 +43,5 @@ footer a {
 }
 #content #world {
   border: 0px solid #eee;
-  background: url("/images/road-touched.jpg");
+  background: url("/images/game-bg.png") 50% 50%;
 }
diff --git a/resources/game-bg.png b/resources/game-bg.png
diff --git a/resources/human.svg b/resources/human.svg
diff --git a/resources/male-01-walk-left.png b/resources/male-01-walk-left.png
diff --git a/resources/male-01-walk-up.png b/resources/male-01-walk-up.png
diff --git a/resources/male-01-walk.png b/resources/male-01-walk.png
diff --git a/resources/road.svg b/resources/road.svg
diff --git a/resources/zombie-01-walk-down.png b/resources/zombie-01-walk-down.png
diff --git a/resources/zombie-01-walk-right.png b/resources/zombie-01-walk-right.png
diff --git a/resources/zombie-01-walk-up.png b/resources/zombie-01-walk-up.png
diff --git a/resources/zombie.svg b/resources/zombie.svg