Commit Graph

628 Commits

Author SHA1 Message Date
maverickdgg 9886250d19 scene merge 2023-03-21 14:47:14 +08:00
maverickdgg cb791b6390 Merge branch 'main' into SP3-20-UI-System 2023-03-21 14:41:14 +08:00
maverickdgg bc15721c0a Updated Main Menu UI and gameplay UI 2023-03-21 14:40:30 +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
Xiao Qi b97e123573 Removed test models
Changed new animation container list to only show models with animations
2023-03-21 14:24:49 +08:00
Glence 66986e179b Merge branch 'main' into PlayerController 2023-03-20 17:34:26 +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
Brandon Mak aa0c9d08e0 Updated particle shaders to include rotation
- Fixed compute shader hot reloading
- Vertex/Fragment shader hot reloading still broken :/
2023-03-20 10:50:18 +08:00
Brandon Mak 6a1ae5fac8 SSAO shader looks better on racoon now
It still looks a little off but its better than before
2023-03-20 00:37:46 +08:00
Brandon Mak 468a032fad Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-19 20:11:36 +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 e53636bc4a tweening camera arm and picking 2023-03-15 19:39:12 +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 ab2710da4b Solved particles flickering (I hope)
- Good reminder how strict Vulkan is with memory accesses
2023-03-15 10:28:51 +08:00
Brandon Mak 0bfe350477 Particles WIP 2023-03-14 19:37:34 +08:00
Brandon Mak 69fc997361 Particles WIP 2023-03-14 19:34:26 +08:00
Glence cc0116ac53 Merge branch 'main' into PlayerController 2023-03-14 17:19:26 +08:00
Glence 9218b7b993 player animation completed 2023-03-14 17:18:52 +08:00
XiaoQiDigipen 3ca463aa21 Added serialisation of extra time multiplier field in animation clip asset
Fixed bug when creating animation clip
2023-03-14 16:47:08 +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
Brandon Mak 2f4a316a09 Particles WIP 2023-03-13 11:41:23 +08:00
Glence d0067b09c9 Minor bug fix
set animation dt back to default when retry or quit
2023-03-11 21:25:56 +08:00
Sri Sham Haran e82dcdee20 fix audio not stopping between scene for non editor builds 2023-03-11 18:39:06 +08:00
Sri Sham Haran b81cff4638 Fixed creation of audio handler with invalid path in endscene and main menu. remove set volume for homeowner detect sound. audio system now stops all instances before they are release when scene changes 2023-03-11 13:07:25 +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 184155bec1 Merge branch 'main' into SP3-20-UI-System 2023-03-10 19:40:33 +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