Compare commits

...

1034 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
XiaoQiDigipen 90c9a0a959
Merge branch 'main' into AudioImplementation 2023-03-04 12:46:59 +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
XiaoQiDigipen e197097d7c
Merge pull request #390 from SHADE-DP/SP3-20-UI-System
Gameplay UI on Level 2.
2023-03-04 12:42:42 +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
maverickdgg 3a60eee32f merged 2023-03-04 03:17:20 +08:00
maverickdgg 6d1e179baf UI doine 2023-03-04 02:46:56 +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
mushgunAX a5fe4bf0a0 New SFX and (supposedly) spatial SFX 2023-03-04 00:19:35 +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
XiaoQiDigipen d7d4e21005
Merge pull request #386 from SHADE-DP/SP3-4-Editor
added ifdef check for editor
2023-03-03 20:12:21 +08:00
SHAM-DP 96d73ca626 added ifdef check for editor 2023-03-03 20:06:58 +08:00
Kah Wei beeeae99ca SHRawAnimInspector can now generate incomplete animation clips 2023-03-03 18:53:59 +08:00
XiaoQiDigipen 421016f4fc
Merge pull request #385 from SHADE-DP/SP3-129-AudioSystem
Add Set audio param with label functionality
2023-03-03 18:30:17 +08:00
XiaoQiDigipen 0e01332213
Merge pull request #384 from SHADE-DP/SP3-10-input-management
Implemented mouse centering and hiding in game
2023-03-03 18:29:54 +08:00
SHAM-DP dfc2a68dde Add Set audio param with label functionality 2023-03-03 18:13:35 +08:00
mushgunAX 0a224726b3 revert? 2023-03-03 17:25:09 +08:00
mushgunAX d65af97166 Revert of a previous commit for scene files 2023-03-03 17:24:27 +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
SHAM-DP 9eb40d5928 Fix showcursor 2023-03-03 16:52:43 +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
mushgunAX f7c33bc89a Various null checks 2023-03-03 14:26:36 +08:00
Glence 81da3e501d fix minor preview level bug 2023-03-03 00:40:16 +08:00
mushgunAX 7763a969b2 Merge branch 'main' into SP3-10-input-management 2023-03-02 22:55:29 +08:00
Kah Wei c736967d1c Merge branch 'main' into SP3-22-AnimationController 2023-03-02 19:08:20 +08:00
XiaoQiDigipen 46ffeada67
Merge pull request #383 from SHADE-DP/PlayerController
New features added
2023-03-02 18:31:38 +08:00
Kah Wei 69fa0d4da0 Fixed SHRawAnimInspector warnings 2023-03-02 17:44:28 +08:00
maverickdgg 0984eee6bb Gameplay UI WIP 2023-03-02 17:34:11 +08:00
Glence 97db3b1021 Merge branch 'main' into PlayerController 2023-03-02 17:33:42 +08:00
Kah Wei 6779f48b5a Fixed typo 2023-03-02 17:33:02 +08:00
Glence 8c74ec85d3 Done with level preview 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
XiaoQiDigipen 173529501c
Merge pull request #382 from SHADE-DP/SP3-1-Rendering
Fixed trajectory rendering, added text size and solved vulkan errors
2023-03-02 16:32:37 +08:00
Brandon Mak 61a877cee1 Fixed bug texture loading
- During mipmap transfer to GPU, height would sometimes be 0. Fixed it using std::max
2023-03-02 16:04:22 +08:00
Brandon Mak 6b42d78f16 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-02 15:49:36 +08:00
Brandon Mak e05e21ec5a Added text size for text renderable component 2023-03-02 15:49:28 +08:00
mushgunAX 802924141a Scene Fade In and Out Fixes 2023-03-02 15:47:00 +08:00
Brandon Mak e2ef32f130 Fixed Trajectory Rendering 2023-03-02 15:29:24 +08:00
mushgunAX 1e734b6006 Merge branch 'main' into SP3-10-input-management 2023-03-02 13:31:13 +08:00
Glence 2834414115 Merge branch 'main' into PlayerController 2023-03-02 13:05:28 +08:00
Kah Wei 62fa2ba41a Merge branch 'main' into SP3-22-AnimationController 2023-03-02 13:03:33 +08:00
XiaoQiDigipen 4124c74306
Merge pull request #381 from SHADE-DP/SP3-1-Rendering
Implemented serialization for text color and trajectory rendering
2023-03-02 12:47:35 +08:00
XiaoQiDigipen 38afe39447
Merge pull request #380 from SHADE-DP/SP3-20-UI-System
Added TweenThreadVec3. Updated UI elements to use new textures and fonts. Gameplay UI WIP
2023-03-02 12:46:11 +08:00
XiaoQiDigipen dfd1f59b02
Merge pull request #379 from SHADE-DP/SP3-141-Camera-System
Rotates target offset based on camera arm's rotation
2023-03-02 12:45:38 +08:00
Brandon Mak 848123c138 Bug fix 2023-03-02 11:53:52 +08:00
Brandon Mak 1e59b6436c Merge branch 'main' into SP3-1-Rendering 2023-03-02 11:36:35 +08:00
maverickdgg 381fe476be Game UI WIP 2023-03-02 11:33:21 +08:00
maverickdgg 30923389ae Merge branch 'main' into SP3-20-UI-System 2023-03-02 10:23:09 +08:00
SHAM-DP 4131c58c08 Modified calls to IsCursorVisible 2023-03-02 10:01:52 +08:00
maverickdgg e0ee2a8079 Gameplay UI progress 2023-03-02 09:55:41 +08:00
Brandon Mak 87c04436b3 Added scripting interface and serialization for Trajectory comp 2023-03-02 09:08:20 +08:00
maverickdgg 9dd01f5fa1 Replaced How to play screen and credits placeholder 2023-03-02 03:01:24 +08:00
maverickdgg e4345d4937 Changed all button textures and update win and lose screen to use buttonFX 2023-03-02 02:30:59 +08:00
maverickdgg 5cc2e26de6 Rotates target offset based on camera arm's rotation 2023-03-02 02:06:25 +08:00
Glence 2af19baccd Added the transition back to the scene 2023-03-02 00:02:18 +08:00
Glence b2c702c780 Merge branch 'main' into PlayerController 2023-03-02 00:01:34 +08:00
mushgunAX a04eee0a2f mouse centering and visibility when appropriate 2023-03-01 23:56:40 +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
Glence 403df62a0b cleaning up scenes and WIP for previewlevel camera 2023-03-01 18:05:42 +08:00
Xiao Qi f118c1c2ca WIP Load new model asset structure 2023-03-01 17:56:37 +08:00
XiaoQiDigipen b63db13c41
Merge pull request #378 from SHADE-DP/scenetransitions
Implemented Fade In To and Fade Out From Black Scene Transitions
2023-03-01 17:55:27 +08:00
mushgunAX 0754eaa51a Merge branch 'main' into scenetransitions 2023-03-01 17:36:14 +08:00
mushgunAX 1f5cfd36f7 Scene transitions done 2023-03-01 17:36:02 +08:00
XiaoQiDigipen 5c78b7ec1b
Merge pull request #377 from SHADE-DP/SP3-4-Editor
Added scripting interface for cursor visible.
2023-03-01 17:08:45 +08:00
SHAM-DP 98140aa797 Added scripting interface for cursor visible.
Fixed collider offset undo/redo
Double click object to look at object
Display editor cam pitch/yaw/roll
2023-03-01 17:06:53 +08:00
mushgunAX a65735e0b3 progress 2023-03-01 16:37:33 +08:00
Xiao Qi bc17479284 Merge branch 'main' into SP3-13-Assets-Manager 2023-03-01 16:33:30 +08:00
Brandon Mak 4b37be6075 Made text color serialized 2023-03-01 16:02:44 +08:00
Kah Wei 2679d12afb Merge branch 'main' into SP3-22-AnimationController 2023-03-01 14:02:28 +08:00
mushgunAX 17a7db8a91 Merge branch 'main' into scenetransitions 2023-03-01 12:51:43 +08:00
Brandon Mak e44e961e14 Particles WIP 2023-03-01 10:06:09 +08:00
Brandon Mak 77722aa560 renamed some files 2023-03-01 08:58:16 +08:00
Brandon Mak 2e7bfd8b28 Merge branch 'main' into SP3-1-Rendering 2023-03-01 08:56:45 +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
Glence d5c9010661 Clean up the scenes 2023-03-01 01:16:34 +08:00
Glence ab92d56cf0 disable movement when pop out is in place 2023-03-01 00:51:57 +08:00
XiaoQiDigipen dd9eeac0d1
Merge pull request #376 from SHADE-DP/PlayerController
Bug fixes, Scene changes and new features
2023-02-28 23:10:33 +08:00
Glence 4e56061ebe adjust text in cutscene 2023-02-28 22:53:54 +08:00
Glence bd9349eae7 FRC fix, stealfood popup almost done and reset dt when load 2023-02-28 21:42:05 +08:00
Brandon Mak 0da61aa842 Fixed text rendering rendering last 2023-02-28 21:30:09 +08:00
Brandon Mak 7f13462db7 GetGraphicsPipeline now takes in a subpass (thanks KW)
- Fixed blending issues in pipeline
2023-02-28 19:47:52 +08:00
Kah Wei 36af939c67 Added reworked AnimationClip and SHAnimClipAsset 2023-02-28 19:19:06 +08:00
Glence 04c19fb586 Merge branch 'main' into PlayerController 2023-02-28 19:13:11 +08:00
Glence 0bdab3b079 WIP for steal food pop up 2023-02-28 18:35:43 +08:00
mushgunAX d9f064994e Merge branch 'main' into scenetransitions 2023-02-28 18:34:07 +08:00
XiaoQiDigipen b9b9f86bad
Merge pull request #375 from SHADE-DP/SP3-4-Editor
Fixed editor bugs - Copy/Paste values caused entities to get pasted, filtered asset browser could not expand compilable assets, EditorConfig workingscene does not get saved sometimes
2023-02-28 16:22:17 +08:00
SHAM-DP ef268bc9e5 Drag drop prefab onto entity (NON UNDO/REDO ACTION for now) 2023-02-28 16:01:52 +08:00
Glence 52ba54a82a Fix ShinyHighlight issue and updated level 3 2023-02-28 15:42:28 +08:00
SHAM-DP 7e34edecdd safety check for scroll to after paste entity 2023-02-28 15:36:45 +08:00
SHAM-DP 5b5a9342c3 Merge branch 'main' into SP3-4-Editor 2023-02-28 15:12:31 +08:00
SHAM-DP e75826436f Fix editor config working scene, fix entities being copy/pasted when using copy paste in a field. Fix filtered display for asset browser 2023-02-28 15:12:17 +08:00
Glence 2ab4981a43 renamed cutscene to cutsceneIntro and adjusted level 2 2023-02-28 15:06:19 +08:00
XiaoQiDigipen 911ecf15ed
Merge pull request #374 from SHADE-DP/SP3-129-AudioSystem
Added spatial audio
2023-02-28 13:17:19 +08:00
SHAM-DP 3141902e3d Merge branch 'main' into SP3-129-AudioSystem 2023-02-28 13:11:36 +08:00
SHAM-DP a6659f7cbc Remove some redundant lines 2023-02-28 13:11:21 +08:00
SHAM-DP 417f086dfa Clean up and verified VCA Volume editing is working fine 2023-02-28 09:36:28 +08:00
mushgunAX d563247ec2 Merge branch 'main' into scenetransitions 2023-02-28 06:49:55 +08:00
mushgunAX b3ec2fb4df implementing in progress 2023-02-28 06:49:40 +08:00
Glence 380de28358 cutscene for intro done 2023-02-28 01:57:00 +08:00
SHAM-DP 50d7ad80a2 Added Spatial Audio 2023-02-27 22:02:48 +08:00
Glence 79cb0f12ae WIP for Alpha, added material name in editor WIP for cutscene 2023-02-27 18:09:05 +08:00
XiaoQiDigipen f57e9e9a91
Merge pull request #373 from SHADE-DP/SP3-6-c-scripting
Script list is now sorted in alphabetical order
2023-02-27 17:24:29 +08:00
Kah Wei d8756cfcf7 Script list is now sorted in alphabetical order 2023-02-27 17:21:02 +08:00
Kah Wei 33b5b84fd4 add anim clip 2023-02-27 17:04:16 +08:00
maverickdgg 4f1ecf1b50 multiplierTextFX WIP 2023-02-27 17:01:46 +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
XiaoQiDigipen 0f0542f46f
Merge pull request #372 from SHADE-DP/SP3-20-UI-System
Fixed Slider Text. Changed Fonts
2023-02-27 16:41:37 +08:00
maverickdgg f4114b7844 Merge branch 'main' into SP3-20-UI-System 2023-02-27 16:39:39 +08:00
maverickdgg cbb334d48e Slider Text Default Value fix 2023-02-27 16:39:31 +08:00
mushgunAX c328672286 black shader 2023-02-27 16:22:54 +08:00
Kah Wei ba22638520 Renamed SHAnimationClip to SHAnimationData 2023-02-27 16:17:36 +08:00
Glence 75295b5d6e Merge branch 'main' into PlayerController 2023-02-27 15:58:37 +08:00
Kah Wei 9486762693 Merge branch 'main' into SP3-22-AnimationController 2023-02-27 15:54:48 +08:00
Glence c912dd2e4b WIP for cutscene and added test for KW 2023-02-27 15:33:58 +08:00
mushgunAX ba89dcea14 Merge branch 'main' into scenetransitions 2023-02-27 15:30:04 +08:00
XiaoQiDigipen b3ed59d98a
Merge pull request #371 from SHADE-DP/SP3-20-UI-System
Button FX now uses the easing functions. Viewport can now be fixed at an AR.
2023-02-27 15:28:55 +08:00
mushgunAX f9c90ece7e Scene Transition Script 2023-02-27 15:28:05 +08:00
maverickdgg 4c7d06452e viewport changed 2023-02-27 15:25:01 +08:00
maverickdgg 0e7ecd382f Merge branch 'main' into SP3-20-UI-System 2023-02-27 15:17:03 +08:00
maverickdgg 08e4db134a Tweaked main menu UI 2023-02-27 15:16:48 +08:00
Brandon Mak f6db65ddf4 Particles WIP 2023-02-27 15:14:32 +08:00
XiaoQiDigipen 725da6254d
Merge pull request #370 from SHADE-DP/SP3-6-c-scripting
Fixed behaviour of script Awake() and Start() not getting called as intended (first frame that object is active)
2023-02-27 13:10:35 +08:00
Kah Wei 99c1eebe70 Fixed behaviour of script Awake() and Start() not getting called as intended (first frame that object is active) 2023-02-27 12:57:37 +08:00
XiaoQiDigipen 0eae325b5f
Merge pull request #369 from SHADE-DP/SP3-20-UI-System
Added Sliders. Added Level Select, How To Play,. Credits Options Canvases layout for in main menu. Added Tweening Manager(Script)
2023-02-27 12:00:24 +08:00
XiaoQiDigipen 29f1edb9e8
Merge pull request #368 from SHADE-DP/SP3-4-Editor
Added display of editor camera position
2023-02-27 11:59:58 +08:00
XiaoQiDigipen 2fb5ec3fd9
Merge pull request #367 from SHADE-DP/SP3-8-serialization
Added rudimentary prefabs (no resolution)
2023-02-27 11:53:46 +08:00
maverickdgg 984473bdab Slider text fixed 2023-02-27 10:28:20 +08:00
maverickdgg db8ed27cb7 main Menu layout complete for now 2023-02-27 10:05:30 +08:00
maverickdgg eb7c0e749e Added a slider_textured fs 2023-02-27 09:59:58 +08:00
maverickdgg 949ade5775 Options Layout done 2023-02-27 09:55:54 +08:00
maverickdgg 90763ded71 Change Canvas Button Script 2023-02-27 08:08:04 +08:00
maverickdgg f23853c85c Main Menu Canvas Layout with button FX and scalebounce 2023-02-27 07:32:26 +08:00
maverickdgg eb3d8b6b8b Slider done, Slider Shader bugged 2023-02-27 05:42:54 +08:00
Glence 55953e0f08 Merge branch 'main' into PlayerController 2023-02-27 00:41:35 +08:00
Glence efcca56c99 WIP foir silhouette, renamed scene files and fix breakable bug 2023-02-27 00:41:25 +08:00
Sri Sham Haran dabc94a845 editor cam pos display as requested 2023-02-26 23:26:24 +08:00
Sri Sham Haran 7c21544d69 Merge branch 'main' into SP3-4-Editor 2023-02-26 23:22:36 +08:00
Sri Sham Haran 31491d06ef Merge branch 'main' into SP3-8-serialization 2023-02-26 22:44:57 +08:00
Sri Sham Haran ff2b9b4af3 Rudimentary Prefab (no resolution)
Warning Fixes
2023-02-26 22:44:39 +08:00
XiaoQiDigipen b4930b63f5
Merge pull request #366 from SHADE-DP/SP3-141-Camera-System
Added offset calculation to camera get position
2023-02-26 15:56:46 +08:00
maverickdgg 234da235b5 Merge branch 'main' into SP3-141-Camera-System 2023-02-26 02:21:30 +08:00
maverickdgg c8baff878e Added offset calculation to camera get position 2023-02-26 02:20:57 +08:00
Sri Sham Haran 2878c840c5 Merge remote-tracking branch 'origin/SP3-4-Editor' into SP3-4-Editor 2023-02-25 23:37:22 +08:00
Glence 027a2c490b Added elapsedTime and shiny Highlight along with Level 3 asset and scene 2023-02-25 21:56:49 +08:00
Brandon Mak fe27f8752b Particle system WIP 2023-02-24 21:46:01 +08:00
Brandon Mak 1c066f4cbd Merge branch 'main' into SP3-1-Rendering 2023-02-24 21:32:02 +08:00
XiaoQiDigipen 54a2428b7c
Merge pull request #364 from SHADE-DP/PlayerController
Fix bugs and add Pause for the game in
2023-02-24 21:14:29 +08:00
Glence a27b3fb80e fix vulkan red line 2023-02-24 21:10:45 +08:00
Glence acc548678e Merge branch 'main' into PlayerController 2023-02-24 21:10:10 +08:00
SHAM-DP 38c6cb6fed Prefab WIP
Added component status
2023-02-24 20:34:49 +08:00
SHAM-DP 42f4c1c75e Aspect Ratio WIP 2023-02-24 20:21:09 +08:00
Glence dfbd1d027c Merge branch 'main' into PlayerController 2023-02-24 18:04:26 +08:00
XiaoQiDigipen d85382a06d
Merge pull request #363 from SHADE-DP/SP3-1-Rendering
Implemented scanline and silhouette effect
2023-02-24 17:20:45 +08:00
XiaoQiDigipen d259e31638
Merge pull request #362 from SHADE-DP/SP3-141-Camera-System
Camera width resize with viewport. GetMainCamera exposed to scripts
2023-02-24 17:20:13 +08:00
Brandon Mak 18f6720055 Merge branch 'main' into SP3-1-Rendering 2023-02-24 17:18:40 +08:00
maverickdgg b017618373 Merge branch 'main' into SP3-141-Camera-System 2023-02-24 16:32:01 +08:00
maverickdgg 4690fa5f91 GetMainCamera exposed to scripts. 2023-02-24 16:31:53 +08:00
maverickdgg 6045214b13 Camera width to resize with view port 2023-02-24 15:35:02 +08:00
XiaoQiDigipen bbc21670c3
Merge pull request #361 from SHADE-DP/SP3-141-Camera-System
Change AR to be shared and stored in camera system
2023-02-24 15:12:17 +08:00
XiaoQiDigipen 774147233b
Merge pull request #360 from SHADE-DP/SP3-20-UI-System
Pre-load button textures
2023-02-24 15:09:17 +08:00
maverickdgg c774071b35 Merge branch 'main' into SP3-141-Camera-System 2023-02-24 15:05:40 +08:00
maverickdgg 546ac9bb00 Gets the resource manager to pre-Load the textures when we set button texture asset ids 2023-02-24 15:02:41 +08:00
Brandon Mak 7eac238226 Accounted for subpass input descriptors
Silhouette shader is working
2023-02-24 11:47:58 +08:00
Brandon Mak 6faa4e676b Updated shader for scanline (needs refining)
Shader hot reloading is working
2023-02-24 08:27:04 +08:00
Glence 86b662c7dc Merge branch 'main' into PlayerController 2023-02-23 19:45:38 +08:00
XiaoQiDigipen 79433bcba2
Merge pull request #359 from SHADE-DP/SP3-20-UI-System
Moved UIRoutines call order. Call FinalizeChanges. Fixed UI Button Events.
2023-02-23 14:00:50 +08:00
XiaoQiDigipen ae2bc8592f
Merge pull request #358 from SHADE-DP/SP3-10-input-management
Implemented Input Functions via C#
2023-02-23 14:00:26 +08:00
Xiao Qi 5d3e755b9b Reload of recompiled data 2023-02-23 13:49:21 +08:00
maverickdgg c4db16bb95 Merge branch 'main' into SP3-20-UI-System 2023-02-23 13:44:12 +08:00
maverickdgg 69f2e678df re-enabled scene change and disabled debug logs 2023-02-23 13:42:22 +08:00
Kah Wei 64be53bad3 Fixed button events only working once 2023-02-23 13:39:09 +08:00
Brandon Mak a391d9373e WIP 2023-02-23 13:35:46 +08:00
Kah Wei 7292f11cdb Fixed issue where duplicate script assemblies are loaded again 2023-02-23 13:32:23 +08:00
Kah Wei d7846082a3 Fixed incorrect managed functions being called for new button events 2023-02-23 13:32:00 +08:00
maverickdgg 1b865b129b Added finalizeChanges call and debug logs for hover enter 2023-02-23 12:50:42 +08:00
mushgunAX dbe9b4d133 Controller, Bindings and Mouse Centre via C# 2023-02-22 23:50:39 +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 bea179fb0f Added script mappings for new button events 2023-02-22 21:49:10 +08:00
Brandon Mak 4dd496a6e8 Auto stash before merge of "SP3-1-Rendering" and "origin/SP3-1-Rendering"
WIP Hot reload
2023-02-22 19:51:50 +08:00
Xiao Qi ff76704a86 New internal function in asset manager to get asset ID from name of compiled asset 2023-02-22 19:48:49 +08:00
Xiao Qi 8e9854a130 Check for existing asset meta in browser file before sendin asset id 2023-02-22 16:49:21 +08:00
Xiao Qi 5623115e29 Added asset id into compile function to facilitate event sending 2023-02-22 16:43:49 +08:00
Brandon Mak f7bb8606be Shader, text, asset manager events and generic data desc sets
- Made shader for shiniy effect (half done)
- Text objects in scene now use a UI component for better scaling
- Asset manager now creates an event for compilation of assets
- Descriptor for generic data is implemented
2023-02-22 16:39:21 +08:00
mushgunAX bc87fa3ae0 Merge branch 'main' into SP3-10-input-management 2023-02-22 15:16:05 +08:00
mushgunAX 0e572d7f89 progress 2023-02-22 15:15:38 +08:00
XiaoQiDigipen 5d025b0f9e
Merge pull request #357 from SHADE-DP/SP3-6-c-scripting
Added SharedMaterial for Renderable
2023-02-22 14:53:47 +08:00
Sri Sham Haran fbd0035ade Merge branch 'main' into SP3-4-Editor 2023-02-21 22:17:20 +08:00
maverickdgg 06ad2a4c0c moved the UI routines 2023-02-21 21:20:31 +08:00
Glence 8d10c48645 Bug fixes and WIP for alpha 2023-02-21 19:31:50 +08:00
Kah Wei 9a7c0d0bf6 Added SharedMaterial for Renderable 2023-02-21 17:30:43 +08:00
XiaoQiDigipen 269d5ffc15
Merge pull request #356 from SHADE-DP/SP3-20-UI-System
Added 3 button event. Changed hovered and clicked boolean to be stored in UIComponent instead. Fixed Canvas Scaling matrix.
2023-02-21 15:49:27 +08:00
XiaoQiDigipen ded5a87cf4
Merge pull request #354 from SHADE-DP/PlayerController
Bug fixes for textrenderable and sterilization, added base for game pause
2023-02-21 15:49:09 +08:00
maverickdgg 6b6bbc6ac5 Camera AR now stored in system instead of camera component. 2023-02-21 11:37:09 +08:00
Brandon Mak 49692e5c37 Text Rendering now checks for UI Component 2023-02-21 11:16:44 +08:00
maverickdgg a3112f9c60 Fixed Canvas Scaler to keep AR of the UI Elements 2023-02-21 10:48:07 +08:00
maverickdgg 51909071e6 Change isHovered and isClicked to be stored in UIComponent instead and made a helper function to check for clicks and hovered 2023-02-21 10:09:58 +08:00
mushgunAX 9cc318cf27 Merge branch 'main' into SP3-10-input-management 2023-02-21 09:55:28 +08:00
mushgunAX fe64844c4e Mouse Centering 2023-02-21 09:55:14 +08:00
maverickdgg febe22e487 Added new button events 2023-02-21 09:52:23 +08:00
Glence d7725f4e26 Pause is done 2023-02-21 00:47:20 +08:00
Glence 09d88b5a70 small bug fixes for text and serialization and added game pause 2023-02-20 19:53:22 +08:00
Glence f2e9d3b349 Merge branch 'main' into PlayerController 2023-02-20 19:07:56 +08:00
Kah Wei c85298db88 Added initial stubs for SHAnimationController 2023-02-20 16:55:08 +08:00
Brandon Mak f2101243e7 Merge branch 'main' into SP3-1-Rendering 2023-02-20 15:47:13 +08:00
XiaoQiDigipen 098e373318
Merge pull request #353 from SHADE-DP/SP3-141-Camera-System
Adjust AR for game camera. Expose FOV to inspector
2023-02-20 14:54:04 +08:00
maverickdgg c9e9a30c3f Exposed FOV to editor. Adjust AR for game camera 2023-02-20 14:52:01 +08:00
maverickdgg 33a6fac7c9 Merge branch 'main' into SP3-141-Camera-System 2023-02-20 14:39:14 +08:00
maverickdgg debdba183e removed some debug code 2023-02-20 14:39:10 +08:00
XiaoQiDigipen f4a6810fd9
Merge pull request #352 from SHADE-DP/SP3-1-Rendering
Implemented improved shadows (still abit whack), trajectory system (untested), and window resize event
2023-02-20 14:35:25 +08:00
Brandon Mak 7b500d0cac Merge branch 'main' into SP3-1-Rendering 2023-02-20 14:28:54 +08:00
Brandon Mak 15df08ef67 Implemented events for screen resize 2023-02-20 14:28:23 +08:00
XiaoQiDigipen 17a84bb2c8
Merge pull request #351 from SHADE-DP/SP3-6-CSharpStaticReset
Static variables in scripts are now reset when leaving play mode
2023-02-20 11:12:09 +08:00
Glence d754a0b5c3 added targetOffSet to camera position 2023-02-18 23:43:43 +08:00
Glence dfe4d047e9 added a jumppad to the game 2023-02-18 22:21:23 +08:00
Kah Wei 7d7ffc56fd Disabled script undo and redo temporarily 2023-02-18 12:35:47 +08:00
Kah Wei 916a7315da Merge branch 'main' into SP3-6-CSharpStaticReset 2023-02-18 12:24:17 +08:00
Brandon Mak 19d81b80f6 Base files for particles 2023-02-17 18:29:44 +08:00
Brandon Mak f1217cc20b Trajectory Rendering WIP
- Trajectory rendering system is all in place. Just requires testing through the component. 
- Component needs to be reflected in editor
- Shaders for trajectory rendering is also in place
2023-02-17 13:48:14 +08:00
Brandon Mak cee45863fa Trajectory rendering WIP 2023-02-17 00:53:45 +08:00
Brandon Mak 5acca02363 Implemented different shadow mapping technique 2023-02-15 21:34:22 +08:00
Brandon Mak 3a28873496 Merge branch 'main' into SP3-1-Rendering 2023-02-15 12:56:17 +08:00
Xiao Qi 7afbc33861 Uncommented line to hide console in publish 2023-02-06 15:58:57 +08:00
Glence 670ddee65a Added rayheight for pickandthrow 2023-02-04 16:02:59 +08:00
Glence a97dfe7049 remove watermelon debug 2023-02-04 15:56:37 +08:00
XiaoQiDigipen e07a741c11
Merge pull request #350 from SHADE-DP/SP3-2-Physics
Potential fix for incorrect collision states
2023-02-04 15:20:14 +08:00
Diren D Bharwani ccd1d883d9 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-04 15:18:22 +08:00
Diren D Bharwani c0249531d3 Potential fix to physics collision states being incorrect 2023-02-04 15:18:15 +08:00
Glence a594df5a4d added physics fix and raycast change
called clear container in physicsSystem
move raycast of player higher
2023-02-04 15:17:58 +08:00
Diren D Bharwani 7cf5ef4b81 Solved merge conflicts from main 2023-02-04 14:21:40 +08:00
Diren D Bharwani 385b34fea4 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-04 14:20:25 +08:00
XiaoQiDigipen f2602207aa
Merge pull request #349 from SHADE-DP/PlayerController
Small changes for publish build
2023-02-04 14:12:08 +08:00
Glence a4ceffcfad Small changes for publish build
Level1 ai fix
Ai speed fix
item vel reset back when return
player hard set rotation
can go to nesxt scene correctly now
scoring now checks for trigger
2023-02-04 14:11:16 +08:00
XiaoQiDigipen 5f03ac0c4d
Merge pull request #348 from SHADE-DP/PreAlphaFixes
Tweaked lighting in MainGame scene a bit cuz it looked janky at one portion, Hide and clip mouse cursor for builds without editor (only when window is active)
2023-02-04 11:26:56 +08:00
Sri Sham Haran e41c161202 Adjusted lighting a bit cuz it looked janky at one portion
Hide and clip mouse cursor for builds without editor (only when window is active)
2023-02-04 11:21:25 +08:00
XiaoQiDigipen 3183316f40
Merge pull request #347 from SHADE-DP/AudioImplementation
Done with Audio Implementation via C#
2023-02-04 10:18:26 +08:00
mushgunAX d1bad74791 Merge branch 'main' into AudioImplementation 2023-02-04 02:45:09 +08:00
XiaoQiDigipen 32043635c5
Merge pull request #346 from SHADE-DP/SP3-141-Camera-System
Fix camera arm and win scene issue
2023-02-04 02:44:32 +08:00
Glence d1ae9b3756 Fix camera arm and win scene issue 2023-02-04 02:42:30 +08:00
XiaoQiDigipen f617a1a984
Merge pull request #345 from SHADE-DP/SP3-141-Camera-System
Camera Collision fix. Still have some minor bugs
2023-02-04 02:39:55 +08:00
Xiao Qi 1f7f86dd01 Merge remote-tracking branch 'origin/main' into main 2023-02-04 02:39:37 +08:00
Xiao Qi 33807de93d Pushed scene change and animator component bug fix for models without rigs 2023-02-04 02:32:35 +08:00
maverickdgg c5296db6f6 Camera Collision fix 2023-02-04 02:20:42 +08:00
mushgunAX 6e8b2bc460 Merge branch 'main' into AudioImplementation 2023-02-04 02:11:41 +08:00
maverickdgg 5b6217f923 Merge branch 'main' into SP3-141-Camera-System 2023-02-04 02:10:16 +08:00
maverickdgg 94fe055aa9 fixed collision 2023-02-04 02:10:08 +08:00
Sri Sham Haran 0297627599
Merge pull request #344 from SHADE-DP/PlayerController
Fix collisionTag and playercontroller issue
2023-02-04 02:09:12 +08:00
Glence 79c1bb229a Merge branch 'main' into PlayerController 2023-02-04 02:05:48 +08:00
Glence 0c455c55f6 correct collision tag issue and fix player controller keypress 2023-02-04 02:05:32 +08:00
Diren D Bharwani 638286b357 Fixed missing trigger state 2023-02-04 01:57:27 +08:00
mushgunAX 1866d4ba40 SFX for item scoring 2023-02-04 01:45:34 +08:00
mushgunAX a7238c6eba Merge branch 'main' into AudioImplementation 2023-02-04 01:45:09 +08:00
mushgunAX 23f7812a70 Fix StopAllSounds 2023-02-04 01:44:00 +08:00
maverickdgg 44e28f0d3f Merge branch 'main' into SP3-141-Camera-System 2023-02-04 01:20:45 +08:00
XiaoQiDigipen b2473c0c48
Merge pull request #343 from SHADE-DP/PlayerController
Fix scene1 issues and fix scripts
2023-02-04 01:20:26 +08:00
maverickdgg e5d372c94e Merge branch 'main' into SP3-141-Camera-System 2023-02-04 01:20:22 +08:00
Sri Sham Haran b89be05ceb Shortcuts in hierarchy panel cannot be pressed when any widget is focused 2023-02-04 01:20:01 +08:00
Glence 9d73806573 Merge branch 'main' into PlayerController 2023-02-04 01:11:56 +08:00
Glence 436846d03c Fix level1 and fix ontrigger calling twice 2023-02-04 01:11:47 +08:00
XiaoQiDigipen e88447bcf0
Merge pull request #342 from SHADE-DP/SP3-2-Physics
Collision Tags autosave on change, fixed serialisation bug with collision tags
2023-02-04 01:02:25 +08:00
Diren D Bharwani d517a98bab Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-04 00:54:03 +08:00
Diren D Bharwani a520571d82 Collision Tags now serialise based on index & autosave 2023-02-04 00:52:58 +08:00
maverickdgg 81d63f9776 Merge branch 'main' into SP3-141-Camera-System 2023-02-04 00:43:41 +08:00
maverickdgg 63a546b7aa Merge branch 'main' into SP3-141-Camera-System 2023-02-04 00:32:41 +08:00
XiaoQiDigipen ac93269283
Merge pull request #341 from SHADE-DP/SP3-20-UI-System
Fixed Button texture swapping. Fixed Button scripts on scene change. Added buttons to scenes. Added SHEDITOR define for Managed
2023-02-04 00:32:29 +08:00
mushgunAX c7b99df2f6 Merge branch 'main' into AudioImplementation 2023-02-04 00:31:23 +08:00
maverickdgg 358df0768d Merge branch 'SP3-20-UI-System' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-20-UI-System 2023-02-04 00:25:44 +08:00
maverickdgg 4de32341e1 Merge branch 'main' into SP3-20-UI-System 2023-02-04 00:24:59 +08:00
mushgunAX 49fadfed74 Dynamic BGM 2023-02-04 00:23:05 +08:00
Kah Wei 454de9f1ac Added SHEDITOR and _PUBLISH defines to SHADE_Managed 2023-02-04 00:22:17 +08:00
Kah Wei 4a101d97c9 CallbackEvents are now able to handle situations where a CallbackAction results in adding more CallbackActions 2023-02-04 00:19:57 +08:00
maverickdgg c88ce23d45 WIP collision 2023-02-04 00:17:29 +08:00
Kah Wei 3cd1778d08 Fixed SHUIComponent serialization 2023-02-04 00:04:25 +08:00
XiaoQiDigipen 36db5021ac
Merge pull request #338 from SHADE-DP/SP3-2-Physics
Fixed crash occurring with editing collision tag file
2023-02-03 23:54:43 +08:00
Diren D Bharwani b5b3761a6c Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-03 23:52:10 +08:00
Diren D Bharwani ff6ee80df2 Fixed bug where collision tag file could not be editir
Fuck file i/o
2023-02-03 23:51:31 +08:00
Xiao Qi 0281446538 Merge remote-tracking branch 'origin/main' into main 2023-02-03 23:50:40 +08:00
Xiao Qi 1bae1c97d6 Added demo animation objects 2023-02-03 23:50:35 +08:00
Kah Wei 7ded7a0706 Merge branch 'SP3-20-UI-System' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-20-UI-System
# Conflicts:
#	Assets/Editor/Layouts/UserLayout.ini
2023-02-03 23:33:40 +08:00
Kah Wei 940c55d665 Fixed Renderables not being removed from a batch if their modifiable material was retrieved 2023-02-03 23:33:23 +08:00
maverickdgg 21695fd4f3 Merge branch 'main' into SP3-20-UI-System 2023-02-03 23:28:17 +08:00
maverickdgg fdacaf5036 Added reminaing buttons for win and lose screens 2023-02-03 23:28:08 +08:00
XiaoQiDigipen 2be7469762
Merge pull request #337 from SHADE-DP/SP3-2-Physics
Unretarded the collision tags
2023-02-03 23:23:20 +08:00
Diren D Bharwani 7a79cda729 Reworked Collision Tag Interface and Logic 2023-02-03 23:22:21 +08:00
mushgunAX 136d86dce3 Fix Item Score SFX 2023-02-03 23:19:12 +08:00
mushgunAX d71790022f Merge branch 'main' into AudioImplementation 2023-02-03 23:16:47 +08:00
maverickdgg b15b5eadbc Merge branch 'main' into SP3-20-UI-System 2023-02-03 22:59:56 +08:00
maverickdgg ebf1ab39cf Added some buttons to lose screen 2023-02-03 22:59:49 +08:00
Diren D Bharwani c61be35da0 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-03 22:44:58 +08:00
maverickdgg 382a2d0f6a Added start game button. Texture changing for buttons now only change when necessary 2023-02-03 22:44:02 +08:00
XiaoQiDigipen 0e4400fc98
Merge pull request #336 from SHADE-DP/PlayerController
Scene changes and Bug fixes
2023-02-03 22:08:18 +08:00
Glence e00b891bf7 added lights to level 2 2023-02-03 22:03:55 +08:00
Glence 5284066cee Merge branch 'main' into PlayerController 2023-02-03 21:29:02 +08:00
Glence 2ee46f33df update collision tag to have a save button and clamp raycast draw 2023-02-03 21:28:50 +08:00
XiaoQiDigipen 0bf1fc9839
Merge pull request #335 from SHADE-DP/SP3-1-Rendering
Updated shadow implementation
2023-02-03 20:22:03 +08:00
XiaoQiDigipen b705db8a8c
Merge pull request #334 from SHADE-DP/SP3-129-AudioSystem
Added global parameter control and VCA volume control
2023-02-03 20:21:28 +08:00
Brandon Mak 6cde511b36 Shadows update
Made it less dark
2023-02-03 20:16:42 +08:00
maverickdgg a6290d9c8f Added texture, modifiable material fix 2023-02-03 20:12:48 +08:00
Xiao Qi 50c3855476 Merge remote-tracking branch 'origin/main' into main 2023-02-03 19:38:02 +08:00
Xiao Qi c9db8262b7 Added preprocessor checks for editor 2023-02-03 19:37:56 +08:00
mushgunAX a6bc9ed2b4 Updates on audio 2023-02-03 19:37:18 +08:00
Brandon Mak ca0b8aabb0 Merge branch 'main' into SP3-1-Rendering 2023-02-03 19:33:22 +08:00
Kah Wei 5bef209189 Modified ScriptAddAction to use serialization 2023-02-03 19:17:20 +08:00
SHAM-DP 98d4dd9483 Merge branch 'main' into SP3-129-AudioSystem 2023-02-03 19:16:25 +08:00
SHAM-DP 5b2f42a920 Added controls for global parameters
Added controls for VCA volume
2023-02-03 19:16:12 +08:00
maverickdgg e3d616b4e1 Merge branch 'main' into SP3-20-UI-System 2023-02-03 18:42:53 +08:00
Diren D Bharwani b02f4ac49b Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-03 18:40:51 +08:00
Diren D Bharwani 36de32447d Fixed some bugs with serialisation 2023-02-03 18:40:45 +08:00
XiaoQiDigipen ffb0a6e20c
Merge pull request #332 from SHADE-DP/SP3-6-c-scripting
Fixed bug where shmeta files in folders would still appear in SHADE_Scripting.csproj's solution explorer
2023-02-03 18:06:32 +08:00
Kah Wei 929bfa8a54 Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset 2023-02-03 17:05:56 +08:00
mushgunAX 60fa4335a0 Merge branch 'main' into AudioImplementation 2023-02-03 17:01:11 +08:00
Kah Wei 4cf17c16b5 Fixed bug where shmeta files in folders would still appear in SHADE_Scripting.csproj's solution explorer 2023-02-03 16:54:35 +08:00
Glence 6b5bd43110 Merge branch 'main' into PlayerController 2023-02-03 16:48:51 +08:00
XiaoQiDigipen 7818c6f2d2
Merge pull request #331 from SHADE-DP/SP3-2-Physics
Refactored Raycasting, Added Layers for Raycasting to C#, Fixed Collision Tag Panel
2023-02-03 16:26:06 +08:00
Diren D Bharwani c73275f2d3 Added temporary use of collision layers to C# and fixed raycast drawing 2023-02-03 16:11:30 +08:00
maverickdgg bb00889553 Merge branch 'main' into SP3-20-UI-System 2023-02-03 15:53:26 +08:00
Diren D Bharwani b81e71ed08 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-03 02:03:12 +08:00
Diren D Bharwani b6d91d5492 Fixed bug with collision tags not behaving as intended
Why the damn hell must react's system be so confusing??
2023-02-03 01:37:45 +08:00
mushgunAX d1a3214d41 Change banks 2023-02-03 00:40:22 +08:00
Glence 5bf3af2ed2 corrected transition to diff scenes 2023-02-03 00:03:05 +08:00
Glence 4af3440db7 added gameplay for level1 and multiplier combo is done 2023-02-02 22:44:48 +08:00
Diren D Bharwani 931f6fe5e2 Fixed almost everything. Ray debug drawing has a small bug 2023-02-02 20:56:55 +08:00
Diren D Bharwani d5c731dd20 Fixed collision shape debug drawing and more serialisation bugs 2023-02-02 20:48:32 +08:00
Diren D Bharwani 931ed58287 Added individual collider debug drawing 2023-02-02 20:19:21 +08:00
mushgunAX e28c6ce1a7 new banks 2023-02-02 20:16:12 +08:00
Diren D Bharwani 3593df3ada Fixed collider shape serialisation 2023-02-02 20:15:59 +08:00
Diren D Bharwani 71f4cdd29e Fixed rigidbody serialisation 2023-02-02 19:23:42 +08:00
Diren D Bharwani 6a57be2e60 Refactored old physics to match new interface
Compiles but still buggy, need a bit of time to clear up all the bugs
2023-02-02 19:06:56 +08:00
mushgunAX 1d0522e334 Audio Implementation for AI 2023-02-02 16:58:40 +08:00
XiaoQiDigipen e5479c31c5
Merge pull request #330 from SHADE-DP/PlayerController
Scripting changes for item and added level 1 scene
2023-02-02 11:20:20 +08:00
Glence 5b628baedf changes breakable to only minus count on items 2023-02-02 11:16:56 +08:00
Glence aaf4919c27 Merge branch 'main' into PlayerController 2023-02-02 11:05:06 +08:00
XiaoQiDigipen 7c53700692
Merge pull request #329 from SHADE-DP/SP3-6-c-scripting
Added UI Element and other QoL fixes for scripting
2023-02-02 10:57:20 +08:00
Glence ec11f8cb8f Merge branch 'main' into PlayerController 2023-02-02 10:45:21 +08:00
Kah Wei ee03722153 Merge branch 'main' into SP3-6-c-scripting 2023-02-01 23:49:44 +08:00
Kah Wei 3a4288d4bc Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset 2023-02-01 19:18:29 +08:00
maverickdgg d149aae6fb Merge branch 'main' into SP3-20-UI-System 2023-02-01 12:44:30 +08:00
maverickdgg 2dfaa75ab3 Add CreateComponentSparseSet and bug fix for togglebutton nt triggering 2023-02-01 12:42:51 +08:00
Kah Wei 0b0590180d Fixed incorrect functor called in SHScriptEngine::onUIElementClicked() 2023-02-01 11:57:11 +08:00
Kah Wei 39fbfbd6fa Added more reliable method of reloading static C# data 2023-02-01 00:34:09 +08:00
Kah Wei 72953762cb Attempt at resetting static data members 2023-01-31 23:48:44 +08:00
XiaoQiDigipen ab48efce30
Merge pull request #326 from SHADE-DP/SP3-1-Rendering
Fixed UI Rendering
2023-01-31 22:53:03 +08:00
Brandon Mak d9833ca8b0 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-01-31 19:07:28 +08:00
XiaoQiDigipen 71613143f6
Merge pull request #325 from SHADE-DP/SP3-4-Editor
Added Asset Browser Filters, double click asset id in inspector to highlight asset in asset browser
2023-01-31 19:05:21 +08:00
Brandon Mak 109f35f297 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-01-31 19:02:11 +08:00
Brandon Mak ea74f5ebf6 Fixed some errors in SHUISystem 2023-01-31 19:01:21 +08:00
SHAM-DP d6fc83d3b7 Merge branch 'main' into SP3-4-Editor 2023-01-31 18:56:09 +08:00
SHAM-DP 4c4d39d4bb Added double click asset id in inspector to scroll to asset in asset browser
Added asset browser filter by name and type
2023-01-31 18:55:50 +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
Glence 8d43fca1cc added models for level 1 and made gamemanager a singleton 2023-01-31 18:13:34 +08:00
Kah Wei 8f9a4e8c73 Fixed bug where onDestroy() is not called for scripts that are destroyed when leaving play mode in the editor 2023-01-31 18:09:07 +08:00
Xiao Qi 8c9673cafd Removed editor config from repo 2023-01-31 17:48:29 +08:00
Xiao Qi e0f363f1ec Changed line to only ignore editor config 2023-01-31 17:47:36 +08:00
Xiao Qi 164b4f7197 Changed gitignore line to ignore all items in Editor Folder 2023-01-31 17:38:48 +08:00
Kah Wei 53f599a238 Added RemoveScript(Script) for Scripts and GameObjects 2023-01-31 17:28:24 +08:00
Diren D Bharwani 3b6e0be364 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-01-31 17:14:52 +08:00
Brandon Mak e9452093f0 Fixed UI 2023-01-31 15:17:40 +08:00
Glence 0f8e1d6310 Merge branch 'main' into PlayerController 2023-01-31 13:47:55 +08:00
XiaoQiDigipen 24c15743a1
Merge pull request #324 from SHADE-DP/SP3-10-input-management
Set to force the use of dedicated GPU
2023-01-31 12:53:13 +08:00
mushgunAX 710bfe1dac Merge branch 'main' into SP3-10-input-management 2023-01-31 12:51:50 +08:00
mushgunAX 38f2ba69db Force use of Dedicated GPU 2023-01-31 12:43:02 +08:00
Kah Wei b46d2135bc Modified Renderable and TextRenderable to no longer use reference to Assets, and use the Asset directly instead 2023-01-31 10:53:58 +08:00
Glence d1d7d430b1 added breakable food into the scene
#issues to fix
egg collision too small so weight is really small
throwing heavy objects doesnt give enuff force compared to rolling and hitting it
2023-01-31 00:43:25 +08:00
Glence 3e015d924e Merge branch 'main' into PlayerController 2023-01-30 23:30:55 +08:00
Kah Wei a5b7672102 Merge branch 'main' into SP3-6-c-scripting 2023-01-30 20:53:42 +08:00
Kah Wei f93d5fcd63 Added scripting inteface for SHUIComponent 2023-01-30 20:52:39 +08:00
Xiao Qi c13f06e4a6 Added warning line to check for existing path 2023-01-30 19:55:42 +08:00
XiaoQiDigipen eedcd44b8e
Merge pull request #323 from SHADE-DP/delete-editorconfig
Delete Editor.SHConfig (Delete this branch)
2023-01-30 18:32:29 +08:00
XiaoQiDigipen f1bf9cb865
Merge pull request #322 from SHADE-DP/SP3-4-Editor
Added hierarchy panel filter
2023-01-30 18:29:47 +08:00
Xiao Qi f2b8e52608 Commented unused shader build lines 2023-01-30 18:28:49 +08:00
Sri Sham Haran 559cda92f1
Delete Editor.SHConfig 2023-01-30 18:27:29 +08:00
SHAM-DP f2a0b38406 Merge branch 'main' into SP3-4-Editor 2023-01-30 17:56:38 +08:00
SHAM-DP cf999b0d3b Added entity filter 2023-01-30 17:44:06 +08:00
XiaoQiDigipen 213ac9d275
Merge pull request #321 from SHADE-DP/SP3-17-animation-system
Animation WIP merge
2023-01-30 17:35:56 +08:00
XiaoQiDigipen 4c5becff46
Merge pull request #320 from SHADE-DP/AudioScripting
Added Scripting interface for AudioClips
2023-01-30 17:08:38 +08:00
Kah Wei c2aa067cc4 Fixed crash caused by loading incorrect renderpass for subpass replacement 2023-01-30 16:55:15 +08:00
SHAM-DP 59ef28baf1 Merge branch 'main' into AudioScripting 2023-01-30 16:47:46 +08:00
SHAM-DP 526c6dc883 Spatial scripting inteface changes (remove eid requirement) 2023-01-30 16:47:38 +08:00
SHAM-DP 74b8ee73c5 Spatial setup 2023-01-30 16:47:03 +08:00
Brandon Mak a3ca04535f More changes 2023-01-30 16:46:42 +08:00
Brandon Mak 89b101f3e5 passed string by value dum dum brandon 2023-01-30 16:46:14 +08:00
Brandon Mak c45c469c8e Change GetUsableSubpasses to GetUsableSubpass 2023-01-30 16:42:19 +08:00
Brandon Mak f8bde9fc35 Added map to retrieve usable subpasses 2023-01-30 16:35:12 +08:00
Kah Wei 8a4a469abf Added ability to change subpass for a material and fixed typo for vertex shader in the material editor 2023-01-30 15:52:42 +08:00
Brandon Mak a67e65ff76 Made array for usable subpasses 2023-01-30 15:34:22 +08:00
Brandon Mak 23734fa42c Merge branch 'main' into SP3-1-Rendering 2023-01-30 15:23:00 +08:00
Kah Wei 61fa2ae923 Merge branch 'main' into SP3-17-animation-system 2023-01-30 15:16:09 +08:00
Kah Wei 53ef202e46 Merge branch 'main' into SP3-17-animation-system
# Conflicts:
#	SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
#	SHADE_Engine/src/Serialization/SHYAMLConverters.h
2023-01-30 15:15:46 +08:00
XiaoQiDigipen 5240c837ec
Merge pull request #318 from SHADE-DP/SP3-10-input-management
Implemented Input Binding Panel via Editor
2023-01-30 15:00:58 +08:00
Kah Wei b3f79e31db Forgot to commit shader binary 2023-01-30 14:58:52 +08:00
Kah Wei 52c0cc2f84 Merge branch 'main' into SP3-17-animation-system
# Conflicts:
#	Assets/Shaders/TestCube_VS.shshaderb
#	SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
#	SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h
#	SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp
#	SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.h
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsConstants.h
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
#	SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.cpp
#	SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.h
#	SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.cpp
#	SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.h
#	SHADE_Engine/src/Serialization/SHYAMLConverters.h
2023-01-30 14:57:46 +08:00
XiaoQiDigipen 2fd8506fab
Merge pull request #319 from SHADE-DP/revert-316-SHPhysics
Revert "Implemented a custom physics engine"
2023-01-30 14:41:09 +08:00
XiaoQiDigipen 3ff2e6bb92
Revert "Implemented a custom physics engine" 2023-01-30 14:40:55 +08:00
Kah Wei 8c3703ce04 Fixed models using wrong animation bone matrices 2023-01-29 20:52:04 +08:00
Kah Wei 4a00312f57 Added serialization of AnimatorComponent 2023-01-29 20:35:18 +08:00
Kah Wei 2d1987e14b Added handling for rendering objects using an animated shader but without an animator component or an attached rig 2023-01-29 19:27:58 +08:00
Kah Wei 741489b0ae Merge branch 'SP3-17-animation-system' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-17-animation-system 2023-01-29 18:51:36 +08:00
Kah Wei 6af4933b52 Fixed on-close crashes coming from SHResourceManager 2023-01-29 18:51:31 +08:00
Xiao Qi 83a33b3851 Bone count data member in mesh asset 2023-01-29 18:38:12 +08:00
Kah Wei eab2f2d54a Fixed bug where replacing an animator's rig causes the GPU to be lost 2023-01-29 16:03:08 +08:00
Kah Wei 3f1a25c95b Fixed crash caused by loading more than one SHRig 2023-01-29 15:39:48 +08:00
Kah Wei 1472823dc0 Removed buggy animation debug draw 2023-01-29 14:45:46 +08:00
Brandon Mak d5897387c5 Merge branch 'main' into SP3-1-Rendering 2023-01-29 13:25:40 +08:00
mushgunAX ac10b95b01 Tooltips 2023-01-25 23:54:04 +08:00
mushgunAX bde191aeca Input Bindings Panel Done 2023-01-25 23:22:15 +08:00
Glence 7d9ab7a381 items changes
items now return back to their original position when owner collides with it
2023-01-25 18:20:26 +08:00
Kah Wei 80a7fe701b Added debug draw for animation system 2023-01-24 23:31:00 +08:00
mushgunAX e70354df74 Get input code name functions 2023-01-24 19:17:27 +08:00
mushgunAX 834d474f21 Merge branch 'main' into SP3-10-input-management 2023-01-23 18:04:07 +08:00
XiaoQiDigipen cec8d9e618
Merge pull request #316 from SHADE-DP/SHPhysics
Implemented a custom physics engine
2023-01-23 15:55:45 +08:00
Diren D Bharwani 4ed7aa3aed Reverted an attempt to stabilise edge detection between polyhedrons 2023-01-23 03:03:40 +08:00
Diren D Bharwani 5730381302 Physics objects can be implicity static if only a collider was added.
Removed the need to create an extra body. Math is great.
2023-01-23 00:56:46 +08:00
Diren D Bharwani a0f6cd3ae7 Cached SAT for improved stability
The effects of baumgarte stabilisation can be rather obvious especially when polyhedrons are thrown around at angles. Regardless, the system is relatively stable bar the added energy from the solving method, which may make for a more "bombastic" physics playground
2023-01-23 00:37:22 +08:00
Kah Wei 354d9434f6 SHAnimatorComponent and SHRig now use the proper transform and offset matrices 2023-01-22 21:43:37 +08:00
Diren D Bharwani 0c3106f15b Abstracted contact derivation as setup for cached SAT 2023-01-22 19:20:03 +08:00
mushgunAX dddb556553 Progress 2023-01-22 17:59:36 +08:00
Diren D Bharwani 826a1bc617 Merge remote-tracking branch 'origin/main' into SHPhysics 2023-01-22 17:39:06 +08:00
Diren D Bharwani 1dc16fdcda Fixed typos 2023-01-22 17:38:51 +08:00
Xiao Qi 80fb8f7c73 Saved and loaded bone offsets 2023-01-22 17:00:55 +08:00
Glence 7f787f2593 Merge branch 'main' into PlayerController 2023-01-20 15:19:49 +08:00
mushgunAX 79a40cb58b Merge branch 'main' into SP3-10-input-management 2023-01-20 14:02:06 +08:00
mushgunAX 71572381f7 Progress on input bindings in editor 2023-01-20 14:00:24 +08:00
Kah Wei 62f104a535 Added Global Inverse Matrix for SHRig 2023-01-18 20:11:48 +08:00
Kah Wei a543f6cc3a Removed unecessary check in SHAnimatorComponent 2023-01-18 19:52:26 +08:00
Kah Wei 3e23f08aa8 Fixed bug where keyframes of animation clips are not interpolated 2023-01-18 19:25:27 +08:00
Kah Wei b9fcdc43d4 Modified how SHAnimatorComponent computes the bone matrices 2023-01-18 19:16:45 +08:00
Kah Wei 35b7ac0178 Fixed SHAnimationClip::GetTotalTime() 2023-01-18 19:16:20 +08:00
Kah Wei e013112b2c Fixed validation errors when rendering a non-animated model 2023-01-18 16:03:25 +08:00
Kah Wei 6c6e3bfe28 Merge branch 'SP3-17-animation-system' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-17-animation-system 2023-01-18 15:12:03 +08:00
XiaoQiDigipen 4854e35e75
Merge pull request #315 from SHADE-DP/SP3-4-Editor
Added open by default for component inspector toggle headers, Added drag/drop receiving for all uint32_t fields
2023-01-18 04:05:49 +08:00
Xiao Qi 1b97cd72bd TEMP fix to get anim timing correct 2023-01-18 04:05:36 +08:00
Xiao Qi 6872bae151 Updated compiled shmodel file for racoon with fixed rig node order and build format
Fixed bug when building histogram for vertex weights
2023-01-18 04:00:48 +08:00
Kah Wei b36145fa39 Added isAnimated check with base 0-index identity matrix for bones 2023-01-17 22:55:33 +08:00
Kah Wei 20ffd67fcc Fixed move constructor and assignment for SHBatch and added a check for if a batch is animated 2023-01-17 21:54:53 +08:00
SHAM-DP c3a140b9aa Merge branch 'main' into SP3-4-Editor
reordered draw order for some windows
2023-01-17 21:08:37 +08:00
SHAM-DP 3cb1e5c7fc Merge branch 'main' into SP3-4-Editor 2023-01-17 21:02:01 +08:00
SHAM-DP 6b19a635e3 All component view toggle headers open by default
uint32_t fields now accept EID & Resource drag/drop
2023-01-17 20:52:22 +08:00
Xiao Qi 2d898851c5 Fixed rig asset node delete 2023-01-17 16:07:19 +08:00
Xiao Qi 1b4397c76d Updated all compiled models
Fixed UV mappings
2023-01-17 14:38:50 +08:00
Glence 19c11447c0 added base to return item back to original pos 2023-01-16 21:31:38 +08:00
Glence affa6f0dd8 added implantation for audio scripting 2023-01-16 21:05:21 +08:00
Diren D Bharwani 36e01260ec Merge changes from main missing from previous commit 2023-01-16 16:23:48 +08:00
Diren D Bharwani dc55c31c36 Merge remote-tracking branch 'origin/main' into SHPhysics 2023-01-16 16:23:20 +08:00
Diren D Bharwani 8475bdccd7 Merge remote-tracking branch 'origin/main' into SHPhysics 2023-01-16 16:22:59 +08:00
XiaoQiDigipen b6724eed77
Merge pull request #314 from SHADE-DP/SP3-1-Rendering
Implemented Shadow maps (still needs improvement)
2023-01-16 15:40:30 +08:00
XiaoQiDigipen 51b5fc03c7
Merge pull request #313 from SHADE-DP/SP3-20-UI-System
Added asset browser tool tip that shows asset id
2023-01-16 15:39:50 +08:00
Brandon Mak 09911cc50c Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-01-16 15:33:37 +08:00
Brandon Mak e115d4b965 Reverted light properties back to main 2023-01-16 15:33:20 +08:00
maverickdgg cb93fab363 Merge branch 'main' into SP3-20-UI-System 2023-01-16 15:17:43 +08:00
maverickdgg fe39be0d61 Added asset browser tool tip that shows asset id 2023-01-16 15:17:06 +08:00
Brandon Mak 1526176c58 Shadows WIP 2023-01-16 15:06:46 +08:00
XiaoQiDigipen dfb8500c9b
Merge pull request #311 from SHADE-DP/SP3-20-UI-System
Added Changing of textures for buttons. Change button events to be on release
2023-01-16 15:01:51 +08:00
Diren D Bharwani c077575a73 Fixed convex-convex face detection
Minor bugs with contact point detection. Will test more before pushing into main
2023-01-16 15:01:14 +08:00
XiaoQiDigipen 5994c83263
Merge pull request #310 from SHADE-DP/SP3-1-DebugDraw
Fix #307 and SHDebugDraw::WireCapsule is now made static
2023-01-16 14:57:06 +08:00
maverickdgg cdb5102630 Added a 0 check for button textures. 2023-01-16 14:51:06 +08:00
maverickdgg 1e351366af fix clicked texture to take priority over hovered texture 2023-01-16 14:44:20 +08:00
Kah Wei b5c9392baf Merge branch 'main' into SP3-1-DebugDraw 2023-01-16 14:39:53 +08:00
Kah Wei b603044579 Fixed validation errors caused by debug draw and fixed SHDebugDraw::WireCapsule not being static 2023-01-16 14:39:35 +08:00
maverickdgg 077f6f0fc9 Merge branch 'main' into SP3-20-UI-System 2023-01-16 14:36:29 +08:00
maverickdgg a41354f2ce Added changing texture of buttons 2023-01-16 14:35:16 +08:00
XiaoQiDigipen 18610b724b
Merge pull request #308 from SHADE-DP/SP3-20-UI-System
Fixed Buttons, Added Button events, Added Toggle Buttons, Added Sliders(WIP no graphics), Rework backend
2023-01-16 14:11:51 +08:00
SHAM-DP 34f22808ee transition scenescave prompt 2023-01-16 14:07:44 +08:00
maverickdgg 02ba0c6dc9 merge 2023-01-16 11:44:34 +08:00
maverickdgg 132e66c6c0 Merge branch 'UI-Test' into SP3-20-UI-System 2023-01-16 11:43:00 +08:00
maverickdgg 0c7224b8be Merge branch 'main' into UI-Test 2023-01-16 11:37:38 +08:00
maverickdgg 5190c490c9 added events 2023-01-16 11:36:12 +08:00
mushgunAX c5998c3b53 Laying out foundations for input editor UI 2023-01-16 10:32:18 +08:00
maverickdgg 5aa7bfe03e button fixed 2023-01-16 07:34:44 +08:00
Diren D Bharwani 85f0902c2d Removed unused collision table and fixed bug with kinematic bodies exploding 2023-01-16 03:48:08 +08:00
Diren D Bharwani 19bffc9124 First half of re-implementing face-face contact derivation 2023-01-16 02:44:27 +08:00
Diren D Bharwani dab109bc77 Fixed a fatal error with rigid body rotations. 2023-01-16 02:43:31 +08:00
Glence 1c47f17d92 Merge branch 'SP3-129-AudioSystem' into AudioScripting 2023-01-13 17:46:23 +08:00
Glence de6f4dd138 Added functions to attach and detach audio clips to objects 2023-01-13 17:46:01 +08:00
Diren D Bharwani 6c76849cd8 Merge remote-tracking branch 'origin/SHPhysics' into SHPhysics 2023-01-13 15:26:28 +08:00
Diren D Bharwani ef5016351b Reverted changes to inertia tensors
Created a new branch since I reverted to an older commit but kept some new updates. This will be the main branch moving forward.
2023-01-13 15:26:21 +08:00
Diren D Bharwani 13d5625055 Reverted changes to inertia tensors
Created a new branch since I reverted to an older commit but kept some new updates
2023-01-13 15:25:57 +08:00
Brandon Mak f217562fef Shadows are sort of working 2023-01-11 20:04:53 +08:00
Brandon Mak 4cd9a6cea0 shadows WIP 2023-01-11 10:35:29 +08:00
Brandon Mak 4a06032bea Shadows WIP 2023-01-11 08:25:38 +08:00
Brandon Mak 9538636af6 Shadows WIP 2023-01-10 01:47:10 +08:00
XiaoQiDigipen 8e58d47115
Merge pull request #306 from SHADE-DP/SP3-10-input-management
Changed default pathing for binding file serialisation
2023-01-09 17:44:14 +08:00
maverickdgg 8b2297f451 CreateSparseSet 2023-01-09 17:40:21 +08:00
Brandon Mak 918018b6fe Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering 2023-01-09 17:34:17 +08:00
mushgunAX 356ec24cc2 Change default pathing for binding file I/O 2023-01-09 17:21:24 +08:00
maverickdgg 402bd16522 fix for editor window size 2023-01-09 17:18:22 +08:00
XiaoQiDigipen be337a2687
Merge pull request #305 from SHADE-DP/SP3-5-ECS
Added GetComponents to Component Manager
2023-01-09 16:59:45 +08:00
XiaoQiDigipen 82f65a112c
Merge pull request #304 from SHADE-DP/SP3-10-input-management
Implemented Input Binding Serialisation
2023-01-09 16:56:59 +08:00
Brandon Mak cb9223db0b Enabled partially bound bit for descriptor sets with variable size
- Shadow maps can be sampled from compute shaders
2023-01-09 11:06:10 +08:00
maverickdgg 28829213c9 merge 2023-01-09 10:53:56 +08:00
maverickdgg 3638feba05 Merge branch 'main' into SP3-20-UI-System 2023-01-09 10:50:36 +08:00
maverickdgg 4f63558f40 Added GetComponents to Component Manager 2023-01-09 10:44:36 +08:00
maverickdgg 88491ffbd8 ToggleButton fix 2023-01-09 09:56:46 +08:00
Brandon Mak 4928ed4bcf Will update commit message tomorrow. Fuck Vulkan. *KW in BG: DiReCtX*
- Changed RenderGraphNodeNames to RenderGraphEntityNames
- Managed to get shadow maps into desc sets
2023-01-09 09:44:40 +08:00
maverickdgg e89b6f5c4c Fixing button 2023-01-09 09:38:53 +08:00
maverickdgg 5f11a931c7 Added Toggle Button, Fixed canvas Scalar 2023-01-09 09:24:20 +08:00
maverickdgg b293b28a56 Button fix 2023-01-09 07:14:40 +08:00
mushgunAX 7dbd0b93b3 Minor comment fix 2023-01-08 21:39:48 +08:00
mushgunAX 4123e76a7d Checking Input Binding I/O 2023-01-08 21:36:19 +08:00
mushgunAX 92a7555370 Merge branch 'main' into SP3-10-input-management 2023-01-08 21:05:18 +08:00
mushgunAX baaeb9ee10 Input Binding File I/O 2023-01-08 21:05:09 +08:00
XiaoQiDigipen f120f365eb
Merge pull request #302 from SHADE-DP/SP3-1-DebugDraw
Added support for debug drawing wireframe capsules
2023-01-08 12:20:11 +08:00
Kah Wei 686e141efa Fixed comment for SHPrimitiveGenerator::LineCapsuleCap 2023-01-08 01:46:52 +08:00
Kah Wei f44e7b7a1c Debug draw capsule now works with different orientations 2023-01-08 01:43:40 +08:00
Kah Wei 5c5ff38b49 Merge branch 'main' into SP3-1-DebugDraw 2023-01-08 01:07:15 +08:00
Kah Wei 98bfbc1048 Added DrawWireCapsule for debug draw (doesn't support orientation changes yet) 2023-01-08 01:06:50 +08:00
Brandon Mak 1a0edf30d7 Will update commit message tomorrow. Fuck Vulkan. *KW in BG: DiReCtX* 2023-01-07 22:40:29 +08:00
Brandon Mak 77a5829fc9 Shadows WIP 2023-01-07 17:45:49 +08:00
SHAM-DP f726592557 Popup window base & popup management
Added Scene save prompt popup (WIP)
2023-01-07 17:34:07 +08:00
XiaoQiDigipen 83eb3fffcd
Merge pull request #301 from SHADE-DP/SP3-16-Math
Added rotate method with quaternions for Vector3
2023-01-07 16:18:36 +08:00
Diren D Bharwani 222bda9a13 Replaced Transform's Forward.get with new rotate method 2023-01-07 16:16:35 +08:00
Diren D Bharwani c3582cf5ee Added a rotate method with quaternions for Vector3 2023-01-07 16:14:55 +08:00
Diren D Bharwani 8914dea574 Merge remote-tracking branch 'origin/main' into SP3-16-Math 2023-01-07 16:01:03 +08:00
Brandon Mak 8bb406e17f Shadows WIP
- new subpass generated for shadow maps now use light's renderer
- Added support to pass in custom binding and location for vertex attributes
- SHLightingSubSystem GetViewMatrix uses SHMatrix::LookAtLH but with hard-coded values for now. This will eventually be replaced with real position and target values
- Created new shadow map rendering vertex input state.
2023-01-07 15:27:08 +08:00
SHAM-DP 1188c61c7d Filter WIP (Need to optimize the search first) 2023-01-07 15:25:50 +08:00
Brandon Mak 3e01c9e80a shadows WIP 2023-01-07 12:01:09 +08:00
Brandon Mak d3cd36984d Shadow map WIP 2023-01-07 07:42:42 +08:00
Brandon Mak 19f9b67550 Shadow map WIP
- Added companion subpass object to subpass
- Lighting sub system updates a light's renderer when it is a valid handle
- Light component's renderer will be created in the graphics system event when a light's shadow is enabled
2023-01-06 10:40:19 +08:00
Diren D Bharwani 8ca4045d55 R for retard 2023-01-05 17:53:48 +08:00
Diren D Bharwani 6ca2ea4fa8 Merge remote-tracking branch 'origin/PhySH' into PhySH 2023-01-05 14:41:07 +08:00
Diren D Bharwani 0c92e7ff6c Added more comments and clarity for polyhedron edge contacts 2023-01-05 14:40:59 +08:00
Diren D Bharwani 016f6c804d Added more comments and clarity for 2023-01-05 14:40:06 +08:00
Diren D Bharwani 68e11ba48e Added edge vs edge contacts for convex polyhedron collisions 2023-01-05 13:42:17 +08:00
Diren D Bharwani c484a088fd Added first half of Gauss Map Optimised SAT 2023-01-05 01:12:25 +08:00
Diren D Bharwani dffdec9d9c Cleaned up colliders 2023-01-04 19:45:41 +08:00
Diren D Bharwani dd2fc934a2 Removed Redundant Geometry 2023-01-04 17:48:08 +08:00
Diren D Bharwani a49c674c2b Generalised the Parallel Axis Theorem for computing inertia tensors 2023-01-04 15:03:58 +08:00
Diren D Bharwani d7fa40776a Merge remote-tracking branch 'origin/main' into PhySH 2023-01-04 14:35:37 +08:00
Brandon Mak db87bea002 Added pre compute functions for render graph node compute 2023-01-04 09:58:29 +08:00
Brandon Mak 87b2103f6e Shadows WIP 2023-01-03 22:05:36 +08:00
Diren D Bharwani f7e867098d Small changes to rigidbody tooltips 2023-01-03 20:30:20 +08:00
Diren D Bharwani b2645fb584 Added support for composite colliders 2023-01-03 18:53:21 +08:00
Diren D Bharwani 0460d776b0 Fixed collision tag panel fallacies and saving of tag masks 2023-01-03 10:40:02 +08:00
Diren D Bharwani 1b5024793c Added debug drawing for rays 2023-01-03 10:14:39 +08:00
Brandon Mak b771cdbfc6 Added barrier for shadow maps 2023-01-03 07:41:37 +08:00
Diren D Bharwani 1f2a9820d1 Readded collision tags and moved collision filtering to an earlier stage 2023-01-02 22:49:12 +08:00
Diren D Bharwani 58a44997b2 Reworked raycasting on engine side. Re-added raycasting to scripting 2023-01-02 22:31:48 +08:00
Brandon Mak ef8867a7a5 Shadows WIP 2023-01-02 22:16:35 +08:00
Brandon Mak 7f8dc2b647 Added constants for render graph node names
- Fleshed out event function to add resource and subpass to shadow map render graph node when shadow is turned on
- Added support for linking resources and subpasses to render graph at runtime
2023-01-02 18:24:29 +08:00
Diren D Bharwani ddfbc71400 Added implementation for raycasting into the collision space 2023-01-01 19:39:16 +08:00
Diren D Bharwani 7a92c2c86f Reverted a change 2023-01-01 17:23:06 +08:00
Diren D Bharwani 50de3a8ef0 Added some todo comments 2023-01-01 17:15:49 +08:00
Diren D Bharwani 6f55f202b9 Added planes 2023-01-01 16:53:13 +08:00
Diren D Bharwani 37db6a2bf1 Merge remote-tracking branch 'origin/main' into PhySH 2023-01-01 14:11:47 +08:00
Brandon Mak 03becd8e47 Removing resources now remove subpasses and computes involved
- Added an empty node in the render graph for shadow mapping
2023-01-01 13:59:10 +08:00
Diren D Bharwani 38764e79b3 Added trigger check for sphere vs convex polyhedron 2023-01-01 03:32:59 +08:00
Diren D Bharwani f3c0bdbcfd Clean up 2023-01-01 03:24:34 +08:00
Diren D Bharwani 67907b1ca9 Replaced twin-edge dependency on sphere vs convex polyhedron 2023-01-01 02:48:02 +08:00
Diren D Bharwani 00f8726e46 Solved edge case for sphere vs convex polyhedron 2023-01-01 02:42:44 +08:00
Diren D Bharwani 3a7336fe15 Improved stability of sphere vs convex polyhedron except for one edge case 2022-12-31 18:43:46 +08:00
Diren D Bharwani 136b7e7bfc Renamed HalfEdgeDS to HalfEdgeStructure for clarity
do not abbreviate. abbreviation are usually bad!!
2022-12-31 01:47:42 +08:00
Diren D Bharwani 6451ca5e95 forgot to flip a normal 2022-12-31 01:40:28 +08:00
Diren D Bharwani 987a1fa515 Fixed false positives with convex polyhedron radii 2022-12-31 01:18:35 +08:00
Diren D Bharwani 896b47c1a0 Fixed and optimised sphere vs convex polyhedron
Improved sphere vs convex polyhedron from O(n^2) to O(n). Math is amazing.
2022-12-31 01:11:25 +08:00
Diren D Bharwani 82d46fce99 Fixed voronoi region tests for sphere vs convex polyhedron 2022-12-30 23:53:45 +08:00
Diren D Bharwani 3586c7ffdc Added mostly working sphere vs convex polyhedron collision detection 2022-12-30 21:43:22 +08:00
Diren D Bharwani d98d6a9e06 Refactored polyhedron and half-edge structures 2022-12-30 21:43:06 +08:00
Diren D Bharwani a36d03b03b Contacts now draw normals 2022-12-30 21:42:44 +08:00
Diren D Bharwani 50e3ddf0dd Fixed box inertia tensor calculation 2022-12-30 17:59:59 +08:00
Diren D Bharwani 7b1b4873ec dumb dumb energy 2022-12-30 01:27:31 +08:00
Diren D Bharwani 6bab419428 Fixed collision tag bugs 2022-12-30 01:23:14 +08:00
Diren D Bharwani 196945ae84 Merge remote-tracking branch 'origin/main' into PhySH 2022-12-30 01:23:02 +08:00
Diren D Bharwani fba338eaef Fixed half edge builder and built box polyhedron 2022-12-30 01:14:40 +08:00
Diren D Bharwani 400cbb35d9 Partial implementation of a generic convex polyhedron object 2022-12-30 00:45:37 +08:00
Diren D Bharwani ea1dd57996 Added stub functions for collision detection algorithms 2022-12-30 00:45:01 +08:00
Diren D Bharwani 8ead885d0d Renamed CollisionShapeFactory to CollisionShapeLibrary 2022-12-30 00:44:08 +08:00
Diren D Bharwani b14ddac1e6 Added missing serialisation for box colliders 2022-12-30 00:42:10 +08:00
SHAM-DP f49ecdbb14 Remove a few redundancies.
Audio System now creates handles to audio clips
2022-12-27 16:23:53 +08:00
Diren D Bharwani 0df6e09ed6 Added box collision shapes 2022-12-24 13:32:50 +08:00
Diren D Bharwani 89f1f60064 Added physics settings menu for easily toggling debug draw states 2022-12-24 02:19:53 +08:00
Diren D Bharwani 22c0a14081 Renamed SHBox to SHAABB for clarity
The future SHBox will represent an OBB
2022-12-23 00:55:36 +08:00
Diren D Bharwani b667e4df87 Implemented axis locking constraints 2022-12-22 03:11:14 +08:00
Diren D Bharwani f4f6cb7eae Fixed sequential impulses 2022-12-22 01:10:25 +08:00
Diren D Bharwani 92ed8a29ff Fixed bug with non-dynamic masses being overriden 2022-12-21 19:04:10 +08:00
Diren D Bharwani d109d06764 Implemented sequential impulses using baumgarte stabilisation
There is a bug with masses of static bodies not being properly set
2022-12-21 18:57:10 +08:00
Diren D Bharwani 33ef5e0d3d Implemented accumulated impulses
untested
2022-12-21 01:10:28 +08:00
Diren D Bharwani 265a5bece8 Slight refactor to fix collision states for very fast moving objects 2022-12-21 00:40:01 +08:00
Diren D Bharwani b58b475c04 Separated collision detection and added contact manager 2022-12-20 23:10:23 +08:00
Diren D Bharwani 5def5392a1 Cleaned up CollisionKey object 2022-12-20 02:26:31 +08:00
Diren D Bharwani 751a16dcc3 Tested collision detection with collision states 2022-12-20 02:13:06 +08:00
Diren D Bharwani cf9d4ef04b Implemented backbone for collision detection with broadphase 2022-12-19 16:56:34 +08:00
Diren D Bharwani d55a965e32 Merge remote-tracking branch 'origin/PhySH' into PhySH 2022-12-16 18:34:58 +08:00
Diren D Bharwani 24b13ed6e4 Refactored colliders to use parent-child transform logic 2022-12-16 18:34:53 +08:00
Diren D Bharwani 6a20e93704 Refactored colliders to use a parent-child transform logic 2022-12-16 18:34:29 +08:00
Diren D Bharwani a6e1064e64 Fixed bug where collider offsets were not recomputed 2022-12-16 15:03:55 +08:00
Diren D Bharwani 2bd90e7c14 Adjusted physics debug draw to fit new debug draw interface 2022-12-16 14:38:46 +08:00
Diren D Bharwani 1b91f60c4a Fixed warning with wrongly declared friends 2022-12-16 14:38:22 +08:00
Diren D Bharwani ddf2d8bde9 Fixed warnings for subscript operator in vectors and removed react conversions 2022-12-16 14:38:01 +08:00
Diren D Bharwani af39662748 Merge remote-tracking branch 'origin/main' into PhySH 2022-12-16 14:04:58 +08:00
Diren D Bharwani 6b8232ae91 Fixed bug where intertia tensors were not reset when unlocking axes 2022-12-16 02:02:20 +08:00
Diren D Bharwani 27760a95c9 Tested physics interactions with scripts 2022-12-15 23:00:15 +08:00
Diren D Bharwani 27c7a17397 Fixed computation of global inverse inertia tensor 2022-12-15 22:59:55 +08:00
Diren D Bharwani 53edffebac Added (untested) rotational motion to rigidbodies
Also added a temporary solution for debug drawing rotated spheres
2022-12-15 02:08:25 +08:00
Diren D Bharwani af3a5e7dc9 Re-implemented Collider Debug Drawing 2022-12-13 03:54:37 +08:00
Diren D Bharwani 0cebedeee0 Fixed compile errors with merged scene init and exit events 2022-12-11 20:44:40 +08:00
Diren D Bharwani 60409b47cb Merge remote-tracking branch 'origin/main' into PhySH 2022-12-11 20:44:25 +08:00
Diren D Bharwani bf8a410fa2 Fixed bug where colliders were not properly deserialised 2022-12-11 20:33:30 +08:00
Diren D Bharwani c1d7702914 Moved debug draw state to colliders. Synced collider positions with rigid bodies 2022-12-11 20:12:26 +08:00
Diren D Bharwani 74e50e10bd Refactored the colliders?
This took me 4 days omg
2022-12-09 01:15:43 +08:00
Diren D Bharwani 38b1c46d1f Added physics world and tested applied gravity for linear movement 2022-12-05 00:20:29 +08:00
Diren D Bharwani 36ceec5855 Added SceneInit & SceneExit events 2022-12-05 00:19:48 +08:00
Diren D Bharwani ca45a12186 Restructured Physics Systems & Interfaces 2022-12-04 17:31:22 +08:00
Diren D Bharwani 6cd203179a Added Rigid Body 2022-12-02 19:01:08 +08:00
Diren D Bharwani 52dc993941 goodbye react 2022-12-02 17:44:44 +08:00
1065 changed files with 97133 additions and 35454 deletions

3
.gitignore vendored
View File

@ -363,8 +363,7 @@ MigrationBackup/
*.filters
Assets/Editor/Layouts/UserLayout.ini
JSON/Schemas/Catalog/
Assets/Editor/Editor.SHConfig
Assets/Editor/Layouts/UserLayout.ini

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

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

96
Assets/Bindings.SHConfig Normal file
View File

@ -0,0 +1,96 @@
7
Controller Look Horizontal
0
0
5
0.2
5
0
0
0
1
18
0
Controller Look Vertical
0
0
5
0.2
5
0
0
0
1
19
0
Horizontal
0
0
5
0.2
5
1
2
39
68
2
37
65
2
3
16
1
2
Jump
0
0
1000
0.2
1000
0
1
32
0
1
10
0
Mouse Look Horizontal
1
0
1
0.2
1
0
0
0
0
0
Mouse Look Vertical
2
0
1
0.2
1
0
0
0
0
0
Vertical
0
0
5
0.2
5
1
2
38
87
2
40
83
2
0
17
1
1

View File

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

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Dangrek-Regular
ID: 174412429
Type: 10

Binary file not shown.

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: 58303057
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: AnimatedBag
ID: 117923942
Type: 7

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 Translucent
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 65439157
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_01a
ID: 120028153
Type: 7

View File

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

View File

@ -0,0 +1,3 @@
Name: CutScene_01b
ID: 130271494
Type: 7

View File

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

View File

@ -0,0 +1,3 @@
Name: CutScene_01c
ID: 118957569
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: 56583306
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_02a
ID: 120947645
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: 65259204
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_02b
ID: 129923341
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: 66222856
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_02c
ID: 133191310
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: 58931679
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_03a
ID: 129620984
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: 56330596
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_03b
ID: 119078830
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: 66929828
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_03c
ID: 133041695
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: 66009942
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_03d
ID: 117751129
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: 61803402
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: CutScene_03e
ID: 131504451
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

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

View File

@ -0,0 +1,3 @@
Name: CutScene_bg
ID: 117531460
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: 50821588
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: MT_HousePaletteLevel3
ID: 126223465
Type: 7

View File

@ -0,0 +1,8 @@
- VertexShader: 37048829
FragmentShader: 45685219
SubPass: G-Buffer Write With VFX
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 57342922
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: ShinyHightlight
ID: 122370915
Type: 7

View File

@ -0,0 +1,8 @@
- VertexShader: 38847805
FragmentShader: 42962441
SubPass: Object VFX Subpass No Depth
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 0
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: Silhouette
ID: 126391182
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: 51158984
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: GameIcon
ID: 126117259
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: 52834559
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: Instruction_01
ID: 124926341
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: 60762613
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: Instruction_02
ID: 128721520
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: 53309226
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: Instruction_03
ID: 124482180
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: 63002526
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: Instruction_04
ID: 129768803
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: 63456868
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: Steal_Food
ID: 127459277
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: 51995224
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

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

View File

@ -0,0 +1,3 @@
Name: UIMat_Black
ID: 120016136
Type: 7

View File

@ -1,8 +1,8 @@
- VertexShader: 46580970
FragmentShader: 35983630
SubPass: G-Buffer Write
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 54324293
data.alpha: 0
data.alpha: 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: 56004904
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,12 @@
- VertexShader: 46580970
FragmentShader: 48832081
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 64651793
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}
data.sliderThreshold: 1
data.sliderStartColor: {x: 0, y: 1, z: 0, w: 1}
data.sliderEndColor: {x: 1, y: 0, z: 0, w: 1}
data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}

View File

@ -0,0 +1,3 @@
Name: UIMat_Slider
ID: 128676209
Type: 7

View File

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

View File

@ -1,8 +0,0 @@
- VertexShader: 46580970
FragmentShader: 35983630
SubPass: G-Buffer Write
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 54429632
data.alpha: 0
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: 55278388
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: UIMat_Credits
ID: 120332672
Type: 7

View File

@ -1,8 +0,0 @@
- VertexShader: 46580970
FragmentShader: 35983630
SubPass: G-Buffer Write
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 54429632
data.alpha: 0
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: 52018575
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -0,0 +1,3 @@
Name: UIMat_Multiplier
ID: 133784677
Type: 7

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