kennyboy55 5fc92d3f2a Merge branch 'developer' into world/Building ...

# Conflicts:
#	World.cpp
#	worlds/rock.json

2016-06-22 01:49:27 +02:00

..

rock.json

Merge branch 'developer' into world/Building

2016-06-22 01:49:27 +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

Better weapon alignment

2016-06-22 00:32:19 +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