Commit Graph

2870 Commits

Author SHA1 Message Date
Glence ce6288880a other stuff 2023-04-01 16:30:33 +08:00
Glence b2e38df969 Merge branch 'main' into PlayerController 2023-04-01 16:11:09 +08:00
XiaoQiDigipen e9d0b01972
Merge pull request #452 from SHADE-DP/Navigation
Added HomeOwner VO and Raccoon Caught effect
2023-04-01 16:09:44 +08:00
Glence f70a41a9dc transition for level is done along with bug fix 2023-04-01 16:08:32 +08:00
maverickdgg 43c6a62186 Added UI changes to other scenes 2023-04-01 15:37:12 +08:00
maverickdgg 2e20b295b5 Added Homeowner VO and small UI changes 2023-04-01 15:36:02 +08:00
Glence 3e4794cebc Merge branch 'main' into PlayerController 2023-04-01 00:51:27 +08:00
Glence 191ed7de43 scene changes 2023-04-01 00:51:15 +08:00
XiaoQiDigipen fada41174d
Merge pull request #450 from SHADE-DP/PlayerController
New features done
2023-04-01 00:42:19 +08:00
Glence a76f2eca87 level clear done 2023-04-01 00:35:16 +08:00
Glence 5ed0219a0b WIP for level clear 2023-03-31 18:37:28 +08:00
XiaoQiDigipen 1c6def8e70
Merge pull request #449 from SHADE-DP/Navigation
Added CaughtRaccoon state to AI FSM
2023-03-31 17:05:28 +08:00
maverickdgg 9d8b94a5ab Merge branch 'main' into Navigation 2023-03-31 16:51:12 +08:00
XiaoQiDigipen 1838209ec2
Merge pull request #448 from SHADE-DP/SP3-20-UI-System
Gameplay and Main Menu UI Update
2023-03-31 15:07:19 +08:00
maverickdgg c335f58702 Updated Gameplay UI 2023-03-31 15:02:31 +08:00
maverickdgg af9e523da9 Gameplay UI Update 2023-03-31 14:50:25 +08:00
maverickdgg 6ee619d26e Added Slider SFX 2023-03-31 14:18:09 +08:00
maverickdgg b123cd83f8 Updated Main menu with correct slider scale and added fx for buttons 2023-03-31 14:14:44 +08:00
maverickdgg fdc261749e Merge branch 'main' into SP3-20-UI-System 2023-03-31 14:06:33 +08:00
XiaoQiDigipen 125f88bcac
Merge pull request #447 from SHADE-DP/SP3-1-Rendering
Implemented color decay, color range emission and custom VS and FS for particles
2023-03-30 19:37:33 +08:00
Brandon Mak 83955e4618 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-30 19:15:12 +08:00
Brandon Mak 4d145bbc43 Added support for custom VS and FS for particles 2023-03-30 19:15:03 +08:00
maverickdgg c2a8c86483 Slider textures updated 2023-03-30 17:09:18 +08:00
maverickdgg 12bbce33e8 Slider WIP 2023-03-30 16:56:41 +08:00
XiaoQiDigipen 3fc69890e4 Revert "Merge pull request #446 from SHADE-DP/Fix-ResourceHubCrashOnExit"
This reverts commit 5ab7cbe5f3.
2023-03-30 16:25:05 +08:00
maverickdgg 3fef57f88a Merge branch 'Navigation' of https://github.com/SHADE-DP/SHADE_Y3 into Navigation 2023-03-30 15:37:46 +08:00
maverickdgg 3f7522d76f Revert "Merge pull request #446 from SHADE-DP/Fix-ResourceHubCrashOnExit"
This reverts commit 5ab7cbe5f3, reversing
changes made to ffc638e14b.
2023-03-30 15:37:42 +08:00
maverickdgg c6faeeb282 Added CaughtRaccoon State. 2023-03-30 15:26:15 +08:00
Brandon Mak 9c19d178db Implemented color decay and color tint range support for particles 2023-03-30 15:19:54 +08:00
maverickdgg 8c5bf82aa5 Added CaughtRaccoon State. 2023-03-30 15:16:18 +08:00
XiaoQiDigipen 5ab7cbe5f3
Merge pull request #446 from SHADE-DP/Fix-ResourceHubCrashOnExit
"Fixed" crash from ResourceHub on engine exit
2023-03-30 14:24:21 +08:00
Brandon Mak 8aa5c681e3 Merge branch 'main' into SP3-1-Rendering 2023-03-30 14:03:36 +08:00
Kah Wei 6cf20d414e "Fixed" crash from ResourceHub on engine exit 2023-03-29 22:20:20 +08:00
Glence ffc638e14b using waypoint to store startpos 2023-03-26 20:50:49 +08:00
Glence 2abb1ce697 safety checks 2023-03-26 20:38:03 +08:00
Sri Sham Haran 0f9afc2a18 Merge remote-tracking branch 'origin/main' into main 2023-03-26 20:29:41 +08:00
Sri Sham Haran 0890bd8d3f safety checks 2023-03-26 20:29:38 +08:00
Brandon Mak fed76708bd Particle bug fix 2023-03-26 20:28:04 +08:00
Glence 2fd4e51cd0 added food particles and small bug fix 2023-03-26 18:10:58 +08:00
Glence 2da73f12d0 ai fix along wit new music 2023-03-26 13:27:42 +08:00
Sri Sham Haran 44bbdf5f82 Merge remote-tracking branch 'origin/main' into main 2023-03-26 10:19:29 +08:00
Sri Sham Haran c6172be3ad Set detected parameters in AI states
Increase size of score zone in level 1
2023-03-26 10:19:22 +08:00
Brandon Mak e685f8ebaf Quick fix for Silhouette 2023-03-26 10:18:19 +08:00
Glence 92de505af4 made egg heavier so they dont fly so far 2023-03-25 21:46:33 +08:00
maverickdgg cf41fe245e AI added for Level 1 2023-03-25 19:41:40 +08:00
XiaoQiDigipen bc1167267c
Merge pull request #445 from SHADE-DP/Navigation
Navigation and AI merge for level 3
2023-03-25 18:49:20 +08:00
maverickdgg e7ec24c15a fixed AI not resetting 2023-03-25 18:47:42 +08:00
maverickdgg 89bfbf3100 WIP 2023-03-25 18:18:29 +08:00
maverickdgg 72bbc72531 Merge branch 'main' into Navigation 2023-03-25 17:29:13 +08:00
maverickdgg 6c1f0162e9 Attack hitbox change 2023-03-25 17:29:03 +08:00