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

370 Commits

Author SHA1 Message Date
Brandon Mak e7b128d521 Merge branch 'main' into SP3-1-Rendering 2023-03-21 14:35:32 +08:00
XiaoQiDigipen 997c115043
Merge pull request #432 from SHADE-DP/SP3-13-Assets-Manager 
Enhanced functionality of animation clip container creation
 2023-03-21 14:31:16 +08:00
Xiao Qi c73209ef62 Imported new homeowner texture 
Replaced homeowner gltf file and recompiled
 2023-03-21 14:29:13 +08:00
Brandon Mak 712c4c24b8 Color tinting and scripting support for particles 2023-03-20 20:43:50 +08:00
Glence ae186e7d86 new scene changes 2023-03-20 17:05:43 +08:00
maverickdgg e88f5c9d1c Main Menu update 2023-03-20 16:47:34 +08:00
maverickdgg dddc1c5542 Merge branch 'main' into SP3-20-UI-System 2023-03-20 15:55:52 +08:00
maverickdgg 221e6bde85 Textures update 2023-03-20 15:55:50 +08:00
Xiao Qi 9fdfe17e9d WIP Multiple root structures in animation rig 2023-03-20 15:15:52 +08:00
Brandon Mak 9ead2b6b12 Added if statement for particle texture check 2023-03-20 15:03:18 +08:00
Brandon Mak b8a2e206f7 Added rotation and size decay support for particles 2023-03-20 12:19:27 +08:00
maverickdgg 07a702c972 initial 2023-03-20 12:17:24 +08:00
Brandon Mak f787f2b782 particles WIP 2023-03-19 20:11:29 +08:00
Glence 7510f8aa5b bug fixes 2023-03-17 00:31:30 +08:00
Glence 77907841b1 player floating when jumping 2023-03-16 17:14:57 +08:00
Glence 132629306e clean up scene/scripts files and updates scene 2023-03-16 14:54:18 +08:00
Brandon Mak 2eed7428d8 Fixed emitting angles for particles 2023-03-16 10:44:03 +08:00
Brandon Mak a08e538895 Added Texture support for particles 2023-03-16 09:34:42 +08:00
Brandon Mak 32ef4d8c55 Updated particle interfaces and added more barriers 2023-03-15 21:09:55 +08:00
Glence a633bd64d8 update scene 3 to have the bird nest and rubbish bin 2023-03-15 17:14:35 +08:00
Brandon Mak 0bfe350477 Particles WIP 2023-03-14 19:37:34 +08:00
Brandon Mak 070f01bf67 Particles WIP 2023-03-14 10:55:53 +08:00
Brandon Mak 8fac6fd911 Particles WIP 2023-03-13 22:23:15 +08:00
Glence b7520b6836 added animation for the other scenes 2023-03-11 11:07:21 +08:00
Glence 6dcee04077 remove unnecessary script 2023-03-11 02:19:42 +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
Glence af5268186c Merge branch 'main' into PlayerController 2023-03-10 20:01:07 +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 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
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
Brandon Mak 801da75d87 Fixed shadows for animation 2023-03-10 18:37:28 +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
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
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
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
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
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 87f7b42ec3 made raccoon use capsule, setting for fov done 2023-03-08 17:00:43 +08:00
Xiao Qi ea3b851ed0 Merge branch 'main' into SP3-13-Assets-Manager 2023-03-07 23:01:21 +08:00
Diren D Bharwani e3fb14d698 Merge branch 'main' into SP3-2-Physics 2023-03-07 18:48:31 +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
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 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
Glence 808adaa5dd level 2 go to the correct next scene now 2023-03-05 18:06:08 +08:00
Glence bf5472e2c6 stuff dont ask me 2023-03-05 15:35:57 +08:00
Glence 3778ded1be Merge branch 'main' into PlayerController 2023-03-05 14:49:46 +08:00
Glence 7a577ecd6b Merge branch 'main' into PlayerController 2023-03-05 14:42:31 +08:00
Sri Sham Haran e417ebdfcc added missing colliders for level3 2023-03-05 14:22:24 +08:00
maverickdgg 4bc568899d Fix Button click state not resetting if the release event happen when button is inactive 2023-03-05 13:55:51 +08:00
maverickdgg f10293e2d2 Fixed button sounds 2023-03-05 10:47:16 +08:00
Xiao Qi 6c396469d4 Recompiled files for testing 2023-03-05 04:22:27 +08:00
Glence 3f960509f1 scene changes 2023-03-05 02:51:11 +08:00
Glence cc81eed630 Merge branch 'main' into PlayerController 2023-03-04 23:42:20 +08:00
Brandon Mak 7eb4921b33 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-04 15:50:10 +08:00
maverickdgg e7ce3263b8 Level 2 Pause menu update 2023-03-04 13:12:02 +08:00
maverickdgg f3908d3afb Merge branch 'main' into SP3-20-UI-System 2023-03-04 13:09:06 +08:00
maverickdgg c3a452a1c4 Pause Canvas Updated with correct button scales and button FX 2023-03-04 12:51:19 +08:00
XiaoQiDigipen 6cf8f03ff1
Merge branch 'main' into AIFixes 2023-03-04 12:50:13 +08:00
XiaoQiDigipen 90c9a0a959
Merge branch 'main' into AudioImplementation 2023-03-04 12:46:59 +08:00
maverickdgg 0a8f90ae80 Added Gameplay Canvas for Level 1 2023-03-04 12:44:58 +08:00
mushgunAX 28949b29ff Level 1 AI start waypoint 2023-03-04 05:07:39 +08:00
mushgunAX dc54ae92a2 AI gets sent to a waypoint of choice when caught 2023-03-04 04:57:59 +08:00
maverickdgg 3a60eee32f merged 2023-03-04 03:17:20 +08:00
maverickdgg 6d1e179baf UI doine 2023-03-04 02:46:56 +08:00
Brandon Mak ce41e975d0 Merge branch 'main' into SP3-1-Rendering 2023-03-04 00:52:05 +08:00
Xiao Qi 56693565f4 WIP Load and test animations 2023-03-04 00:43:31 +08:00
mushgunAX a5fe4bf0a0 New SFX and (supposedly) spatial SFX 2023-03-04 00:19:35 +08:00
Brandon Mak 166e13a339 Shadows WIP 
- Light direction in 2nd level changed
 2023-03-03 22:01:34 +08:00
Glence 27b00a6c4a end cutscene done 2023-03-03 14:28:10 +08:00
maverickdgg 0984eee6bb Gameplay UI WIP 2023-03-02 17:34:11 +08:00
Glence 8c74ec85d3 Done with level preview 2023-03-02 17:33:02 +08:00
Glence 2834414115 Merge branch 'main' into PlayerController 2023-03-02 13:05:28 +08:00
maverickdgg 381fe476be Game UI WIP 2023-03-02 11:33:21 +08:00
maverickdgg 30923389ae Merge branch 'main' into SP3-20-UI-System 2023-03-02 10:23:09 +08:00
maverickdgg e0ee2a8079 Gameplay UI progress 2023-03-02 09:55:41 +08:00