Commit Graph
17 Commits
Author SHA1 Message Date
Aaldert 5c776e3d3a Test 2016-06-20 14:53:40 +02:00
Aaldert b7d73c9abe Test 1 2016-06-20 13:43:13 +02:00
Remco 0ca94aef4d when collected all crystals it is possible to move to the next level, by stepping in the portal 2016-06-10 10:56:54 +02:00
kennyboy55 579e02728a Merge branch 'developer' into feature/Skybox
# Conflicts:
#	CrystalPoint.vcxproj.filters
#	World.h
2016-06-09 13:03:28 +02:00
kennyboy55 69561794d8 Reimplemented into newer develop version 2016-06-09 12:01:24 +02:00
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
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
Aaldert 0f8fd67dd3 Merge remote-tracking branch 'refs/remotes/origin/developer' into feature/OpenAL
# Conflicts:
#	CrystalPoint.vcxproj.filters
#	Enemy.h
2016-06-05 16:06:48 +02:00
kennyboy55 ae80c7a5bf Add health/xp/level interface 2016-05-28 16:04:44 +02:00
kennyboy55 d83cc6403c Spawn objects from file 2016-05-27 10:56:24 +02:00
kennyboy55 908786897f Added world loading and other various improvements 2016-05-25 22:29:18 +02:00
kennyboy55 7c4ee37867 Johan is love, Johan is life 2016-05-19 14:25:03 +02:00
kennyboy55 876ec56780 Started rewriting 2016-05-17 15:31:49 +02:00
kennyboy55 049fb28ffc Added more structure, added abstraction to existing parts 2016-05-11 12:37:18 +02:00
kennyboy55 9769b88156 Project structure 2016-05-11 11:14:23 +02:00
kennyboy55 77ac841b8b Project init 2016-05-10 14:03:58 +02:00