Merge branch 'master' of hongabar.org:robotgame

This commit is contained in:
Sakse Dalum 2012-08-12 19:06:00 +02:00
commit 40da292001
16 changed files with 2 additions and 3 deletions

View File

@ -11,10 +11,9 @@ DONE /door/ gate
widen block03.png widen block03.png
dummy spacecraft.png spaceship dummy spacecraft.png spaceship
elevating_platform elevating_platform
<<<<<<< HEAD
dummy wall.png walls (in-door) dummy wall.png walls (in-door)
teleportation effect (Tænker evt. at det bare skal være en cirkel på jorden, der lyser op.) teleportation effect (Tænker evt. at det bare skal være en cirkel på jorden, der lyser op.)
water/lava/to be discussed 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.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB