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

2866 Commits

Author SHA1 Message Date
SHAM-DP f32903f87d Merge branch 'main' into AudioImpl 2023-03-10 19:15:12 +08:00
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
SHAM-DP 8602a60feb Added cinematic audio 2023-03-10 19:07:10 +08:00
maverickdgg 56cda49ea7 Merge branch 'main' into SP3-20-UI-System 2023-03-10 19:01:20 +08:00
maverickdgg 82a20e49f7 updated buttons 2023-03-10 19:00:58 +08:00
XiaoQiDigipen 01256f6e22
Merge pull request #417 from SHADE-DP/SP3-141-Camera-System 
Fixed Camera Collision
 2023-03-10 19:00:31 +08:00
Kah Wei b443f32388 Merge branch 'SP3-22-AnimationController' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-22-AnimationController 2023-03-10 18:57:14 +08:00
Kah Wei d1e1a2e31c Fixed bug where animations would revert to bind pose when paused 2023-03-10 18:57:09 +08:00
maverickdgg 6be5895ec7 Fixed Camera Collision 2023-03-10 18:56:04 +08:00
Kah Wei e531a087f6 Added events for play, pause and finished animations 2023-03-10 18:53:40 +08:00
Brandon Mak 39bebd1db4 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-10 18:37:39 +08:00
Brandon Mak 801da75d87 Fixed shadows for animation 2023-03-10 18:37:28 +08:00
SHAM-DP 3ef6fef289 fix for options slider 2023-03-10 18:07:40 +08:00
XiaoQiDigipen f0c827a7f2
Merge pull request #416 from SHADE-DP/AudioImpl 
Added new audio banks, fix scaling for options sliders
 2023-03-10 17:55:58 +08:00
SHAM-DP 9a39e52939 Merge branch 'main' into AudioImpl 2023-03-10 17:46:09 +08:00
Brandon Mak 683ce6146a Merge branch 'main' into SP3-1-Rendering 2023-03-10 17:29:24 +08:00
XiaoQiDigipen b5ad6c5a89
Merge pull request #415 from SHADE-DP/PlayerController 
Raccoon animation and scene changes
 2023-03-10 17:28:15 +08:00
Glence 3f4674e38f minor fix 2023-03-10 17:25:41 +08:00
Glence b9cfcdb11d Merge branch 'main' into PlayerController 2023-03-10 17:22:05 +08:00
Glence a3318d500d change old audio code 2023-03-10 17:21:49 +08:00
XiaoQiDigipen a35db70ffd
Merge pull request #414 from SHADE-DP/SP3-22-AnimationController 
Fixed Bugs regarding animation clip edits
 2023-03-10 17:12:35 +08:00
Xiao Qi 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
Brandon Mak e9dee89b17 Accommodated animation when shadows are in the scene 2023-03-10 16:47:19 +08:00
Glence 9eb5399f7b Merge branch 'main' into PlayerController 2023-03-10 16:28:26 +08:00
Glence 9b9cf1a1bb WIP for animatons 2023-03-10 16:26:52 +08:00
XiaoQiDigipen 293358c41c
Merge pull request #413 from SHADE-DP/SP3-22-AnimationController 
Fixed RawAnimInspector changing any specific animation clip's values, causing a change in all animation clips' values
 2023-03-10 16:21:59 +08:00
Kah Wei 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
Glence 2cf67a1378 Merge branch 'main' into PlayerController 2023-03-10 14:59:47 +08:00
XiaoQiDigipen 6b4172e673
Merge pull request #412 from SHADE-DP/SP3-22-AnimationController 
Added time scale for animation system
 2023-03-10 14:58:03 +08:00
Kah Wei 8c0ad47921 Added timescale for animation system 2023-03-10 14:55:49 +08:00
XiaoQiDigipen 387de00ae6
Merge pull request #411 from SHADE-DP/SP3-6-c-scripting 
Fixed bug where C# Asset implicit bool conversion operators were internal
 2023-03-10 14:14:59 +08:00
Kah Wei 089eb9de26 Fixed bug where C# Asset implicit bool conversion operators were internal 2023-03-10 14:11:59 +08:00
Brandon Mak 33c2b1fd73 Merge branch 'main' into SP3-1-Rendering 2023-03-10 11:58:53 +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
Diren D Bharwani d4158faed1 Merge branch 'main' into SP3-2-Physics 2023-03-09 21:18:18 +08:00
Diren D Bharwani 97013ba73c Added override for simulating gravity in SimulateBody method 2023-03-09 21:18:05 +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
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