b9cfcdb11d
Merge branch 'main' into PlayerController
2023-03-10 17:22:05 +08:00
1d171710c5
Fixed bug where sub assets were not being loading properly
...
Implemented saving of parent container when cips are changed for animation
2023-03-10 17:11:09 +08:00
9eb5399f7b
Merge branch 'main' into PlayerController
2023-03-10 16:28:26 +08:00
9b9cf1a1bb
WIP for animatons
2023-03-10 16:26:52 +08:00
0173e7c302
Fixed RawAnimInspector changing any specific animation clip's values, causing a change in all animation clips' values
2023-03-10 16:21:18 +08:00
2cf67a1378
Merge branch 'main' into PlayerController
2023-03-10 14:59:47 +08:00
8c0ad47921
Added timescale for animation system
2023-03-10 14:55:49 +08:00
2eee1d4ab7
camera offset rotation fix along with ai not hard hard for box collider
2023-03-09 18:47:06 +08:00
0fb6927342
Merge pull request #410 from SHADE-DP/SP3-22-AnimationController
...
Implemented Animation Clip asset and animation controller
2023-03-09 16:19:39 +08:00
8a42cb4940
Merge branch 'main' into SP3-22-AnimationController
2023-03-09 15:46:31 +08:00
7f170deb27
Fixed animations not playing from the correct start point
2023-03-09 15:46:15 +08:00
65cece3e3c
Merge branch 'main' into SP3-4-Editor
2023-03-09 15:28:45 +08:00
fe41245008
Bug Fixes & Tweaks for editor
...
fixed window width for physics settings drop down
fixed double click to look at
fix crash when some fields in collider and rigidbody are set to 0.0f
2023-03-09 15:28:32 +08:00
baed0bec0b
Fixed animator component always using manual mode playback time
2023-03-09 15:08:38 +08:00
bf08be045a
Solved bugs with shadows
...
Switching a scene causes a crash from shadows.
2023-03-09 14:56:03 +08:00
ab2f3e395b
Animation clips now load the correct raw animation
2023-03-09 14:47:48 +08:00
ac971f0945
Fixed infinite loop and incorrect playback setting for Animator
2023-03-09 14:46:06 +08:00
3d6bfaa119
Write raw anim asset id into anim clips
2023-03-09 13:46:39 +08:00
07a2eb2f64
Fixed not opening the correct Visual Studio version for scripts
2023-03-09 13:18:09 +08:00
e816df28a8
Clips can now be dragged and dropped into the animation controller editor
2023-03-09 12:07:16 +08:00
e3a552f983
Wrote scripting interface for trajectory rendering
2023-03-09 10:45:57 +08:00
2c8eca4125
Added facility to create new animation clip container asset.
...
Changed raw anim editor to open when double clicking anim container asset/after creating new anim container asset
Changed new clip fields from slider to unsigned int input
2023-03-09 01:51:54 +08:00
7df9897598
Fixed bug in binary loader where result from load was always nullptr, changed pointer to pointer reference
2023-03-09 01:50:26 +08:00
2692db1ed3
Changed function to return pointer type instead of std::optional
2023-03-09 01:49:43 +08:00
8670fe5fa9
Added text RawAnimInspector for when no animations are selected
2023-03-08 22:03:08 +08:00
4012eb97ba
Auto stash before merge of "SP3-1-Rendering" and "origin/main"
...
Solved shadow bugs and WIP trajectory
2023-03-08 21:23:03 +08:00
57a8e385e4
Added editor field for Animation Controller of the Animator component in the inspector
2023-03-08 20:58:21 +08:00
69ac4d1219
Merge branch 'main' into SP3-22-AnimationController
2023-03-08 20:00:58 +08:00
35b60a24e4
Added variable to control number of simulation steps for the SimulateBody method
2023-03-08 19:06:57 +08:00
79fe9ec43d
Merge branch 'main' into SP3-22-AnimationController
...
# Conflicts:
# SHADE_Engine/src/Animation/SHAnimationClip.cpp
# SHADE_Engine/src/Animation/SHAnimationClip.h
# SHADE_Engine/src/Animation/SHAnimatorComponent.cpp
# SHADE_Engine/src/Animation/SHAnimatorComponent.h
# SHADE_Engine/src/Assets/Asset Types/Models/SHAnimationAsset.h
# SHADE_Engine/src/Assets/SHAssetMacros.h
# SHADE_Engine/src/Assets/SHAssetManager.cpp
2023-03-08 15:54:32 +08:00
1c12a05837
Added C# interface for animator, animation clip and animation controller
2023-03-08 15:29:29 +08:00
441d2fe7a4
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-08 14:15:12 +08:00
6f8387a5ea
Fixed bug where gravity scales were initialised to NaN
2023-03-08 12:59:51 +08:00
2bba48b09f
Accounted for deletion of lights
...
- Not entirely urgent, but removal of resources from render graph fails. Need a valid check of handles.
2023-03-08 10:02:51 +08:00
64e60a5114
Added editor functionality for lights to enable shadows
2023-03-08 09:38:07 +08:00
6383e7d559
Merge branch 'SP3-22-AnimationController' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-22-AnimationController
2023-03-08 00:24:45 +08:00
ea3b851ed0
Merge branch 'main' into SP3-13-Assets-Manager
2023-03-07 23:01:21 +08:00
615a5796f0
Added line to add subasset meta to parent asset
...
Rewrote loading of all animation clips into resource manager
2023-03-07 22:51:40 +08:00
73af61d2cb
Merge branch 'SP3-22-AnimationController' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-22-AnimationController
2023-03-07 22:34:36 +08:00
e285d5e6b2
Added functions for setting animation parameters
2023-03-07 22:34:32 +08:00
4d64dd34d8
Merge pull request #403 from SHADE-DP/AnimationClipAsset
...
Reimplemented animation clip container assets
2023-03-07 22:10:34 +08:00
3cc949bb7e
Animation container redefinition
2023-03-07 22:07:38 +08:00
07100de950
Added recognition for animation clip container as a file
...
Added functions to create new sub asset for animation clips
Added recognition for animation clip containers when creating new assets
2023-03-07 22:06:42 +08:00
eae6f6399b
Changed implementation of binary loader to load animation clip containers instead of individual animation clips
2023-03-07 22:05:33 +08:00
4144fe0d4a
Merge branch 'main' into SP3-22-AnimationController
...
# Conflicts:
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp
2023-03-07 20:30:47 +08:00
dc32c5c9aa
Implemented saving of animation controller from editor
2023-03-07 20:29:57 +08:00
259fca6443
Merge pull request #402 from SHADE-DP/SP3-2-Physics
...
Added Capsule Collider, AABB Query & SimulateBody for Trajectory path prediction
2023-03-07 20:11:21 +08:00
ff27925f2d
Added ability to reset state, delete links and nodes
2023-03-07 20:05:37 +08:00
6d01bd0b78
Added ability to set starting node
2023-03-07 19:00:10 +08:00
e3fb14d698
Merge branch 'main' into SP3-2-Physics
2023-03-07 18:48:31 +08:00
Glence