 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 |
|
|
jancoow
|
36dc74a39e
|
Fixed crash at startup, improved walking speed
|
2016-06-21 14:00:04 +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
|
da0b1f5588
|
Johan fix
|
2016-06-20 17:16:29 +02:00 |
|