 kennyboy55
|
942b068851
|
Merge branch 'developer' into feature/Controller
# Conflicts:
# CrystalPoint.cpp
# Player.cpp
|
2016-06-21 15:14:08 +02:00 |
|
|
kennyboy55
|
8700aa90af
|
Bugfixes, added sound to portal and enemy in JSON
|
2016-06-21 13:51:16 +02:00 |
|
 jancoow
|
3f8623d0bf
|
Merge remote-tracking branch 'origin/developer' into feature/Controller
Added support for second controller
# Conflicts:
# CrystalPoint.cpp
# CrystalPoint.h
# CrystalPoint.vcxproj
# CrystalPoint.vcxproj.filters
|
2016-06-21 11:24:55 +02:00 |
|
|
kennyboy55
|
ce2f658b61
|
Merge branch 'developer' into feature/Menu
|
2016-06-20 20:39:00 +02:00 |
|
|
jancoow
|
030a136e8b
|
Working version for linux
|
2016-06-20 20:00:58 +02:00 |
|
|
kennyboy55
|
ced3ff4462
|
Attempt implement menu (unresolved symbol error)
|
2016-06-09 17:56:37 +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 |
|
|
kennyboy55
|
84fcc346a9
|
Implement optimised array rendering
|
2016-05-25 12:44:24 +02:00 |
|
|
Remco
|
d01efecb0e
|
enemy comes to you when in his radius
|
2016-05-23 08:48:23 +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 |
|
|
Remco
|
a38a6d3c5f
|
get player out of main. player is now a singelton?(not sure of singleton is good inplemented). Added player singleton in worldstate
|
2016-05-19 11:27:32 +02:00 |
|
|
kennyboy55
|
876ec56780
|
Started rewriting
|
2016-05-17 15:31:49 +02:00 |
|
|
kennyboy55
|
3d97ade42e
|
Parse all lighting
|
2016-05-12 13:17:03 +02:00 |
|
 Jannick van Ballegooijen
|
11f07b154b
|
added diffuse / ambient obj parsing
|
2016-05-12 12:17:56 +02:00 |
|
|
kennyboy55
|
049fb28ffc
|
Added more structure, added abstraction to existing parts
|
2016-05-11 12:37:18 +02:00 |
|
|
kennyboy55
|
77ac841b8b
|
Project init
|
2016-05-10 14:03:58 +02:00 |
|