Commit Graph
5 Commits
Author SHA1 Message Date
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
kennyboy55 2b0e22d4c9 Added height at location 2016-05-26 17:06:34 +02:00
kennyboy55 908786897f Added world loading and other various improvements 2016-05-25 22:29:18 +02:00