Commit Graph

2628 Commits

Author SHA1 Message Date
Glence 2eee1d4ab7 camera offset rotation fix along with ai not hard hard for box collider 2023-03-09 18:47:06 +08:00
Glence ec91bdb687 Merge branch 'main' into PlayerController 2023-03-09 18:38:08 +08:00
XiaoQiDigipen 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
XiaoQiDigipen d8e15fdbdd
Merge pull request #409 from SHADE-DP/SP3-2-Physics
Added Capsule Collider to C#
2023-03-09 16:12:21 +08:00
Diren D Bharwani 5cd6b927e6 Merge branch 'main' into SP3-2-Physics 2023-03-09 16:07:10 +08:00
XiaoQiDigipen 636bf6ec43
Merge pull request #408 from SHADE-DP/SP3-4-Editor
Fixed window width for physics settings drop down, fixed editor look at, fixed crash when some fields set to 0
2023-03-09 16:00:34 +08:00
Kah Wei 8a42cb4940 Merge branch 'main' into SP3-22-AnimationController 2023-03-09 15:46:31 +08:00
Kah Wei 7f170deb27 Fixed animations not playing from the correct start point 2023-03-09 15:46:15 +08:00
Diren D Bharwani 4d935b7399 Merge branch 'main' into SP3-2-Physics 2023-03-09 15:41:38 +08:00
Diren D Bharwani 621f8a5f38 Added Capsule Collider to Managed 2023-03-09 15:41:27 +08:00
SHAM-DP 65cece3e3c Merge branch 'main' into SP3-4-Editor 2023-03-09 15:28:45 +08:00
SHAM-DP 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
Xiao Qi 54e186063c Changed to correct RIG 2023-03-09 15:20:40 +08:00
Kah Wei bfbca68d50 Added more animation tests 2023-03-09 15:14:30 +08:00
XiaoQiDigipen f07ce5211b
Merge pull request #407 from SHADE-DP/SP3-1-Rendering
Fixed Shadow bugs and implemented scripting for trajectory rendering
2023-03-09 15:10:59 +08:00
Kah Wei baed0bec0b Fixed animator component always using manual mode playback time 2023-03-09 15:08:38 +08:00
Brandon Mak f34cdc0f36 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-09 14:56:14 +08:00
Brandon Mak bf08be045a Solved bugs with shadows
Switching a scene causes a crash from shadows.
2023-03-09 14:56:03 +08:00
Kah Wei ab2f3e395b Animation clips now load the correct raw animation 2023-03-09 14:47:48 +08:00
Kah Wei ac971f0945 Fixed infinite loop and incorrect playback setting for Animator 2023-03-09 14:46:06 +08:00
Diren D Bharwani 1304f6e591 Merge branch 'main' into SP3-2-Physics 2023-03-09 14:40:40 +08:00
Xiao Qi bfc8b3600f Removed stupid 10 second time limit on dependencies pull 2023-03-09 13:56:36 +08:00
Xiao Qi 3d6bfaa119 Write raw anim asset id into anim clips 2023-03-09 13:46:39 +08:00
Glence 63360a4616 Merge branch 'main' into PlayerController 2023-03-09 13:44:49 +08:00
Kah Wei 5669babc0f Fixed animator components in scripts not being retrievable. Also added script for testing animations 2023-03-09 13:35:49 +08:00
Glence 73022cb8d6 update scene with new tween 2023-03-09 13:22:14 +08:00
Kah Wei 07a2eb2f64 Fixed not opening the correct Visual Studio version for scripts 2023-03-09 13:18:09 +08:00
Kah Wei fc789334bd Fixed animation assets fields for scripts not supporting the correct types 2023-03-09 13:10:06 +08:00
Kah Wei e816df28a8 Clips can now be dragged and dropped into the animation controller editor 2023-03-09 12:07:16 +08:00
Brandon Mak e3a552f983 Wrote scripting interface for trajectory rendering 2023-03-09 10:45:57 +08:00
Xiao Qi 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
Xiao Qi 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
Xiao Qi 2692db1ed3 Changed function to return pointer type instead of std::optional 2023-03-09 01:49:43 +08:00
Glence 66026ff926 jumppad done 2023-03-09 00:33:36 +08:00
Kah Wei 8670fe5fa9 Added text RawAnimInspector for when no animations are selected 2023-03-08 22:03:08 +08:00
Brandon Mak 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
Kah Wei 57a8e385e4 Added editor field for Animation Controller of the Animator component in the inspector 2023-03-08 20:58:21 +08:00
Kah Wei 7ab1ee6fec Added serialization for animation assets for scripts 2023-03-08 20:34:11 +08:00
Brandon Mak 2ff28a544d Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-08 20:12:13 +08:00
Kah Wei 69ac4d1219 Merge branch 'main' into SP3-22-AnimationController 2023-03-08 20:00:58 +08:00
Diren D Bharwani 3a9ab9094f Merge branch 'main' into SP3-2-Physics 2023-03-08 19:07:46 +08:00
Diren D Bharwani 35b60a24e4 Added variable to control number of simulation steps for the SimulateBody method 2023-03-08 19:06:57 +08:00
Glence 10555f646c base for jumppad 2023-03-08 18:49:36 +08:00
Diren D Bharwani 90457757a3 Merge branch 'main' into SP3-2-Physics 2023-03-08 18:46:07 +08:00
Glence 87f7b42ec3 made raccoon use capsule, setting for fov done 2023-03-08 17:00:43 +08:00
Glence 6854c41614 setting up volume 2023-03-08 16:22:05 +08:00
Kah Wei 43edfeb14f Added serialization of animation assets for scripts 2023-03-08 16:13:04 +08:00
Kah Wei 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
Kah Wei 1c12a05837 Added C# interface for animator, animation clip and animation controller 2023-03-08 15:29:29 +08:00
XiaoQiDigipen ef7cd4c0c0
Merge pull request #406 from SHADE-DP/SP3-1-Rendering
Implemented shadows. Light components can enable shadows through editor.
2023-03-08 14:17:15 +08:00