 Jace
|
9d368348d5
|
Updated 3rd person and 1st person animation trees for assault to allow for third person weapon animations
|
2016-03-09 15:48:57 +01:00 |
|
|
Jace
|
3fda25b604
|
Working first person animations for AssaultWeapon and DefenderWeapon and reload effect for AssaultWeapon
|
2016-03-07 19:38:49 +01:00 |
|
|
Jace
|
b7a7f7fd5e
|
????
|
2016-03-04 15:02:01 +01:00 |
|
|
Jace
|
434ff1e7eb
|
????
|
2016-03-04 10:06:49 +01:00 |
|
|
Jace
|
42cccfbac0
|
Merge branch 'Weapons' of github.com:teamfisk/TacticalZ into Weapons
# Conflicts:
# assets
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
|
2016-03-04 08:56:58 +01:00 |
|
 Jocke
|
e2674d915e
|
Constrained weapon behavior to client side only
|
2016-03-04 08:55:55 +01:00 |
|
|
Jace
|
2b55450c18
|
Cray cray weapons
|
2016-03-04 08:54:59 +01:00 |
|
|
Jace
|
177667eef5
|
The only working branch ever
|
2016-03-04 05:02:25 +01:00 |
|
|
Jace
|
dbafab2cef
|
fixup! First attempt at AssaultWeapon animations!
|
2016-03-04 03:07:36 +01:00 |
|
|
Jace
|
03ea9bcf40
|
fixup! Duration no longer needed
|
2016-03-04 03:00:03 +01:00 |
|
|
Jace
|
d37b7c2277
|
fixup! First attempt at AssaultWeapon animations!
|
2016-03-04 02:55:19 +01:00 |
|
|
Jace
|
b7fa7f9119
|
Duration no longer needed
|
2016-03-04 02:50:03 +01:00 |
|
|
Jace
|
3a8f7c5d03
|
First attempt at AssaultWeapon animations!
|
2016-03-04 02:48:03 +01:00 |
|
|
Jace
|
7e6d32aaec
|
Fixed AssaultWeapon reload logic
|
2016-03-03 23:45:28 +01:00 |
|
|
Jace
|
b2371f4a43
|
Working AssaultWeapon
|
2016-03-03 20:00:42 +01:00 |
|
|
Jace
|
1210c91535
|
Added Gameplay.AutoReload bool to config
|
2016-03-03 13:51:47 +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 |
|
 verysecrethero
|
3c8df35be9
|
Merge remote-tracking branch 'origin/master' into AssaultBoost
# Conflicts:
# src/Game/Game.cpp
|
2016-03-02 15:59:16 +01:00 |
|
|
Jace
|
bb76c9d248
|
WIP multi-weapon behaviours
|
2016-02-29 06:58:57 +01:00 |
|
|
verysecrethero
|
b2304a95f8
|
Fixed some XML documentation
|
2016-02-18 13:49:22 +01:00 |
|
|
verysecrethero
|
7f489b3569
|
Added Assault,Defender,Sniper Components,Entities. Added ShieldAbility,Sprintability-Component (not implemented). Changed BoostSystem to use a childed Boost to the player. All friendly fire is 0 damage.
|
2016-02-18 10:40:09 +01:00 |
|
|
verysecrethero
|
c3ed429377
|
Added BoostSystem, Added BoostAssault entity XML
|
2016-02-17 18:11:36 +01:00 |
|
 stiffly
|
1cdcbf9b32
|
Merge remote-tracking branch 'origin/master' into Sound
# Conflicts:
# src/Game/Systems/PlayerSpawnSystem.cpp
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
|
2016-02-12 08:19:29 +01:00 |
|
|
stiffly
|
af39b892cd
|
Now plays a "Empty sound", "reload sound" and "hit mark sound" on appropriate occasions.
|
2016-02-12 08:05:35 +01:00 |
|
|
stiffly
|
1da432ba23
|
WIP sounds
|
2016-02-12 04:03:35 +01:00 |
|
|
Jace
|
71533b52ae
|
Map fix
|
2016-02-12 02:10:42 +01:00 |
|
|
Jace
|
5295133311
|
Hack to sync ammo over network until we have input replaying + Reload effect from all views
|
2016-02-12 01:45:54 +01:00 |
|
|
Jace
|
44a73ef883
|
fixup! Merge remote-tracking branch 'origin/master' into WeaponSystem
|
2016-02-11 23:44:20 +01:00 |
|
|
Jace
|
7cae84d4ee
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
# Conflicts:
# include/Engine/Core/EPlayerDamage.h
# src/Game/Game.cpp
# src/Game/Systems/Weapon/WeaponSystem.cpp
|
2016-02-11 22:52:51 +01:00 |
|
|
Jace
|
d1213f9f59
|
Working damage dealing, a super cool reload effect and hit markers!
|
2016-02-11 22:50:44 +01:00 |
|
|
Jace
|
e47201ff61
|
First person shoot animations
|
2016-02-11 17:06:34 +01:00 |
|