Commit Graph

2880 Commits

Author SHA1 Message Date
Glence 01cbba1f1f added item score multiplier 2023-03-23 18:20:42 +08:00
Glence 64bbc4d67a scenes update, setActive message removed, expose Emitcount 2023-03-23 16:49:41 +08:00
Glence 5cd0de1960 Merge branch 'main' into PlayerController 2023-03-23 00:38:31 +08:00
Glence 6ddc5c35cb did left and right foot smoke 2023-03-23 00:38:25 +08:00
maverickdgg 267793e3cc Merge branch 'main' into Navigation 2023-03-22 23:27:32 +08:00
maverickdgg 38d7e49976 WIP 2023-03-22 23:27:30 +08:00
Brandon Mak f4d361e1e9 Particle bug fix and raccoon dust particle fix 2023-03-22 22:52:43 +08:00
XiaoQiDigipen 744e66eeb6
Merge pull request #436 from SHADE-DP/SP3-2-Physics
Fixed consistency of Trajectories with different time steps
2023-03-22 22:33:23 +08:00
Diren D Bharwani 2737113a84 forces are cleared after first iteration 2023-03-22 22:25:11 +08:00
Diren D Bharwani e02e3f5faf silly mistake 2023-03-22 22:21:39 +08:00
Glence 364da8ea85 added ceiling fan and new AI model, WIP for player particles 2023-03-22 21:31:40 +08:00
Diren D Bharwani ae213ed05d Merge branch 'main' into SP3-2-Physics 2023-03-22 20:48:27 +08:00
Diren D Bharwani 31dd3390c2 Fixed consistency of simulating ghost bodies 2023-03-22 20:41:40 +08:00
maverickdgg 2724c58efb Merge branch 'main' into Navigation 2023-03-22 19:17:03 +08:00
XiaoQiDigipen ebfe58aa0e
Merge pull request #435 from SHADE-DP/SP3-6-c-scripting
Scripts csproj file is now always generated on launch to fix common script build issues
2023-03-22 14:51:02 +08:00
Kah Wei adac12a309 Scripts csproj fileis now always generated on launch to fix common script build issues 2023-03-22 00:38:02 +08:00
Diren D Bharwani 8108d92ee2 Merge branch 'main' into SP3-2-Physics 2023-03-22 00:06:50 +08:00
Glence 179740f4bf updated scene and added traj 2023-03-21 17:55:19 +08:00
XiaoQiDigipen 43984e8861
Merge pull request #434 from SHADE-DP/SP3-1-Rendering
Improved particles and tested on some objects
2023-03-21 15:30:13 +08:00
Xiao Qi e951d275f9 Homeowner clips 2023-03-21 15:29:59 +08:00
Brandon Mak 7216c1c3dd Particles test on level 1 food 2023-03-21 15:27:42 +08:00
XiaoQiDigipen c6eb689e60
Merge pull request #433 from SHADE-DP/SP3-20-UI-System
Updated MainMenu and Gameplay UI
2023-03-21 14:48:59 +08:00
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
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
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
Brandon Mak 712c4c24b8 Color tinting and scripting support for particles 2023-03-20 20:43:50 +08:00
XiaoQiDigipen e387c7fe6c
Merge pull request #431 from SHADE-DP/PlayerController
Scene Changes and bug fixes
2023-03-20 17:42:41 +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
XiaoQiDigipen 600013bb82
Merge pull request #430 from SHADE-DP/SP3-1-Rendering
Improved particles and trajectory rendering
2023-03-20 16:55:28 +08:00
maverickdgg e88f5c9d1c Main Menu update 2023-03-20 16:47:34 +08:00
Brandon Mak ba732ea64c Fixed trajectory renderable 2023-03-20 16:38:15 +08:00
Xiao Qi 6527634839 Fixed nav data load bug 2023-03-20 16:28:08 +08:00
Xiao Qi 85a92ce871 New nav data asset type recognition
Binary write/load for nav data
2023-03-20 16:03:47 +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 49106683c4 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-20 15:03:27 +08:00
Brandon Mak 9ead2b6b12 Added if statement for particle texture check 2023-03-20 15:03:18 +08:00
Xiao Qi da8c759288 Merge remote-tracking branch 'origin/SP3-22-AnimationController' into SP3-13-Assets-Manager 2023-03-20 15:02:37 +08:00
XiaoQiDigipen f6864419be
Merge pull request #429 from SHADE-DP/SP3-2-Physics
Reworked Physics Simulate Body
2023-03-20 14:56:29 +08:00
Diren D Bharwani 11878d4cc2 reworked simulate body 2023-03-20 14:53:36 +08:00
Kah Wei 1476632220 Changed animation system to support multiple roots 2023-03-20 14:53:03 +08:00
Diren D Bharwani 8e7bfa465d Merge branch 'main' into SP3-2-Physics 2023-03-20 13:44:11 +08:00
XiaoQiDigipen be68578ba0
Merge pull request #428 from SHADE-DP/SP3-129-AudioSystem
Added destroy on scene exit property of AudioClipHandles
2023-03-20 12:53:21 +08:00
SHAM-DP c9b284fe93 Destroy on scene exit property of AudioClipHandles 2023-03-20 12:23:00 +08:00