merge to master

cgack · Jul 29, 2012 · 91186fa · 91186fa
1 parent 9c73f65
commit 91186fa
Show file tree

Hide file tree

Showing 31 changed files with 2,171 additions and 203 deletions.
diff --git a/area0.tmx b/area0.tmx
diff --git a/area0_e.tmx b/area0_e.tmx
diff --git a/test1.tmx → area0_farm.tmx b/test1.tmx → area0_farm.tmx
diff --git a/area0_n.tmx b/area0_n.tmx
diff --git a/area0_s.tmx b/area0_s.tmx
diff --git a/area0_w.tmx b/area0_w.tmx
diff --git a/area_east.tmx b/area_east.tmx
diff --git a/area_north.tmx b/area_north.tmx
diff --git a/area_south.tmx b/area_south.tmx
diff --git a/area_west.tmx b/area_west.tmx
diff --git a/assets/Character1Shoot.png b/assets/Character1Shoot.png
diff --git a/assets/Character1Walk.png b/assets/Character1Walk.png
diff --git a/assets/barrel.png b/assets/barrel.png
diff --git a/assets/bat.png b/assets/bat.png
diff --git a/assets/bee.png b/assets/bee.png
diff --git a/assets/cabinets.png b/assets/cabinets.png
diff --git a/assets/country.png b/assets/country.png
diff --git a/assets/cup.png b/assets/cup.png
diff --git a/assets/hole.png b/assets/hole.png
diff --git a/assets/inside.png b/assets/inside.png
diff --git a/assets/treetop.png b/assets/treetop.png
diff --git a/assets/trunk.png b/assets/trunk.png
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 </head>
 <body>
-	<!--<span id="framecounter">&nbsp;</span>	-->
+	<span id="framecounter">&nbsp;</span>	
 	<div id="jsapp" align="center">
             <script type="text/javascript" src="melon.js"></script>
             <script type="text/javascript" src="main.js"></script>

diff --git a/inside.tmx b/inside.tmx