 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 |
|