Aaldert 5c24a34202 Merge branch 'developer' into feature/OpenAL ...

# Conflicts:
#	CrystalPoint.vcxproj.filters
#	Enemy.cpp
#	Enemy.h
#	worlds/small.json

2016-06-09 11:44:45 +02:00

..

fire.json

Merge branch 'developer' into enemy

2016-06-03 11:30:19 +02:00

hell.pdn

Lord and Savior Johan

2016-05-26 12:53:22 +02:00

hell.png

Bugfix/performance improvement

2016-05-30 13:12:51 +02:00

helltexture.png

Added heightmap

2016-05-25 11:31:37 +02:00

hmcs.png

Bugfix/performance improvement

2016-05-30 13:12:51 +02:00

hmcstexture.png

Added heightmap

2016-05-25 11:31:37 +02:00

ice.json

Merge branch 'developer' into enemy

2016-06-03 11:30:19 +02:00

small.json

Merge branch 'developer' into feature/OpenAL

2016-06-09 11:44:45 +02:00

small.png

picking up crystal(sphere)

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

worlds.json

Merge branch 'developer' into enemy

2016-06-03 11:30:19 +02:00