Remco 80f0c33b91 Merge branch 'developer' into feature/loadingscreen ...

# Conflicts:
#	worlds/rock.json

2016-06-22 02:17:44 +02:00

..

loadingScreen_picture.png

placed loadingscreen picture in json file of a world

2016-06-22 01:48:00 +02:00

rock.json

Merge branch 'developer' into feature/loadingscreen

2016-06-22 02:17:44 +02:00

rockHeightmap.png

Heightmap fix, texture fix, rotating crystals and enemy height to 0

2016-06-21 23:31:43 +02:00

rockStone.png

Heightmap fix, texture fix, rotating crystals and enemy height to 0

2016-06-21 23:31:43 +02:00

small.json

Merge branch 'developer' into feature/loadingscreen

2016-06-22 02:17:44 +02:00

small.png

picking up crystal(sphere)

2016-06-08 12:41:33 +02:00

worlds.json

Attempt fix rock world

2016-06-21 22:57:18 +02:00