Commit Graph

1507 Commits

Author SHA1 Message Date
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
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
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
Diren D Bharwani c0249531d3 Potential fix to physics collision states being incorrect 2023-02-04 15:18:15 +08:00
Diren D Bharwani 385b34fea4 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-04 14:20:25 +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 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 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
maverickdgg 94fe055aa9 fixed collision 2023-02-04 02:10:08 +08:00
Diren D Bharwani 638286b357 Fixed missing trigger state 2023-02-04 01:57:27 +08:00
maverickdgg e5d372c94e Merge branch 'main' into SP3-141-Camera-System 2023-02-04 01:20:22 +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
maverickdgg 4de32341e1 Merge branch 'main' into SP3-20-UI-System 2023-02-04 00:24:59 +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
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
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
Diren D Bharwani 7a79cda729 Reworked Collision Tag Interface and Logic 2023-02-03 23:22:21 +08:00
maverickdgg b15b5eadbc Merge branch 'main' into SP3-20-UI-System 2023-02-03 22:59:56 +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
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
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
Kah Wei 929bfa8a54 Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset 2023-02-03 17:05:56 +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
Diren D Bharwani c73275f2d3 Added temporary use of collision layers to C# and fixed raycast drawing 2023-02-03 16:11:30 +08:00