 William Moberg
|
f632b45c9b
|
Merge branch 'MemoryOptimization' into Importer
# Conflicts:
# include/Engine/Rendering/Model.h
# src/Engine/Collision/Collision.cpp
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Collision/TriggerSystem.cpp
# src/Game/Systems/SpawnerSystem.cpp
|
2016-03-14 02:06:53 +01:00 |
|
 viktorljung
|
44f46cda8d
|
Merge remote-tracking branch 'origin/master' into Movement
# Conflicts:
# include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CP_Rocky2.xml
# resources/Schema/Entities/MuzzleFlashBlue.xml
# resources/Schema/Entities/MuzzleFlashFire.xml
# resources/Schema/Entities/MuzzleFlashRed.xml
# resources/Schema/Types/Entity.xsd
# resources/Shaders/Sprite.frag.glsl
# src/Game/Systems/AbilityCooldownHUDSystem.cpp
# src/Game/Systems/BoostIconsHUDSystem.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
# src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
# src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
|
2016-03-13 15:17:15 +01:00 |
|
 Jace
|
0516794db6
|
Separating RawModel from Model
|
2016-03-13 14:47:11 +01:00 |
|
|
Jace
|
f6113b9d9c
|
EEntityDeleted now provides an EntityWrapper instead of just an ID
|
2016-03-13 00:16:07 +01:00 |
|
|
viktorljung
|
0b26f23188
|
3rd person animations idle bug fixed
|
2016-03-12 15:47:19 +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 |
|
|
viktorljung
|
2a209c5d8e
|
AmmoSharing beta
|
2016-03-11 23:58:26 +01:00 |
|
|
viktorljung
|
b0e9cd3965
|
Forgot one console spammer
|
2016-03-10 10:47:58 +01:00 |
|
|
viktorljung
|
4e6ff16e58
|
Shadows for animated models and removed spam in console
|
2016-03-09 22:43:04 +01:00 |
|
|
viktorljung
|
d42d886dcc
|
3rd person animations synced with 1st person animations
|
2016-03-09 18:27:09 +01:00 |
|
|
viktorljung
|
8d1877321a
|
Fixed BoneAttachment offset rotation
|
2016-03-08 14:32:50 +01:00 |
|
|
viktorljung
|
f77a610519
|
Dash now looking good
|
2016-03-08 13:26:01 +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
|
1ff91a5c5d
|
fixup! Blend duration can now be 0.0
Commited input test stuff
|
2016-03-04 02:30:05 +01:00 |
|
|
viktorljung
|
49802fed91
|
Blend duration can now be 0.0
|
2016-03-04 02:24:13 +01:00 |
|
|
viktorljung
|
bebdacabb4
|
Clean up
|
2016-03-03 23:41:08 +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
|
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
|
abd36c81f8
|
Added BlendTree that stores and blends multiple animations
|
2016-02-22 15:58:38 +01:00 |
|
|
viktorljung
|
3c9c95cff4
|
Animation blending improved and Animation Override added
|
2016-02-18 16:34:18 +01:00 |
|
|
viktorljung
|
648d864d6e
|
Merge remote-tracking branch 'origin/master' into Animations
|
2016-02-11 23:48:30 +01:00 |
|
|
Jace
|
e47201ff61
|
First person shoot animations
|
2016-02-11 17:06:34 +01:00 |
|
|
viktorljung
|
607150189c
|
Different animations can now be played on multiple meshes, AnimationOffset seems to make the lighting buggy
|
2016-02-11 10:51:11 +01:00 |
|
|
viktorljung
|
9c08c351b8
|
fixed reverse Animation looping
|
2016-02-10 23:33:23 +01:00 |
|
|
viktorljung
|
dded296cde
|
Animation looping fix
|
2016-02-10 23:19:44 +01:00 |
|
|
viktorljung
|
224e95f34a
|
Fixed BoneAttachment component and optimized animation code a bit
|
2016-02-10 20:45:24 +01:00 |
|
|
viktorljung
|
7212217460
|
Added animation blending and offset animation component
|
2016-02-09 22:15:43 +01:00 |
|
|
viktorljung
|
933a32aa8d
|
Animations kind of working
|
2016-02-06 18:09:51 +01:00 |
|
|
viktorljung
|
b6e0332574
|
Fixed support for new animation structure, not done yet
|
2016-02-05 10:07:22 +01:00 |
|
|
viktorljung
|
6aec7555cc
|
WIP Waiting for importer
|
2016-02-04 11:13:33 +01:00 |
|
|
viktorljung
|
dba2fbdc0c
|
WIP
|
2016-02-02 14:52:31 +01:00 |
|
|
viktorljung
|
6ba87d2942
|
Fixed, Crash when trying to animate a model that doesn't contain animations
|
2016-02-01 10:42:23 +01:00 |
|
|
viktorljung
|
2ec5023752
|
Changed Animation and BoneAttachment "Name" field to "AnimationName" and "BoneName"
|
2016-01-27 17:27:34 +01:00 |
|
|
viktorljung
|
8fc8d56ee1
|
Added BoneAttachment component
|
2016-01-27 17:14:16 +01:00 |
|
|
viktorljung
|
a304b00038
|
fixed crashes
|
2016-01-24 21:12:41 +01:00 |
|
|
viktorljung
|
8cf9caf7aa
|
AnimationSystem working
|
2016-01-24 18:31:23 +01:00 |
|
|
viktorljung
|
af2f017cb4
|
AnimationSystem base WIP
|
2016-01-24 17:05:34 +01:00 |
|