 Jace
|
95f9065037
|
Merge branch 'master' into Dirtybit
# Conflicts:
# include/Engine/Sound/SoundManager.h
|
2016-03-13 01:07:17 +01:00 |
|
|
Jace
|
a1fda82d3a
|
Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself
|
2016-03-13 00:57:00 +01:00 |
|
|
Jace
|
01db8e0615
|
Merge remote-tracking branch 'origin/master' into Dirtybit
# Conflicts:
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Transform.cpp
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/AnimationSystem.cpp
# src/Engine/Rendering/BoneAttachmentSystem.cpp
# src/Game/Systems/CapturePointSystem.cpp
# src/Game/Systems/ExplosionEffectSystem.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
|
2016-03-12 04:09:53 +01:00 |
|
|
Jace
|
80649ce51d
|
Updated the ENTIRE CODEBASE TO MATCH
|
2016-03-12 00:38:33 +01:00 |
|
 stiffly
|
e444a86ec5
|
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
|
2016-03-10 10:36:20 +01:00 |
|
|
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 |
|
|
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
|
3fda25b604
|
Working first person animations for AssaultWeapon and DefenderWeapon and reload effect for AssaultWeapon
|
2016-03-07 19:38:49 +01:00 |
|
|
Jace
|
2b55450c18
|
Cray cray weapons
|
2016-03-04 08:54:59 +01:00 |
|
|
stiffly
|
3613d66d32
|
The EPlaySoundOnEntity event now has support to set the gain on the sound. It now also uses EntityWrapper instead of EntityID.
|
2016-03-03 20:24:48 +01:00 |
|
|
stiffly
|
20c6caa408
|
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
# Conflicts:
# resources/DefaultConfig.ini
|
2016-03-03 17:32:04 +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 |
|
|
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 |
|