kennyboy55 95ab1879b4 Merge branch 'developer' into enemy ...

# Conflicts:
#	CrystalPoint.cpp
#	Entity.cpp
#	Player.cpp
#	Player.h
#	World.cpp
#	World.h

2016-06-03 11:30:19 +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

Add health/xp/level interface

2016-05-28 16:04:44 +02:00

small.png

Add health/xp/level interface

2016-05-28 16:04:44 +02:00

worlds.json

Merge branch 'developer' into enemy

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