Merge branch 'master' of hongabar.org:robotgame

resources/graphics/TODO.txt

@@ -6,8 +6,15 @@ DONE	/weight_indicator/	weight scale indicator (arrow moving 180 degrees from le
 DONE	/numbered_stones/	symbol stones
 DONE	lasersource		lasersource
 DONE	lasertarget.png		lasertarget
+DONE	/door/			gate
+				tiles with symbols for level 1 tasks.
+				widen block03.png
 dummy	spacecraft.png		spaceship
-dummy	wall.png		walls (in-door)
-dummy	/door/			gate
 				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