Merge branch 'master' of hongabar.org:robotgame

2012-08-10 18:37:27 +02:00 · 2012-08-10 18:37:27 +02:00 · 91a228af72
parent a49c3135c4 73e7c0e80d
commit 91a228af72
26 changed files with 9 additions and 9 deletions
--- a/resources/graphics/TODO.txt
+++ b/resources/graphics/TODO.txt
@ -1,9 +1,9 @@
-wheel
-water/lava/to be discussed
-well with alpha in center to allow coloured light
-spaceship
-walls (in-door)
-gate
-numbered stones (symbols to be discussed)
-floor tiles
-weight scale indicator (arrow moving 180 degrees from left to right)
+	wheel
+	water/lava/to be discussed
+done	well with alpha in center to allow coloured light
+	spaceship
+	walls (in-door)
+	gate
+	numbered stones (symbols to be discussed)
+done	floor tiles
+	weight scale indicator (arrow moving 180 degrees from left to right)
--- a/resources/graphics/robot_carry/right/robot0004.png
+++ b/resources/graphics/robot_carry/right/robot0004.png
--- a/resources/graphics/robot_carry/right/robot0005.png
+++ b/resources/graphics/robot_carry/right/robot0005.png
--- a/resources/graphics/robot_carry/right/robot0006.png
+++ b/resources/graphics/robot_carry/right/robot0006.png
--- a/resources/graphics/robot_carry/right/robot0007.png
+++ b/resources/graphics/robot_carry/right/robot0007.png
--- a/resources/graphics/robot_carry/right/robot0008.png
+++ b/resources/graphics/robot_carry/right/robot0008.png
--- a/resources/graphics/robot_carry/right/robot0009.png
+++ b/resources/graphics/robot_carry/right/robot0009.png
--- a/resources/graphics/robot_carry/right/robot0010.png
+++ b/resources/graphics/robot_carry/right/robot0010.png
--- a/resources/graphics/robot_carry/right/robot0011.png
+++ b/resources/graphics/robot_carry/right/robot0011.png
--- a/resources/graphics/robot_carry/right/robot0012.png
+++ b/resources/graphics/robot_carry/right/robot0012.png
--- a/resources/graphics/robot_carry/right/robot0013.png
+++ b/resources/graphics/robot_carry/right/robot0013.png
--- a/resources/graphics/robot_carry/right/robot0014.png
+++ b/resources/graphics/robot_carry/right/robot0014.png
--- a/resources/graphics/robot_carry/right/robot0015.png
+++ b/resources/graphics/robot_carry/right/robot0015.png
--- a/resources/graphics/robot_carry/right/robot0016.png
+++ b/resources/graphics/robot_carry/right/robot0016.png
--- a/resources/graphics/robot_carry/right/robot0017.png
+++ b/resources/graphics/robot_carry/right/robot0017.png
--- a/resources/graphics/robot_carry/right/robot0018.png
+++ b/resources/graphics/robot_carry/right/robot0018.png
--- a/resources/graphics/robot_carry/right/robot0019.png
+++ b/resources/graphics/robot_carry/right/robot0019.png
--- a/resources/graphics/robot_carry/right/robot0020.png
+++ b/resources/graphics/robot_carry/right/robot0020.png
--- a/resources/graphics/robot_carry/right/robot0021.png
+++ b/resources/graphics/robot_carry/right/robot0021.png
--- a/resources/graphics/robot_carry/right/robot0022.png
+++ b/resources/graphics/robot_carry/right/robot0022.png
--- a/resources/graphics/robot_carry/right/robot0023.png
+++ b/resources/graphics/robot_carry/right/robot0023.png
--- a/resources/graphics/robot_carry/right/robot0024.png
+++ b/resources/graphics/robot_carry/right/robot0024.png
--- a/resources/graphics/robot_carry/right/robot0025.png
+++ b/resources/graphics/robot_carry/right/robot0025.png
--- a/resources/graphics/robot_carry/right/robot0026.png
+++ b/resources/graphics/robot_carry/right/robot0026.png
--- a/resources/graphics/robot_carry/right/robot0027.png
+++ b/resources/graphics/robot_carry/right/robot0027.png
--- a/resources/graphics/robot_carry/right/robot0028.png
+++ b/resources/graphics/robot_carry/right/robot0028.png