 viktorljung
|
3a0cff7a83
|
boost check for defender
|
2016-03-13 21:10:22 +01:00 |
|
|
viktorljung
|
44f46cda8d
|
Merge remote-tracking branch 'origin/master' into Movement
# Conflicts:
# include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CP_Rocky2.xml
# resources/Schema/Entities/MuzzleFlashBlue.xml
# resources/Schema/Entities/MuzzleFlashFire.xml
# resources/Schema/Entities/MuzzleFlashRed.xml
# resources/Schema/Types/Entity.xsd
# resources/Shaders/Sprite.frag.glsl
# src/Game/Systems/AbilityCooldownHUDSystem.cpp
# src/Game/Systems/BoostIconsHUDSystem.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
# src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
# src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
|
2016-03-13 15:17:15 +01:00 |
|
|
viktorljung
|
60c6aa2486
|
Defender first person tracers done
|
2016-03-13 02:35:02 +01:00 |
|
|
viktorljung
|
e0a6b09d36
|
Defender early alpha
|
2016-03-11 19:16:34 +01:00 |
|
 Jace
|
1992b6cde1
|
WIP Defender tracers
|
2016-03-10 21:15:27 +01:00 |
|
|
Jace
|
c82be79bb8
|
Functionally working defender weapon
|
2016-03-10 19:26:14 +01:00 |
|
 stiffly
|
ec3ed1f46f
|
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
# Conflicts:
# include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
|
2016-03-08 10:39:52 +01:00 |
|
|
Jace
|
b2371f4a43
|
Working AssaultWeapon
|
2016-03-03 20:00:42 +01:00 |
|
|
Jace
|
9d4441852c
|
DefenderWeapon view punch and crosshair travel with return
|
2016-03-03 03:49:44 +01:00 |
|
|
Jace
|
13546aa3fc
|
DefenderWeapon and SidearmWeapon
|
2016-03-03 01:13:39 +01:00 |
|
|
Jace
|
b431a875f7
|
New weapon behaviours
|
2016-03-02 22:48:01 +01:00 |
|
|
stiffly
|
d3ffb9768b
|
Sets velocity to 0, does not make use of doppler effect atm
|
2016-03-01 14:48:07 +01:00 |
|
|
Jace
|
bb76c9d248
|
WIP multi-weapon behaviours
|
2016-02-29 06:58:57 +01:00 |
|