 jancoow
|
06a768a3a1
|
Fixed right weapon
|
2016-06-21 11:32:37 +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
|
83557c7ba7
|
Added controller code
|
2016-06-20 20:33:28 +02:00 |
|
 Remco
|
881b58138c
|
crystal displayed on interface, with fancy gradient and the most beautifull colors for the crystal :)
|
2016-06-08 13:08:14 +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
|
908786897f
|
Added world loading and other various improvements
|
2016-05-25 22:29:18 +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 |
|
|
Remco
|
e5664e207d
|
weapons are facing next to the camera
|
2016-05-17 10:34:11 +02:00 |
|
|
kennyboy55
|
049fb28ffc
|
Added more structure, added abstraction to existing parts
|
2016-05-11 12:37:18 +02:00 |
|