Merge branch 'master' of hongabar.org:robotgame

Conflicts: resources/graphics/TODO.txt
2012-08-12 18:05:00 +02:00
parent 65bf94bbd0 debca3bab2
commit b3c871292a
10 changed files with 188 additions and 47 deletions
--- a/resources/graphics/TODO.txt
+++ b/resources/graphics/TODO.txt
@@ -11,6 +11,10 @@ DONE	/door/			gate
 				widen block03.png
 dummy	spacecraft.png		spaceship
 				elevating_platform
+<<<<<<< HEAD
 dummy	wall.png		walls (in-door)
 				teleportation effect (Tænker evt. at det bare skal være en cirkel på jorden, der lyser op.)
 				water/lava/to be discussed
+=======
+                            tiles for level 1, matte and shining (green light)
+>>>>>>> debca3bab2cc711d7acdfe349ad41a2810b5d165