Commit Graph
73 Commits
Author SHA1 Message Date
Remco bba0a2e2a0 picking up crystal(sphere) 2016-06-08 12:41:33 +02:00
Aaldert 117010b9fe OpenAl Werkt! en Setup enzo 2016-06-05 23:49:06 +02:00
Remco 293ceb0b9f enemy walking around world 2016-06-03 13:58:07 +02:00
Remco b827885f40 enemy collide logic in enemy and out of world 2016-06-03 13:51:54 +02:00
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
Remco c3fe041eb1 enemy logic added to enemy and out of world 2016-06-03 11:09:48 +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 908786897f Added world loading and other various improvements 2016-05-25 22:29:18 +02:00
Remco b2fa0bc028 Merge branch 'developer' into enemy
# Conflicts:
#	World.h
#	worlds/world1.json
2016-05-25 13:42:02 +02:00
Remco cf124b3f38 enemy collison added, no jittering anymore 2016-05-25 13:38:13 +02:00
kennyboy55 965b54c901 Added heightmap 2016-05-25 11:31:37 +02:00
jancoow e7a7cc5588 Fixed capital letters and string return error.. 2016-05-23 12:34:55 +02:00
Remco 9d3cfa7e2a Merge branch 'developer' into johan
# Conflicts:
#	World.cpp
#	worlds/world1.json
2016-05-23 10:34:21 +02:00
Remco d01efecb0e enemy comes to you when in his radius 2016-05-23 08:48:23 +02:00
jancoow 7d13269480 Refactor johan branch for compiling with g++ 2016-05-22 23:19:05 +02:00
kennyboy55 a8415db4ac Added new Johan Code 2016-05-20 13:00:04 +02:00
kennyboy55 7c4ee37867 Johan is love, Johan is life 2016-05-19 14:25:03 +02:00