 jancoow
|
ba0482ee0a
|
Merge remote-tracking branch 'origin/developer' into feature/weaponCollision
Added waeponswitch to backbutton of controller
# Conflicts:
# Enemy.cpp
# Player.cpp
# Weapon.cpp
# Weapon.h
|
2016-06-21 23:10:58 +02:00 |
|
|
jancoow
|
e7163fc07c
|
Added controller cursor in menu
|
2016-06-21 22:12:08 +02:00 |
|
 kennyboy55
|
3025fecf94
|
Load weapons from JSON
|
2016-06-21 18:25:16 +02:00 |
|
|
jancoow
|
4249e35653
|
Check if weapon collision point is inside enemy and do weapon damage
|
2016-06-21 17:00:36 +02:00 |
|
|
kennyboy55
|
83557c7ba7
|
Added controller code
|
2016-06-20 20:33:28 +02:00 |
|
|
kennyboy55
|
7c4ee37867
|
Johan is love, Johan is life
|
2016-05-19 14:25:03 +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 |
|