Avans-TI/2.4-Crystalpoint @ 5ad61e525fd2a8849b5d6f4acb48a975f0607c80

Kenneth van Ewijk 5fc92d3f2a Merge branch 'developer' into world/Building		9 lat temu
..
rock.json	5fc92d3f2a Merge branch 'developer' into world/Building	9 lat temu
rockHeightmap.png	6306e8abd4 Heightmap fix, texture fix, rotating crystals and enemy height to 0	9 lat temu
rockStone.png	6306e8abd4 Heightmap fix, texture fix, rotating crystals and enemy height to 0	9 lat temu
small.json	27dfaf74c4 Better weapon alignment	9 lat temu
small.png	bba0a2e2a0 picking up crystal(sphere)	9 lat temu
worlds.json	0e99b9f719 Attempt fix rock world	9 lat temu