xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity
2,655 Commits 81 Branches 9 Tags 86 MiB
Commit Graph

566 Commits

Author SHA1 Message Date
XiaoQiDigipen 062c11afa0
Merge pull request #418 from SHADE-DP/SP3-22-AnimationController 
Added Animator events and fixed Animator pause bug
 2023-03-10 19:07:36 +08:00
Kah Wei e531a087f6 Added events for play, pause and finished animations 2023-03-10 18:53:40 +08:00
SHAM-DP 9a39e52939 Merge branch 'main' into AudioImpl 2023-03-10 17:46:09 +08:00
Glence 3f4674e38f minor fix 2023-03-10 17:25:41 +08:00
Glence a3318d500d change old audio code 2023-03-10 17:21:49 +08:00
Glence 9b9cf1a1bb WIP for animatons 2023-03-10 16:26:52 +08:00
Glence 2cf67a1378 Merge branch 'main' into PlayerController 2023-03-10 14:59:47 +08:00
Kah Wei 8c0ad47921 Added timescale for animation system 2023-03-10 14:55:49 +08:00
Kah Wei 089eb9de26 Fixed bug where C# Asset implicit bool conversion operators were internal 2023-03-10 14:11:59 +08:00
Glence 57d1adb292 animation for raccoon WIP 2023-03-10 00:16:38 +08:00
Glence f706bd8188 updated level 1 &3 to have tree 2023-03-09 21:19:00 +08:00
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
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
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
Brandon Mak bf08be045a Solved bugs with shadows 
Switching a scene causes a crash from shadows.
 2023-03-09 14:56:03 +08:00
SHAM-DP 6dd503daad updated audio assets, fix scale for sfx & bgm sliders 2023-03-09 14:12:17 +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
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
Glence 66026ff926 jumppad done 2023-03-09 00:33:36 +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 69ac4d1219 Merge branch 'main' into SP3-22-AnimationController 2023-03-08 20:00:58 +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
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 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
Brandon Mak 441d2fe7a4 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-08 14:15:12 +08:00
Xiao Qi ea3b851ed0 Merge branch 'main' into SP3-13-Assets-Manager 2023-03-07 23:01:21 +08:00
Kah Wei 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
Diren D Bharwani e3fb14d698 Merge branch 'main' into SP3-2-Physics 2023-03-07 18:48:31 +08:00
Brandon Mak b6b2c75fc3 Implemented Shadows (f0kin finally) 2023-03-07 17:39:51 +08:00
maverickdgg e42a5c68f3 Settings 2023-03-07 10:08:30 +08:00
Diren D Bharwani 2197a3bcb9 Added capsule collider 
Debug draw is a bit wonky. Further polish needed,
 2023-03-07 04:51:58 +08:00
Xiao Qi 5e6b68915b Working Animations 2023-03-07 01:25:32 +08:00
Xiao Qi f861304f5e Testing in progress for skinning test 2023-03-06 17:34:38 +08:00
Diren D Bharwani 0b803d0bd1 Merge branch 'main' into SP3-2-Physics 2023-03-06 13:31:48 +08:00
Brandon Mak 826df94c96 Shadows WIP 2023-03-06 00:02:06 +08:00
Glence 52f61363c0 Build shiny highlight shader 2023-03-05 23:50:44 +08:00
Glence 8d6ef16625 Hot fix 
Pause menu fix
Offing gameplay UI on preview level
clipping of mouse
change some keydown to keyup
 2023-03-05 23:48:25 +08:00
Diren D Bharwani d59f4e88c2 Added gravity scale 
Update react dependency
 2023-03-05 23:39:33 +08:00
Glence e40346513c Pause sfx fix 2023-03-05 22:27:35 +08:00
Glence 794f59ac48 Adjusted stair collision 2023-03-05 21:37:29 +08:00
Glence 5191eb529a Update level 3 scene 2023-03-05 21:34:05 +08:00
Glence c118ec136f Call centering of mouse at the correct place and default DT on awake 2023-03-05 21:23:41 +08:00
Glence 9f57ed1ef1 small scene changes and reenable mouse centering and hiding 2023-03-05 21:11:24 +08:00
Glence e27b143819 shift pic to avoid black alpha 2023-03-05 20:53:16 +08:00