Compare commits

...

459 Commits

Author SHA1 Message Date
Sri Sham Haran 0f7d86543f Fix adaptive bgm not changing on alert 2023-04-02 18:16:25 +08:00
Glence 8ffca03f16 AI fix 2023-04-02 13:32:21 +08:00
XiaoQiDigipen 724f8ae2cf
Merge pull request #456 from SHADE-DP/Navigation
adjusted hitbox timing
2023-04-02 12:48:39 +08:00
maverickdgg f495dfe4fd adjusted hitbox timing 2023-04-02 12:34:47 +08:00
Glence e5c8f4c380 fix camera jittering 2023-04-01 21:30:18 +08:00
Glence f114a7f59a Scene changes for level preview 2023-04-01 21:06:12 +08:00
XiaoQiDigipen 273bdfcdcc
Merge pull request #455 from SHADE-DP/PlayerController
bug fixes
2023-04-01 19:18:29 +08:00
Glence 9b55d69f9a Merge branch 'main' into PlayerController 2023-04-01 19:14:38 +08:00
Glence 716087d15c small bug fixes 2023-04-01 19:14:30 +08:00
Xiao Qi 5c79bb7f9f Recompiled all shaders 2023-04-01 18:55:25 +08:00
XiaoQiDigipen f54448b5eb
Merge pull request #454 from SHADE-DP/PlayerController
Credits and Transition done
2023-04-01 18:09:04 +08:00
Glence 51f426868e credits and transition done 2023-04-01 18:07:22 +08:00
Glence 51867f0c5e Merge branch 'main' into PlayerController 2023-04-01 17:23:04 +08:00
Glence 96fd8295aa audio 2023-04-01 17:22:51 +08:00
XiaoQiDigipen a3c1993576
Merge pull request #453 from SHADE-DP/PlayerController
Level changes and bug fix
2023-04-01 16:43:19 +08:00
maverickdgg 483d8c7066 Added AI Humming 2023-04-01 16:41:38 +08:00
maverickdgg c643bd64f3 Added a space to skip 2023-04-01 16:32:56 +08:00
maverickdgg d5240b420d Credits scene 2023-04-01 16:31:23 +08:00
Glence cc9b7c20c4 Merge branch 'main' into PlayerController 2023-04-01 16:30:43 +08:00
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 0dad2e9e9f
Merge pull request #451 from SHADE-DP/PlayerController
Scene changes
2023-04-01 16:11:08 +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
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
maverickdgg ab4493822a Fix edge case of starting node being a wall 2023-03-25 10:52:50 +08:00
XiaoQiDigipen c28e874626
Merge pull request #440 from SHADE-DP/PlayerController
Scene changes and bug fixes
2023-03-25 02:44:16 +08:00
Glence 98d9683995 dont ask me 2023-03-25 02:38:56 +08:00
Glence 4f44435823 Merge branch 'main' into PlayerController 2023-03-25 00:17:10 +08:00
Glence 6ce807b878 added upwards force on jumpPad 2023-03-24 21:28:33 +08:00
Glence 33ba73c298 particle bug fix 2023-03-24 20:58:22 +08:00
Glence ff6a49e0a7 dont ask me 2023-03-24 20:30:01 +08:00
XiaoQiDigipen 0b5f602a0e
Merge pull request #439 from SHADE-DP/Navigation
Saved Navigation Data as Asset and load on scene load
2023-03-24 18:05:55 +08:00
maverickdgg af77bd4812 Saved Nav Data 2023-03-24 18:04:44 +08:00
maverickdgg 38d3040a04 Merge remote-tracking branch 'origin/NavData' into Navigation 2023-03-24 16:47:09 +08:00
maverickdgg 2382f11628 Merge branch 'main' into Navigation 2023-03-24 16:34:22 +08:00
maverickdgg 86593fd602 Merge branch 'Navigation' of https://github.com/SHADE-DP/SHADE_Y3 into Navigation 2023-03-24 16:34:14 +08:00
maverickdgg 4f7d1850af Added editor window for generating nav data 2023-03-24 16:33:45 +08:00
XiaoQiDigipen 346f2b2fac
Merge pull request #438 from SHADE-DP/Navigation
Added Navigation System. Added basic AI FSM
2023-03-24 16:11:13 +08:00
XiaoQiDigipen 0892322049
Merge branch 'main' into Navigation 2023-03-24 16:10:58 +08:00
XiaoQiDigipen 6d1b793831
Merge pull request #437 from SHADE-DP/PlayerController
Added particle and bug fixes
2023-03-24 16:09:43 +08:00
maverickdgg 78d30cb051 fix rotation 2023-03-24 16:06:35 +08:00
maverickdgg b32dba0694 basic FSM 2023-03-24 13:26:18 +08:00
maverickdgg 9dd180c1e6 Fix for when end point is unreachable. Find closest reachable point 2023-03-24 07:41:05 +08:00
maverickdgg a785a972e4 Navigation Fix 2023-03-24 04:22:51 +08:00
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
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 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 565126c4ba Enabled custom update shaders for particles 2023-03-20 09:33:04 +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
Xiao Qi e06ef624e6 WIP Loading of multiple roots in rig 2023-03-15 19:26:13 +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 c824f2c9e4
Merge pull request #427 from SHADE-DP/SP3-22-AnimationController
Added extra field in animation clip container for time multiplier
2023-03-14 16:50:24 +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
Kah Wei d8fe6a2f11 Merge branch 'main' into SP3-22-AnimationController 2023-03-14 14:07:48 +08:00
Kah Wei f844079eea Added support for changing playback speed of an animation clip 2023-03-14 14:07:46 +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
Brandon Mak eeaa642f30 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-12 17:36:28 +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
Xiao Qi 0be385c6bd Fixed xcopy command for csharp project 2023-03-11 21:17:28 +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
XiaoQiDigipen b4d6429175
Merge pull request #426 from SHADE-DP/PlayerController
Animations and bug fix
2023-03-11 11:10:09 +08:00
Glence b7520b6836 added animation for the other scenes 2023-03-11 11:07:21 +08:00
Kah Wei 831c09f67a Merge branch 'PlayerController' of https://github.com/SHADE-DP/SHADE_Y3 into PlayerController 2023-03-11 02:31:53 +08:00
Kah Wei 6bfa0d0eca Fixed post build command for SHADE_CSharp 2023-03-11 02:31:48 +08:00
Glence 6dcee04077 remove unnecessary script 2023-03-11 02:19:42 +08:00
maverickdgg ed6c05dea1 Merge branch 'main' into SP3-20-UI-System 2023-03-11 01:10:59 +08:00
XiaoQiDigipen 72eedcd6cd
Merge pull request #425 from SHADE-DP/SP3-141-Camera-System
Change Camera Collider tags for new camera collision in scenes
2023-03-10 23:36:19 +08:00
maverickdgg f9a3fe72ce Merge branch 'main' into SP3-141-Camera-System 2023-03-10 23:34:06 +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
XiaoQiDigipen bc567f626f
Merge pull request #424 from SHADE-DP/SP3-6-c-scripting
Added proper handling for loaded null managed assemblies
2023-03-10 22:43:55 +08:00
XiaoQiDigipen 510ba411e9
Merge pull request #423 from SHADE-DP/SP3-10-input-management
Corrected Mouse Velocity Calculation when Mouse Centering is On
2023-03-10 22:43:01 +08:00
Kah Wei 47621d7436 Added extra line to log an error if a null assembly is detected 2023-03-10 22:37:27 +08:00
mushgunAX 9315c08a69 Mouse centering velocity calculation corrected 2023-03-10 21:37:54 +08:00
XiaoQiDigipen 5e4925cf23
Merge pull request #422 from SHADE-DP/PlayerController
Minor bug fixes and raccoon animation base
2023-03-10 20:07:48 +08:00
maverickdgg 1914270a3f Fixed pause menu not showing 2023-03-10 20:03:05 +08:00
Glence af5268186c Merge branch 'main' into PlayerController 2023-03-10 20:01:07 +08:00
XiaoQiDigipen c26429f3ef
Merge pull request #421 from SHADE-DP/SP3-20-UI-System
Updated ScoreText UI. Updated Button SFX
2023-03-10 19:52:38 +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
maverickdgg 8f1b1d9254 use toffset 2023-03-10 19:40:19 +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
maverickdgg d5b50e7de3 Added a scale bounce effect for score and added offset adjustment for score 2023-03-10 19:31:23 +08:00
XiaoQiDigipen 0bc8db4c83
Merge pull request #419 from SHADE-DP/SP3-1-Rendering
Fixed shadows with animations
2023-03-10 19:30:51 +08:00
Kah Wei d061b84e01 Added extra check to handle null assemblies when collecting script assemblies 2023-03-10 19:24:38 +08:00
Brandon Mak fb3c878683 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-10 19:22:57 +08:00
Brandon Mak 1d16bd2744 Fixed more shadows 2023-03-10 19:22:50 +08:00
SHAM-DP f32903f87d Merge branch 'main' into AudioImpl 2023-03-10 19:15:12 +08:00
XiaoQiDigipen 062c11afa0
Merge pull request #418 from SHADE-DP/SP3-22-AnimationController
Added Animator events and fixed Animator pause bug
2023-03-10 19:07:36 +08:00
SHAM-DP 8602a60feb Added cinematic audio 2023-03-10 19:07:10 +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
XiaoQiDigipen 01256f6e22
Merge pull request #417 from SHADE-DP/SP3-141-Camera-System
Fixed Camera Collision
2023-03-10 19:00:31 +08:00
Kah Wei b443f32388 Merge branch 'SP3-22-AnimationController' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-22-AnimationController 2023-03-10 18:57:14 +08:00
Kah Wei d1e1a2e31c Fixed bug where animations would revert to bind pose when paused 2023-03-10 18:57:09 +08:00
maverickdgg 6be5895ec7 Fixed Camera Collision 2023-03-10 18:56:04 +08:00
Kah Wei e531a087f6 Added events for play, pause and finished animations 2023-03-10 18:53:40 +08:00
Brandon Mak 39bebd1db4 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-10 18:37:39 +08:00
Brandon Mak 801da75d87 Fixed shadows for animation 2023-03-10 18:37:28 +08:00
SHAM-DP 3ef6fef289 fix for options slider 2023-03-10 18:07:40 +08:00
XiaoQiDigipen f0c827a7f2
Merge pull request #416 from SHADE-DP/AudioImpl
Added new audio banks, fix scaling for options sliders
2023-03-10 17:55:58 +08:00
SHAM-DP 9a39e52939 Merge branch 'main' into AudioImpl 2023-03-10 17:46:09 +08:00
Brandon Mak 683ce6146a Merge branch 'main' into SP3-1-Rendering 2023-03-10 17:29:24 +08:00
XiaoQiDigipen b5ad6c5a89
Merge pull request #415 from SHADE-DP/PlayerController
Raccoon animation and scene changes
2023-03-10 17:28:15 +08:00
Glence 3f4674e38f minor fix 2023-03-10 17:25:41 +08:00
Glence b9cfcdb11d Merge branch 'main' into PlayerController 2023-03-10 17:22:05 +08:00
Glence a3318d500d change old audio code 2023-03-10 17:21:49 +08:00
XiaoQiDigipen a35db70ffd
Merge pull request #414 from SHADE-DP/SP3-22-AnimationController
Fixed Bugs regarding animation clip edits
2023-03-10 17:12:35 +08:00
Xiao Qi 1d171710c5 Fixed bug where sub assets were not being loading properly
Implemented saving of parent container when cips are changed for animation
2023-03-10 17:11:09 +08:00
Brandon Mak e9dee89b17 Accommodated animation when shadows are in the scene 2023-03-10 16:47:19 +08:00
Glence 9eb5399f7b Merge branch 'main' into PlayerController 2023-03-10 16:28:26 +08:00
Glence 9b9cf1a1bb WIP for animatons 2023-03-10 16:26:52 +08:00
XiaoQiDigipen 293358c41c
Merge pull request #413 from SHADE-DP/SP3-22-AnimationController
Fixed RawAnimInspector changing any specific animation clip's values, causing a change in all animation clips' values
2023-03-10 16:21:59 +08:00
Kah Wei 0173e7c302 Fixed RawAnimInspector changing any specific animation clip's values, causing a change in all animation clips' values 2023-03-10 16:21:18 +08:00
Glence 2cf67a1378 Merge branch 'main' into PlayerController 2023-03-10 14:59:47 +08:00
XiaoQiDigipen 6b4172e673
Merge pull request #412 from SHADE-DP/SP3-22-AnimationController
Added time scale for animation system
2023-03-10 14:58:03 +08:00
Kah Wei 8c0ad47921 Added timescale for animation system 2023-03-10 14:55:49 +08:00
XiaoQiDigipen 387de00ae6
Merge pull request #411 from SHADE-DP/SP3-6-c-scripting
Fixed bug where C# Asset implicit bool conversion operators were internal
2023-03-10 14:14:59 +08:00
Kah Wei 089eb9de26 Fixed bug where C# Asset implicit bool conversion operators were internal 2023-03-10 14:11:59 +08:00
Brandon Mak 33c2b1fd73 Merge branch 'main' into SP3-1-Rendering 2023-03-10 11:58:53 +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
Diren D Bharwani d4158faed1 Merge branch 'main' into SP3-2-Physics 2023-03-09 21:18:18 +08:00
Diren D Bharwani 97013ba73c Added override for simulating gravity in SimulateBody method 2023-03-09 21:18:05 +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
XiaoQiDigipen 0fb6927342
Merge pull request #410 from SHADE-DP/SP3-22-AnimationController
Implemented Animation Clip asset and animation controller
2023-03-09 16:19:39 +08:00
XiaoQiDigipen d8e15fdbdd
Merge pull request #409 from SHADE-DP/SP3-2-Physics
Added Capsule Collider to C#
2023-03-09 16:12:21 +08:00
Diren D Bharwani 5cd6b927e6 Merge branch 'main' into SP3-2-Physics 2023-03-09 16:07:10 +08:00
XiaoQiDigipen 636bf6ec43
Merge pull request #408 from SHADE-DP/SP3-4-Editor
Fixed window width for physics settings drop down, fixed editor look at, fixed crash when some fields set to 0
2023-03-09 16:00:34 +08:00
Kah Wei 8a42cb4940 Merge branch 'main' into SP3-22-AnimationController 2023-03-09 15:46:31 +08:00
Kah Wei 7f170deb27 Fixed animations not playing from the correct start point 2023-03-09 15:46:15 +08:00
Diren D Bharwani 4d935b7399 Merge branch 'main' into SP3-2-Physics 2023-03-09 15:41:38 +08:00
Diren D Bharwani 621f8a5f38 Added Capsule Collider to Managed 2023-03-09 15:41:27 +08:00
SHAM-DP 65cece3e3c Merge branch 'main' into SP3-4-Editor 2023-03-09 15:28:45 +08:00
SHAM-DP fe41245008 Bug Fixes & Tweaks for editor
fixed window width for physics settings drop down
fixed double click to look at
fix crash when some fields in collider and rigidbody are set to 0.0f
2023-03-09 15:28:32 +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
XiaoQiDigipen f07ce5211b
Merge pull request #407 from SHADE-DP/SP3-1-Rendering
Fixed Shadow bugs and implemented scripting for trajectory rendering
2023-03-09 15:10:59 +08:00
Kah Wei baed0bec0b Fixed animator component always using manual mode playback time 2023-03-09 15:08:38 +08:00
Brandon Mak f34cdc0f36 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-09 14:56:14 +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 ab2f3e395b Animation clips now load the correct raw animation 2023-03-09 14:47:48 +08:00
Kah Wei ac971f0945 Fixed infinite loop and incorrect playback setting for Animator 2023-03-09 14:46:06 +08:00
Diren D Bharwani 1304f6e591 Merge branch 'main' into SP3-2-Physics 2023-03-09 14:40:40 +08:00
SHAM-DP 6dd503daad updated audio assets, fix scale for sfx & bgm sliders 2023-03-09 14:12:17 +08:00
Xiao Qi bfc8b3600f Removed stupid 10 second time limit on dependencies pull 2023-03-09 13:56:36 +08:00
Xiao Qi 3d6bfaa119 Write raw anim asset id into anim clips 2023-03-09 13:46:39 +08:00
Glence 63360a4616 Merge branch 'main' into PlayerController 2023-03-09 13:44:49 +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
Kah Wei 07a2eb2f64 Fixed not opening the correct Visual Studio version for scripts 2023-03-09 13:18:09 +08:00
Kah Wei fc789334bd Fixed animation assets fields for scripts not supporting the correct types 2023-03-09 13:10:06 +08:00
Kah Wei e816df28a8 Clips can now be dragged and dropped into the animation controller editor 2023-03-09 12:07:16 +08:00
Brandon Mak e3a552f983 Wrote scripting interface for trajectory rendering 2023-03-09 10:45:57 +08:00
Xiao Qi 2c8eca4125 Added facility to create new animation clip container asset.
Changed raw anim editor to open when double clicking anim container asset/after creating new anim container asset

Changed new clip fields from slider to unsigned int input
2023-03-09 01:51:54 +08:00
Xiao Qi 7df9897598 Fixed bug in binary loader where result from load was always nullptr, changed pointer to pointer reference 2023-03-09 01:50:26 +08:00
Xiao Qi 2692db1ed3 Changed function to return pointer type instead of std::optional 2023-03-09 01:49:43 +08:00
Glence 66026ff926 jumppad done 2023-03-09 00:33:36 +08:00
Kah Wei 8670fe5fa9 Added text RawAnimInspector for when no animations are selected 2023-03-08 22:03:08 +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
Kah Wei 57a8e385e4 Added editor field for Animation Controller of the Animator component in the inspector 2023-03-08 20:58:21 +08:00
Kah Wei 7ab1ee6fec Added serialization for animation assets for scripts 2023-03-08 20:34:11 +08:00
Brandon Mak 2ff28a544d Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-08 20:12:13 +08:00
Kah Wei 69ac4d1219 Merge branch 'main' into SP3-22-AnimationController 2023-03-08 20:00:58 +08:00
Diren D Bharwani 3a9ab9094f Merge branch 'main' into SP3-2-Physics 2023-03-08 19:07:46 +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 10555f646c base for jumppad 2023-03-08 18:49:36 +08:00
Diren D Bharwani 90457757a3 Merge branch 'main' into SP3-2-Physics 2023-03-08 18:46:07 +08:00
Glence 87f7b42ec3 made raccoon use capsule, setting for fov done 2023-03-08 17:00:43 +08:00
Glence 6854c41614 setting up volume 2023-03-08 16:22:05 +08:00
Kah Wei 43edfeb14f Added serialization of animation assets for scripts 2023-03-08 16:13:04 +08:00
Kah Wei 79fe9ec43d Merge branch 'main' into SP3-22-AnimationController
# Conflicts:
#	SHADE_Engine/src/Animation/SHAnimationClip.cpp
#	SHADE_Engine/src/Animation/SHAnimationClip.h
#	SHADE_Engine/src/Animation/SHAnimatorComponent.cpp
#	SHADE_Engine/src/Animation/SHAnimatorComponent.h
#	SHADE_Engine/src/Assets/Asset Types/Models/SHAnimationAsset.h
#	SHADE_Engine/src/Assets/SHAssetMacros.h
#	SHADE_Engine/src/Assets/SHAssetManager.cpp
2023-03-08 15:54:32 +08:00
Kah Wei 1c12a05837 Added C# interface for animator, animation clip and animation controller 2023-03-08 15:29:29 +08:00
XiaoQiDigipen ef7cd4c0c0
Merge pull request #406 from SHADE-DP/SP3-1-Rendering
Implemented shadows. Light components can enable shadows through editor.
2023-03-08 14:17:15 +08:00
Brandon Mak 441d2fe7a4 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-08 14:15:12 +08:00
XiaoQiDigipen 42decf10cb
Merge pull request #405 from SHADE-DP/SP3-2-Physics
Fixed a bug causing invalid gravity scales
2023-03-08 13:55:04 +08:00
Diren D Bharwani 6f8387a5ea Fixed bug where gravity scales were initialised to NaN 2023-03-08 12:59:51 +08:00
Diren D Bharwani 70804f1c3d Merge branch 'main' into SP3-2-Physics 2023-03-08 11:48:06 +08:00
Brandon Mak 2bba48b09f Accounted for deletion of lights
- Not entirely urgent, but removal of resources from render graph fails. Need a valid check of handles.
2023-03-08 10:02:51 +08:00
Brandon Mak 64e60a5114 Added editor functionality for lights to enable shadows 2023-03-08 09:38:07 +08:00
Kah Wei 6383e7d559 Merge branch 'SP3-22-AnimationController' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-22-AnimationController 2023-03-08 00:24:45 +08:00
XiaoQiDigipen ee64580505
Merge pull request #404 from SHADE-DP/SP3-13-Assets-Manager
Implmented GLTF Compile and Load Overhaul
2023-03-07 23:27:01 +08:00
Xiao Qi ea3b851ed0 Merge branch 'main' into SP3-13-Assets-Manager 2023-03-07 23:01:21 +08:00
Xiao Qi 615a5796f0 Added line to add subasset meta to parent asset
Rewrote loading of all animation clips into resource manager
2023-03-07 22:51:40 +08:00
Kah Wei 73af61d2cb Merge branch 'SP3-22-AnimationController' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-22-AnimationController 2023-03-07 22:34:36 +08:00
Kah Wei e285d5e6b2 Added functions for setting animation parameters 2023-03-07 22:34:32 +08:00
XiaoQiDigipen 4d64dd34d8
Merge pull request #403 from SHADE-DP/AnimationClipAsset
Reimplemented animation clip container assets
2023-03-07 22:10:34 +08:00
Xiao Qi 3cc949bb7e Animation container redefinition 2023-03-07 22:07:38 +08:00
Xiao Qi 07100de950 Added recognition for animation clip container as a file
Added functions to create new sub asset for animation clips

Added recognition for animation clip containers when creating new assets
2023-03-07 22:06:42 +08:00
Xiao Qi eae6f6399b Changed implementation of binary loader to load animation clip containers instead of individual animation clips 2023-03-07 22:05:33 +08:00
Diren D Bharwani e46dfd0b2e Merge branch 'main' into SP3-2-Physics 2023-03-07 21:09:49 +08:00
Kah Wei 4144fe0d4a Merge branch 'main' into SP3-22-AnimationController
# Conflicts:
#	SHADE_Application/src/Application/SBApplication.cpp
#	SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp
2023-03-07 20:30:47 +08:00
Kah Wei dc32c5c9aa Implemented saving of animation controller from editor 2023-03-07 20:29:57 +08:00
XiaoQiDigipen 259fca6443
Merge pull request #402 from SHADE-DP/SP3-2-Physics
Added Capsule Collider, AABB Query & SimulateBody for Trajectory path prediction
2023-03-07 20:11:21 +08:00
XiaoQiDigipen 55932628b9
Merge pull request #401 from SHADE-DP/SP3-129-AudioSystem
Fixed 3d audio
2023-03-07 20:11:02 +08:00
Kah Wei ff27925f2d Added ability to reset state, delete links and nodes 2023-03-07 20:05:37 +08:00
Kah Wei 6d01bd0b78 Added ability to set starting node 2023-03-07 19:00:10 +08:00
Diren D Bharwani e3fb14d698 Merge branch 'main' into SP3-2-Physics 2023-03-07 18:48:31 +08:00
Diren D Bharwani c36345c60c Added a simulate body method
Raycast effectiveness is untested, but simulation logic matches standard 3D rigid body simulation methods
2023-03-07 18:48:06 +08:00
Diren D Bharwani 50dafa555a Fixed conversion warnings 2023-03-07 18:46:36 +08:00
Brandon Mak ff4c294313 Added dynamic flags for render graph nodes and light comp shadow flags 2023-03-07 18:43:59 +08:00
SHAM-DP e1fa843511 Merge branch 'main' into SP3-129-AudioSystem 2023-03-07 18:10:52 +08:00
SHAM-DP 5ba50cfbcc Fix for 3d audio (listener up vec was wrong) 2023-03-07 17:57:48 +08:00
Brandon Mak b6b2c75fc3 Implemented Shadows (f0kin finally) 2023-03-07 17:39:51 +08:00
Xiao Qi d56e67248c Removed line in bat file to pull assimp depedency 2023-03-07 17:19:24 +08:00
Kah Wei 493f2c3cfe Fixed parameters panel for animation controller editor and added menu bar 2023-03-07 16:38:00 +08:00
XiaoQiDigipen e62a4cd007
Merge pull request #400 from SHADE-DP/SP3-20-UI-System
Added static class Settings to scripts
2023-03-07 14:44:32 +08:00
Diren D Bharwani cc2afbcf9f Fixed duplicate collision calls 2023-03-07 14:13:06 +08:00
SHAM-DP 87d9158f75 Added 3d right handed flag for core init.
Added profile flags for debug configuration.
Added handling of software format and output type (TO BE TESTED)
2023-03-07 10:35:45 +08:00
maverickdgg e42a5c68f3 Settings 2023-03-07 10:08:30 +08:00
Diren D Bharwani 2147c2c34b Fixed capsule debug draw
Height is distance between centers
2023-03-07 05:00:43 +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
Diren D Bharwani 33ccdccd8a Expanded Physics Settings
Editor Menu needs to be resized...idgi...
2023-03-07 03:23:40 +08:00
Xiao Qi 6911ad0d2b Fixed bug with extensions count, resulting in regeneration of bank metas every time 2023-03-07 01:31:23 +08:00
Xiao Qi 5e6b68915b Working Animations 2023-03-07 01:25:32 +08:00
Kah Wei 9855d7e245 Total time and tickers per second is now auto calculated in SHAnimationClip 2023-03-06 19:42:40 +08:00
Kah Wei 43fd04dd5e Modified SHAnimationClip and SHAnimatorComponent to use frame timestamps instead of indices 2023-03-06 18:59:04 +08:00
Diren D Bharwani e89f5df35f Added physics constants 2023-03-06 18:17:13 +08:00
Diren D Bharwani 8506298fd3 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-03-06 17:56:52 +08:00
Xiao Qi 99f7c3c799 Removed resource manager test lines 2023-03-06 17:47:21 +08:00
Diren D Bharwani 78a3bf4575 Added function to test an AABB against the physics world
Update React Dependency
2023-03-06 17:44:58 +08:00
Diren D Bharwani 550b99b3d7 Added a generic AABB class 2023-03-06 17:44:40 +08:00
Xiao Qi f861304f5e Testing in progress for skinning test 2023-03-06 17:34:38 +08:00
Kah Wei 9a8114f5dd Added work in progress animation parameter panel 2023-03-06 16:44:34 +08:00
Kah Wei d16f807a8a Added links properties panel 2023-03-06 16:17:05 +08:00
Xiao Qi becff4824f Camera without editor compile fix 2023-03-06 15:38:42 +08:00
Diren D Bharwani 0b803d0bd1 Merge branch 'main' into SP3-2-Physics 2023-03-06 13:31:48 +08:00
Kah Wei f8cc1fe2dc Size of animation controller editor is now adjustable 2023-03-06 11:47:30 +08:00
Brandon Mak 826df94c96 Shadows WIP 2023-03-06 00:02:06 +08:00
Glence 52f61363c0 Build shiny highlight shader 2023-03-05 23:50:44 +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
Sri Sham Haran 9866c6e307 Handle mouse center/visible when editor play/pause/stop 2023-03-05 21:33:05 +08:00
Sri Sham Haran f4f544ff53 Merge remote-tracking branch 'origin/main' into main 2023-03-05 21:24:19 +08:00
Sri Sham Haran 77e3fe376b Handle mouse center/visible when editor play/pause/stop 2023-03-05 21:24:16 +08:00
Glence c118ec136f Call centering of mouse at the correct place and default DT on awake 2023-03-05 21:23:41 +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
Sri Sham Haran 0e2b767263 Fix for button w wrong textures (remove reflection of currentTexture) 2023-03-05 20:23:52 +08:00
Glence 808adaa5dd level 2 go to the correct next scene now 2023-03-05 18:06:08 +08:00
XiaoQiDigipen 6472119648
Merge pull request #399 from SHADE-DP/PlayerController
Updates for presentation build
2023-03-05 15:41:21 +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
XiaoQiDigipen 272d7afa3e
Merge pull request #398 from SHADE-DP/SP3-20-UI-System
Fixed button click state not resetting bug
2023-03-05 14:46:17 +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 f52e5a1394 Changed pause menu to use onRelease instead of onClick 2023-03-05 14:01:30 +08:00
maverickdgg 8b24d7e32b re-added the button texture check before setting texture 2023-03-05 13:58:07 +08:00
maverickdgg 76e794a543 Merge branch 'main' into SP3-20-UI-System 2023-03-05 13:56:29 +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
XiaoQiDigipen 29d33d45ad
Merge pull request #396 from SHADE-DP/SP3-6-c-scripting
Fixed issue with ImGui corrupting strings passed to managed data
2023-03-05 12:20:28 +08:00
Kah Wei cedd10c188 Merge branch 'main' into SP3-6-c-scripting 2023-03-05 12:17:31 +08:00
Kah Wei 24f09ab537 Fixed issue with ImGui corrupting strings passed to managed data. 2023-03-05 12:17:19 +08:00
XiaoQiDigipen 367c1fc77e
Merge pull request #395 from SHADE-DP/SP3-141-Camera-System
Camera arm target offset rotation fix
2023-03-05 11:46:02 +08:00
XiaoQiDigipen dfedaa9b4a
Merge pull request #394 from SHADE-DP/SP3-20-UI-System
Fixed button sounds
2023-03-05 11:45:24 +08:00
maverickdgg ef0ff801e4 Camera arm target offset rotation fix 2023-03-05 10:55:39 +08:00
maverickdgg f10293e2d2 Fixed button sounds 2023-03-05 10:47:16 +08:00
Xiao Qi 816c16324c WIP Commit, Node and Joint indexing 2023-03-05 04:25:30 +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
Kah Wei 066d060b29 Split main animation controller panel into 3 segments 2023-03-05 01:45:26 +08:00
Kah Wei 32adb0c540 Reworked how AnimationControllerEditor works 2023-03-05 01:08:39 +08:00
Glence cc81eed630 Merge branch 'main' into PlayerController 2023-03-04 23:42:20 +08:00
Brandon Mak 73c5a0ff4a Updated shadow shaders 2023-03-04 23:12:12 +08:00
XiaoQiDigipen e75b20f36b
Merge pull request #393 from SHADE-DP/SP3-1-Rendering
Fixed publish rendering errors and improved shiny highlight shaders
2023-03-04 16:01:17 +08:00
Brandon Mak 13f28d6bdb Fixed shiny highlight shaders 2023-03-04 15:55:04 +08:00
Brandon Mak 7eb4921b33 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-04 15:50:10 +08:00
XiaoQiDigipen 9ccde9fa07
Merge pull request #392 from SHADE-DP/SP3-20-UI-System
Updated Level 1 UI
2023-03-04 13:13:11 +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 ba78f6f7a0
Merge pull request #391 from SHADE-DP/AIFixes
Implemented such that AI gets sent to a waypoint of choice (in editor) after capture
2023-03-04 12:50:19 +08:00
XiaoQiDigipen 6cf8f03ff1
Merge branch 'main' into AIFixes 2023-03-04 12:50:13 +08:00
XiaoQiDigipen 6d13c5f218
Merge pull request #389 from SHADE-DP/AudioImplementation
Implemented New SFX and (supposedly) spatial SFX
2023-03-04 12:47:08 +08:00
maverickdgg 3c8b729b4d Merge branch 'main' into SP3-20-UI-System 2023-03-04 12:45:36 +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
Xiao Qi d4081a7e09 Tranpose Inverse Bind Matrix
WIP, building transform matrix not working
2023-03-04 03:20:01 +08:00
Brandon Mak 17bb7a08eb Fixed render to swapchain errors 2023-03-04 01:01:26 +08:00
Brandon Mak ce41e975d0 Merge branch 'main' into SP3-1-Rendering 2023-03-04 00:52:05 +08:00
Kah Wei b93a08fa90 Fixed ImGui crash with SHRawAnimationInspector 2023-03-04 00:48:10 +08:00
Xiao Qi 56693565f4 WIP Load and test animations 2023-03-04 00:43:31 +08:00
Brandon Mak 166e13a339 Shadows WIP
- Light direction in 2nd level changed
2023-03-03 22:01:34 +08:00
Kah Wei 97605cc8fe Added preliminary implementation of animation controller connection attributes 2023-03-03 22:00:56 +08:00
Kah Wei 41784d4c04 Fixed animation clips list for Raw Animation Inspector 2023-03-03 21:28:28 +08:00
Kah Wei beeeae99ca SHRawAnimInspector can now generate incomplete animation clips 2023-03-03 18:53:59 +08:00
Xiao Qi 0741163774 Merge remote-tracking branch 'origin/SP3-22-AnimationController' into SP3-22-AnimationController 2023-03-03 17:23:18 +08:00
Xiao Qi 184fd4f459 [NOT TESTED] Animation Clip asset reading/writing as asset file into binary implemented 2023-03-03 17:16:23 +08:00
Kah Wei f9ae0c10ce Modified SHAnimator and SHRig to use new model formats 2023-03-03 17:11:33 +08:00
Glence 46c99f31f9 Merge branch 'main' into PlayerController 2023-03-03 16:45:26 +08:00
Glence 27b00a6c4a end cutscene done 2023-03-03 14:28:10 +08:00
Glence 81da3e501d fix minor preview level bug 2023-03-03 00:40:16 +08:00
Kah Wei c736967d1c Merge branch 'main' into SP3-22-AnimationController 2023-03-02 19:08:20 +08:00
Kah Wei 69fa0d4da0 Fixed SHRawAnimInspector warnings 2023-03-02 17:44:28 +08:00
Kah Wei 6779f48b5a Fixed typo 2023-03-02 17:33:02 +08:00
Kah Wei 65d57e96b3 Merge branch 'main' into SP3-22-AnimationController
# Conflicts:
#	SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
2023-03-02 16:55:13 +08:00
Kah Wei 3a14f0a887 Added SHRawAnimInspector 2023-03-02 16:54:34 +08:00
Xiao Qi f083147806 WIP Retrofit new data into existing structure 2023-03-02 16:35:30 +08:00
Kah Wei 62fa2ba41a Merge branch 'main' into SP3-22-AnimationController 2023-03-02 13:03:33 +08:00
Kah Wei dfb53bf290 Added WIP AnimationControllerEditor 2023-03-01 23:49:30 +08:00
Xiao Qi af944b3083 UNTESTED: Loading of new format for animations and rigs 2023-03-01 23:13:02 +08:00
Kah Wei d21f9d6c4b Added functions for adding transitions and parameters to an AnimationController 2023-03-01 22:10:09 +08:00
Kah Wei e878b7b65a Added implementation of SHAnimationController Transition logic 2023-03-01 21:55:26 +08:00
Xiao Qi f118c1c2ca WIP Load new model asset structure 2023-03-01 17:56:37 +08:00
Xiao Qi bc17479284 Merge branch 'main' into SP3-13-Assets-Manager 2023-03-01 16:33:30 +08:00
Kah Wei 2679d12afb Merge branch 'main' into SP3-22-AnimationController 2023-03-01 14:02:28 +08:00
Kah Wei e97f5747cb Modified SHAnimatorComponent to support manual and animation controller modes. Fleshed out SHAnimationController. Added SHAnimControllerAsset stub. 2023-03-01 01:30:34 +08:00
Kah Wei 36af939c67 Added reworked AnimationClip and SHAnimClipAsset 2023-02-28 19:19:06 +08:00
Kah Wei 33b5b84fd4 add anim clip 2023-02-27 17:04:16 +08:00
Kah Wei f061e8ed43 Updated comments to use SHRawAnimation instead of SHAnimationData 2023-02-27 16:52:41 +08:00
Kah Wei 7839bd21f2 Renamed SHAnimationData to SHRawAnimation 2023-02-27 16:51:02 +08:00
Kah Wei ba22638520 Renamed SHAnimationClip to SHAnimationData 2023-02-27 16:17:36 +08:00
Kah Wei 9486762693 Merge branch 'main' into SP3-22-AnimationController 2023-02-27 15:54:48 +08:00
Kah Wei ecc88dc142 Fleshed out SHAnimationController more 2023-02-22 23:45:42 +08:00
Kah Wei 913241c73a Merge branch 'main' into SP3-22-AnimationController 2023-02-22 21:49:45 +08:00
Kah Wei c85298db88 Added initial stubs for SHAnimationController 2023-02-20 16:55:08 +08:00
Xiao Qi 883c3c8fc1 Added recognition for audio bank files
Added wrapper class to hold path for fmod system
2023-01-31 18:27:39 +08:00
615 changed files with 49916 additions and 31149 deletions

View File

@ -0,0 +1,67 @@
Name: MD_HomeownerV2Anims
ID: 217758867
Type: 12
Sub Assets:
Name: Full
ID: 227644717
Type: 13
Name: TPose
ID: 221337587
Type: 13
Name: Idle
ID: 224442713
Type: 13
Name: Walk
ID: 229189609
Type: 13
Name: Alerted_by_Racoon
ID: 227890696
Type: 13
Name: Alerted_Idle
ID: 234046577
Type: 13
Name: Alerted_Run
ID: 230172366
Type: 13
Name: Interact
ID: 220088098
Type: 13
Name: Distracted
ID: 229108322
Type: 13
Name: StunStartFront
ID: 223296233
Type: 13
Name: StunLoopFront
ID: 230129276
Type: 13
Name: StunEndFront
ID: 224141761
Type: 13
Name: StunStartBack
ID: 218547923
Type: 13
Name: StunLoopBack
ID: 219563559
Type: 13
Name: StunEndBack
ID: 226668516
Type: 13
Name: React_to_Broken_Stuff
ID: 228323560
Type: 13
Name: Pickup_Item
ID: 227002263
Type: 13
Name: Return_Item
ID: 222655168
Type: 13
Name: Attack_Windup
ID: 223078653
Type: 13
Name: Attack_Hold
ID: 228250554
Type: 13
Name: Attack_Sequence
ID: 226129627
Type: 13

View File

@ -0,0 +1,7 @@
Name: MD_RigTest01_SkinningTestAnims
ID: 203438081
Type: 12
Sub Assets:
Name: Full
ID: 231416496
Type: 13

Binary file not shown.

View File

@ -0,0 +1,40 @@
Name: racoonAnims
ID: 201804216
Type: 12
Sub Assets:
Name: TPose
ID: 231493784
Type: 13
Name: Idle
ID: 227450439
Type: 13
Name: Run
ID: 229125027
Type: 13
Name: Pickup
ID: 219605278
Type: 13
Name: Carry_Idle
ID: 231128260
Type: 13
Name: Carry_Run
ID: 227671720
Type: 13
Name: Throw
ID: 223399345
Type: 13
Name: Sprint
ID: 228149757
Type: 13
Name: Jump_Start
ID: 223009573
Type: 13
Name: Jump_Loop
ID: 230974023
Type: 13
Name: Jump_End
ID: 228134756
Type: 13
Name: Full
ID: 223752972
Type: 13

View File

@ -1,4 +1,4 @@
Start in Fullscreen: false Start in Fullscreen: false
Starting Scene ID: 86098106 Starting Scene ID: 97158628
Window Size: {x: 1920, y: 1080} Window Size: {x: 1920, y: 1080}
Window Title: SHADE Engine Window Title: SHADE Engine

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Cinematics
ID: 197932678
Type: 11

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Master
ID: 187131295
Type: 11

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Master.strings
ID: 184993030
Type: 11

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Music
ID: 187337426
Type: 11

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: SFX
ID: 200039123
Type: 11

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: UI
ID: 185075145
Type: 11

View File

@ -1,14 +1,14 @@
0 StaticObject 1110000000000000 0 StaticObject 1101000000000000
1 Player 1100000000000000 1 Furniture 1101000000000000
2 Food 1000000000000000 2 Food 1000000000000000
3 Breakable 1100000000000000 3 Breakable 1100000000000000
4 ScoringWallCollider 0110000000000000 4 ScoringWallCollider 0110000000000000
5 Homeowner 1100000000000000 5 Homeowner 1100000000000000
6 Camera 0010000000000000 6 Camera 0010000000000000
7 8 0000000000000000 7 StaticWithCameraCollision 1111000000000000
8 9 0000000000000000 8 Floor 1100000000000000
9 10 0000000000000000 9 Navigation 0001000000000000
10 11 0000000000000000 10 Player 1100000000000000
11 12 0000000000000000 11 12 0000000000000000
12 13 0000000000000000 12 13 0000000000000000
13 14 0000000000000000 13 14 0000000000000000

View File

@ -0,0 +1,8 @@
- VertexShader: 47911992
FragmentShader: 46377769
SubPass: G-Buffer Write
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 54758364
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: AnimatedHomeowner
ID: 121518381
Type: 7

View File

@ -0,0 +1,8 @@
- VertexShader: 46580970
FragmentShader: 35983630
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 59076169
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_04a
ID: 130935405
Type: 7

View File

@ -0,0 +1,8 @@
- VertexShader: 46580970
FragmentShader: 35983630
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 66572525
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_04b
ID: 122461516
Type: 7

View File

@ -0,0 +1,8 @@
- VertexShader: 46580970
FragmentShader: 35983630
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 66182834
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_04c
ID: 124507864
Type: 7

View File

@ -0,0 +1,8 @@
- VertexShader: 46580970
FragmentShader: 35983630
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 58009216
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_05a
ID: 118069989
Type: 7

View File

@ -0,0 +1,8 @@
- VertexShader: 46580970
FragmentShader: 35983630
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 55022275
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_05b
ID: 132945336
Type: 7

View File

@ -3,6 +3,6 @@
SubPass: UI SubPass: UI
Properties: Properties:
data.color: {x: 1, y: 1, z: 1, w: 1} data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 54429632 data.textureIndex: 56004904
data.alpha: 1 data.alpha: 1
data.beta: {x: 1, y: 1, z: 1} data.beta: {x: 1, y: 1, z: 1}

View File

@ -3,6 +3,6 @@
SubPass: UI SubPass: UI
Properties: Properties:
data.color: {x: 1, y: 1, z: 1, w: 1} data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 59379300 data.textureIndex: 55278388
data.alpha: 1 data.alpha: 1
data.beta: {x: 1, y: 1, z: 1} data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,8 @@
- VertexShader: 46580970
FragmentShader: 35983630
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 60776650
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: UIMat_MenuBG
ID: 130823048
Type: 7

View File

@ -0,0 +1,8 @@
- VertexShader: 46580970
FragmentShader: 35983630
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 64816540
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: UIMat_SliderBG
ID: 117587364
Type: 7

View File

@ -0,0 +1,11 @@
- VertexShader: 46580970
FragmentShader: 43211183
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 50370514
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}
data.sliderThreshold: 1
data.sliderStartColor: {x: 0.36500001, y: 0.783999979, z: 0.878000021, w: 1}
data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}

View File

@ -0,0 +1,3 @@
Name: UIMat_Slider_BGM
ID: 129354037
Type: 7

View File

@ -0,0 +1,11 @@
- VertexShader: 46580970
FragmentShader: 43211183
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 50370514
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}
data.sliderThreshold: 1
data.sliderStartColor: {x: 0.624000013, y: 0.211999997, z: 0.949000001, w: 1}
data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}

View File

@ -0,0 +1,3 @@
Name: UIMat_Slider_FOV
ID: 117651669
Type: 7

View File

@ -0,0 +1,11 @@
- VertexShader: 46580970
FragmentShader: 43211183
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 50370514
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}
data.sliderThreshold: 1
data.sliderStartColor: {x: 0.949000001, y: 0.689999998, z: 0.211999997, w: 1}
data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}

View File

@ -0,0 +1,3 @@
Name: UIMat_Slider_SFX
ID: 122820018
Type: 7

View File

@ -3,7 +3,9 @@
SubPass: UI SubPass: UI
Properties: Properties:
data.color: {x: 1, y: 1, z: 1, w: 1} data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 51995224 data.textureIndex: 50370514
data.alpha: 1 data.alpha: 1
data.beta: {x: 1, y: 1, z: 1} data.beta: {x: 1, y: 1, z: 1}
data.sliderThreshold: 1 data.sliderThreshold: 1
data.sliderStartColor: {x: 0.254901886, y: 0.321500003, z: 0.909799993, w: 1}
data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}

View File

@ -0,0 +1,8 @@
- VertexShader: 46580970
FragmentShader: 40208610
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 50770098
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: UIMat_Transistion
ID: 132131066
Type: 7

View File

@ -0,0 +1,8 @@
- VertexShader: 46580970
FragmentShader: 35983630
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 55490391
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: UI_Result
ID: 130179375
Type: 7

View File

@ -0,0 +1,8 @@
- VertexShader: 39210065
FragmentShader: 46377769
SubPass: G-Buffer Write
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 64651793
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: default_racoon
ID: 125722190
Type: 7

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -1,7 +0,0 @@
Name: BoneIKTest4
ID: 81814706
Type: 4
Sub Assets:
Name: Cube
ID: 137599708
Type: 8

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -0,0 +1,7 @@
Name: MD_Birdnest
ID: 75951674
Type: 4
Sub Assets:
Name: Birdnest
ID: 148793058
Type: 8

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -0,0 +1,7 @@
Name: MD_CeilingFan
ID: 73062062
Type: 4
Sub Assets:
Name: Sphere.005
ID: 135521751
Type: 8

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -0,0 +1,7 @@
Name: MD_DarkCorridor
ID: 83188665
Type: 4
Sub Assets:
Name: CorridorPiece
ID: 136332265
Type: 8

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -0,0 +1,7 @@
Name: MD_HomeownerV2
ID: 76586906
Type: 4
Sub Assets:
Name: Cube
ID: 148542784
Type: 8

File diff suppressed because one or more lines are too long

View File

@ -1,7 +0,0 @@
Name: MD_RigTest01_SkinningTest
ID: 72178939
Type: 4
Sub Assets:
Name: Cube
ID: 141097368
Type: 8

File diff suppressed because one or more lines are too long

View File

@ -1,7 +0,0 @@
Name: MD_RigTest02_HierachyTest1
ID: 80500944
Type: 4
Sub Assets:
Name: Cube.001
ID: 135102560
Type: 8

File diff suppressed because one or more lines are too long

View File

@ -1,7 +0,0 @@
Name: MD_RigTest03_HierachyTest2
ID: 72063399
Type: 4
Sub Assets:
Name: Cube.001
ID: 140361184
Type: 8

File diff suppressed because one or more lines are too long

View File

@ -1,7 +0,0 @@
Name: MD_RigTest04_BakedIKLegTest
ID: 80728853
Type: 4
Sub Assets:
Name: Cube
ID: 149723808
Type: 8

File diff suppressed because one or more lines are too long

View File

@ -1,7 +0,0 @@
Name: MD_RigTest05_MeshDeformTest
ID: 82124728
Type: 4
Sub Assets:
Name: Sphere
ID: 138773466
Type: 8

File diff suppressed because one or more lines are too long

View File

@ -1,7 +0,0 @@
Name: MD_RigTest06_Piston
ID: 76715962
Type: 4
Sub Assets:
Name: Cube
ID: 134911040
Type: 8

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -0,0 +1,7 @@
Name: MD_RubbishBinV2
ID: 71821168
Type: 4
Sub Assets:
Name: RubbishBin02
ID: 141767450
Type: 8

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -0,0 +1,28 @@
Name: MD_ShelvesItems
ID: 80837524
Type: 4
Sub Assets:
Name: Cube.026
ID: 149990626
Type: 8
Name: Cube.033
ID: 148931934
Type: 8
Name: Cube.043
ID: 150010583
Type: 8
Name: PottedPlant
ID: 136851231
Type: 8
Name: Cube.140
ID: 141518062
Type: 8
Name: Cube.079
ID: 139864675
Type: 8
Name: Cube.061
ID: 147649979
Type: 8
Name: Cube.062
ID: 137537688
Type: 8

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Level1_NavData
ID: 257298636
Type: 15

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Level2_AITest_NavData
ID: 254149790
Type: 15

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Level2_NavData
ID: 260674210
Type: 15

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Level3_NavData
ID: 252819653
Type: 15

View File

@ -1,276 +0,0 @@
- EID: 0
Name: Main Camera
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: 0.472120881, z: 2.53064919}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Camera Component:
Position: {x: 0, y: 0.472120881, z: 2.53064919}
Pitch: 0
Yaw: 0
Roll: 0
Width: 1920
Height: 1080
Near: 0.00999999978
Far: 10000
Perspective: true
IsActive: true
Scripts: ~
- EID: 2
Name: Light
IsActive: true
NumberOfChildren: 0
Components:
Light Component:
Position: {x: 0, y: 0, z: 0}
Type: Directional
Direction: {x: 0, y: 0, z: 1}
Color: {x: 1, y: 1, z: 1, w: 1}
Layer: 4294967295
Strength: 0
IsActive: true
Scripts: ~
- EID: 1
Name: Plate
IsActive: true
NumberOfChildren: 4
Components:
Transform Component:
Translate: {x: 0.00451920554, y: 0.829197884, z: 1.75}
Rotate: {x: -0, y: 0, z: -0}
Scale: {x: 0.999979734, y: 1, z: 0.999979734}
IsActive: true
Renderable Component:
Mesh: 140964851
Material: 126974645
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Type: Box
Half Extents: {x: 0.200000003, y: 0.100000001, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: Breakable
Enabled: true
threshHold: 0
force: 1
- EID: 4
Name: Piece1
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 3.2922253e-07, y: 0, z: -0.0171992779}
Rotate: {x: -1.31316483e-07, y: 3.60887498e-09, z: 5.27542454e-11}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 146557542
Material: 124370424
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Type: Box
Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 5
Name: Piece2
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 2.47731805e-07, y: 0, z: 0.0325666666}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 145439064
Material: 124370424
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Type: Box
Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.200000003}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 6
Name: Piece3
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -0.0502781346, y: 1.18017197e-05, z: 6.97374344e-05}
Rotate: {x: 0.021297913, y: 0.00146768149, z: -5.48749846e-08}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 139411134
Material: 124370424
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Type: Box
Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 7
Name: Piece4
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0.0364143178, y: 7.39097595e-06, z: 6.61611557e-05}
Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 136742160
Material: 124370424
IsActive: true
RigidBody Component:
Type: Dynamic
Drag: 0.00999999978
Angular Drag: 0.00999999978
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Type: Box
Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 3
Name: Ground
IsActive: true
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 0, y: -0.414889663, z: 0}
Rotate: {x: -0, y: 0, z: -0}
Scale: {x: 5, y: 1, z: 5}
IsActive: true
RigidBody Component:
Type: Static
Drag: 0.00999999978
Angular Drag: 0.00999999978
Use Gravity: true
Interpolate: true
Sleeping Enabled: true
Freeze Position X: false
Freeze Position Y: false
Freeze Position Z: false
Freeze Rotation X: false
Freeze Rotation Y: false
Freeze Rotation Z: false
IsActive: true
Collider Component:
Colliders:
- Is Trigger: false
Type: Box
Half Extents: {x: 1, y: 1, z: 1}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~

Some files were not shown because too many files have changed in this diff Show More