Commit Graph

2890 Commits

Author SHA1 Message Date
maverickdgg f9a3fe72ce Merge branch 'main' into SP3-141-Camera-System 2023-03-10 23:34:06 +08:00
maverickdgg 0f8d841f89 Re-enabled ai in L3 2023-03-10 23:33:59 +08:00
maverickdgg c31bb321ad Camera Collision changes 2023-03-10 23:32:22 +08:00
XiaoQiDigipen bc567f626f
Merge pull request #424 from SHADE-DP/SP3-6-c-scripting
Added proper handling for loaded null managed assemblies
2023-03-10 22:43:55 +08:00
XiaoQiDigipen 510ba411e9
Merge pull request #423 from SHADE-DP/SP3-10-input-management
Corrected Mouse Velocity Calculation when Mouse Centering is On
2023-03-10 22:43:01 +08:00
Kah Wei 47621d7436 Added extra line to log an error if a null assembly is detected 2023-03-10 22:37:27 +08:00
mushgunAX 9315c08a69 Mouse centering velocity calculation corrected 2023-03-10 21:37:54 +08:00
XiaoQiDigipen 5e4925cf23
Merge pull request #422 from SHADE-DP/PlayerController
Minor bug fixes and raccoon animation base
2023-03-10 20:07:48 +08:00
maverickdgg 1914270a3f Fixed pause menu not showing 2023-03-10 20:03:05 +08:00
Glence af5268186c Merge branch 'main' into PlayerController 2023-03-10 20:01:07 +08:00
XiaoQiDigipen c26429f3ef
Merge pull request #421 from SHADE-DP/SP3-20-UI-System
Updated ScoreText UI. Updated Button SFX
2023-03-10 19:52:38 +08:00
maverickdgg 9d15e19dca UI Buttons Update 2023-03-10 19:50:34 +08:00
Glence 1b581aeb44 Merge branch 'main' into PlayerController 2023-03-10 19:41:06 +08:00
Glence dc0d947dfb WIP for animations 2023-03-10 19:40:48 +08:00
maverickdgg 184155bec1 Merge branch 'main' into SP3-20-UI-System 2023-03-10 19:40:33 +08:00
maverickdgg 8f1b1d9254 use toffset 2023-03-10 19:40:19 +08:00
XiaoQiDigipen 1ca1926bcf
Merge pull request #420 from SHADE-DP/AudioImpl
Added cutscene audio
2023-03-10 19:39:42 +08:00
maverickdgg a839a0e596 UI Scene Update 2023-03-10 19:37:27 +08:00
maverickdgg 715e136b29 Merge branch 'main' into SP3-20-UI-System 2023-03-10 19:32:17 +08:00
maverickdgg d5b50e7de3 Added a scale bounce effect for score and added offset adjustment for score 2023-03-10 19:31:23 +08:00
XiaoQiDigipen 0bc8db4c83
Merge pull request #419 from SHADE-DP/SP3-1-Rendering
Fixed shadows with animations
2023-03-10 19:30:51 +08:00
Kah Wei d061b84e01 Added extra check to handle null assemblies when collecting script assemblies 2023-03-10 19:24:38 +08:00
Brandon Mak fb3c878683 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-10 19:22:57 +08:00
Brandon Mak 1d16bd2744 Fixed more shadows 2023-03-10 19:22:50 +08:00
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