Commit Graph

2850 Commits

Author SHA1 Message Date
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
Brandon Mak 9c19d178db Implemented color decay and color tint range support for particles 2023-03-30 15:19:54 +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
Glence 270cab64e2 raccoon new tag 2023-03-25 17:28:42 +08:00
maverickdgg 2d9b7f3a5d Merge branch 'main' into Navigation 2023-03-25 17:20:49 +08:00
maverickdgg 4a149508c9 Level 3 generated 2023-03-25 17:20:42 +08:00
Glence ce24a1efb0 player caught bug fix 2023-03-25 17:20:35 +08:00
XiaoQiDigipen 4f84736599
Merge pull request #444 from SHADE-DP/Navigation
Added Attack animation, Fix Edge case for path finding. Added footsteps. Level 2 merge
2023-03-25 16:54:30 +08:00
maverickdgg 75f38f4e36 Merge branch 'main' into Navigation 2023-03-25 16:52:34 +08:00
maverickdgg 485d8cc38b AI Level 2 merge 2023-03-25 16:52:26 +08:00
XiaoQiDigipen 3affd446f3
Merge pull request #443 from SHADE-DP/ShaderCompilerMigrate
Removed shader compiler to external executable
2023-03-25 16:52:02 +08:00
Xiao Qi 47a78de609 Added dependencies pull for shader compiler 2023-03-25 16:41:49 +08:00
maverickdgg 749cedfae2 Merge branch 'main' into Navigation 2023-03-25 16:13:03 +08:00
maverickdgg c1544b0b51 Merge branch 'main' into Navigation 2023-03-25 16:12:42 +08:00
XiaoQiDigipen cd04a93df9
Merge pull request #442 from SHADE-DP/PlayerController
Bug fixes
2023-03-25 16:11:55 +08:00
Glence 429674c16e Merge branch 'main' into PlayerController 2023-03-25 16:10:01 +08:00
Glence 9b6a0d112e remove density 2023-03-25 16:09:40 +08:00
maverickdgg 291c9d044e Added footsteps. Fix path forward to not get stuck as much 2023-03-25 16:09:20 +08:00
Xiao Qi f21f235980 Moved out all native shader compiler code
Replaced call to internal classes with system calls to external executable
2023-03-25 15:58:06 +08:00
XiaoQiDigipen a40c59872c
Merge pull request #441 from SHADE-DP/SP3-6-c-scripting
Fixed issues where scripts cannot be loaded if another instance of the engine is using it
2023-03-25 15:52:51 +08:00
Glence 82fd4e2149 dont ask me 2023-03-25 15:52:22 +08:00
Kah Wei 52d27ae6bd Fixed issues where scripts cannot be loaded if another instance of the engine is using it 2023-03-25 14:59:42 +08:00
maverickdgg 47f195e998 HomeOwner attack and animations 2023-03-25 14:51:28 +08:00