Commit Graph
9 Commits
Author SHA1 Message Date
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
kennyboy55 ae80c7a5bf Add health/xp/level interface 2016-05-28 16:04:44 +02:00
kennyboy55 34ea491f39 Remove scale 2016-05-28 13:11:11 +02:00
kennyboy55 d83cc6403c Spawn objects from file 2016-05-27 10:56:24 +02:00
kennyboy55 1c59a3bc6f Fix player height (not working with scale) 2016-05-26 18:53:36 +02:00
kennyboy55 2b0e22d4c9 Added height at location 2016-05-26 17:06:34 +02:00
kennyboy55 4c613b606a Implemented getHeight 2016-05-26 13:21:14 +02:00
kennyboy55 56e174ae2f Lord and Savior Johan 2016-05-26 12:53:22 +02:00
kennyboy55 965b54c901 Added heightmap 2016-05-25 11:31:37 +02:00