Commit Graph

20 Commits

Author SHA1 Message Date
Jace ebd4c58c41 "Fixed" weapon spawning over network 2016-03-04 09:23:18 +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 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
Jace 26d6546d79 Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation 2016-03-02 18:53:40 +01:00
Jace bb76c9d248 WIP multi-weapon behaviours 2016-02-29 06:58:57 +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 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 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