Merge branch 'master' of hongabar.org:robotgame

This commit is contained in:
Sakse Dalum 2012-08-12 18:28:21 +02:00
commit da2bcecfa5
21 changed files with 9 additions and 2 deletions

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 742 B

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 889 B

After

Width:  |  Height:  |  Size: 41 KiB