 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 |
|
 viktorljung
|
d42d886dcc
|
3rd person animations synced with 1st person animations
|
2016-03-09 18:27:09 +01:00 |
|
|
viktorljung
|
2ba245368b
|
Improved movement animaitons
Added a SetBlendWeight event that sets the weight for all nodes with a name.
|
2016-03-08 11:21:40 +01:00 |
|
|
viktorljung
|
7ba0e4ea9d
|
Run, Strafe and jump animations now playing
|
2016-03-04 08:35:02 +01:00 |
|
|
viktorljung
|
1bd71931b8
|
Fixed crash when trying to blend to a nonexistent node
|
2016-03-04 02:53:23 +01:00 |
|
|
viktorljung
|
e3fbd2082c
|
BlendQueues fully working
|
2016-03-03 23:20:13 +01:00 |
|
|
viktorljung
|
68332102ea
|
Can now blend non unique nodes
|
2016-03-03 21:20:55 +01:00 |
|
|
viktorljung
|
a3494b92c8
|
Blending queues now working
|
2016-03-03 17:48:25 +01:00 |
|
|
viktorljung
|
362378536e
|
Switching rooms
|
2016-03-03 01:39:12 +01:00 |
|
|
viktorljung
|
e9bbb5ed2a
|
Fixed BlendTree crash when animation nodes are null
|
2016-03-02 17:42:55 +01:00 |
|
|
viktorljung
|
1aefa1dec6
|
AutoAnimationBlend now working correctly for unique nodes
|
2016-03-02 17:06:51 +01:00 |
|
|
viktorljung
|
07ccb9c041
|
AutoAnimationBlend on unique node working but scale is not working correctly
|
2016-03-02 13:30:04 +01:00 |
|
|
viktorljung
|
5bc0483f49
|
Removed AnimationOffset and improved BlendTree
|
2016-02-29 15:51:37 +01:00 |
|
|
viktorljung
|
af034673f6
|
BoneAttachments now working and BlendTrees are created in the AnimationSystem
|
2016-02-26 10:17:47 +01:00 |
|
|
viktorljung
|
c97d0d9381
|
Fixed memory leaks and cleaned up Skeleton and BlendTree
|
2016-02-25 11:30:09 +01:00 |
|
|
viktorljung
|
606a9bf94f
|
BlendTree now working but has some memory leaks
|
2016-02-23 17:06:41 +01:00 |
|
|
viktorljung
|
127edb4e60
|
Fixed some memory leaks
|
2016-02-22 17:47:30 +01:00 |
|
|
viktorljung
|
abd36c81f8
|
Added BlendTree that stores and blends multiple animations
|
2016-02-22 15:58:38 +01:00 |
|