Commit Graph

42 Commits

Author SHA1 Message Date
Glence 79cb0f12ae WIP for Alpha, added material name in editor WIP for cutscene 2023-02-27 18:09:05 +08:00
maverickdgg 08e4db134a Tweaked main menu UI 2023-02-27 15:16:48 +08:00
maverickdgg febe22e487 Added new button events 2023-02-21 09:52:23 +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
maverickdgg 94fe055aa9 fixed collision 2023-02-04 02:10:08 +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 c88ce23d45 WIP collision 2023-02-04 00:17:29 +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 ebf1ab39cf Added some buttons to lose screen 2023-02-03 22:59:49 +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
maverickdgg a6290d9c8f Added texture, modifiable material fix 2023-02-03 20:12:48 +08:00
Diren D Bharwani 36de32447d Fixed some bugs with serialisation 2023-02-03 18:40:45 +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
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 71f4cdd29e Fixed rigidbody serialisation 2023-02-02 19:23:42 +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
mushgunAX 38f2ba69db Force use of Dedicated GPU 2023-01-31 12:43:02 +08:00
Diren D Bharwani 36e01260ec Merge changes from main missing from previous commit 2023-01-16 16:23:48 +08:00
maverickdgg 5aa7bfe03e button fixed 2023-01-16 07:34:44 +08:00
Sri Sham Haran e609b5634a Material Inspector
Can set material
2022-11-02 21:31:27 +08:00
Sri Sham Haran 7c0bcd8a3e
Delete UserLayout.ini
@Xenosas1337 stop pushing this please
2022-10-26 16:09:54 +08:00
Brandon Mak 43ea33cabf Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-26 15:26:41 +08:00
Brandon Mak 5016600397 Lights WIP 2022-10-25 23:39:35 +08:00
Sri Sham Haran 534aeba06b Latest Default Layout 2022-10-25 20:59:32 +08:00
Brandon Mak 8fb0eddcc1 Lights WIP 2022-10-25 00:00:22 +08:00
Sri Sham Haran 26eb4ad18c Fix command registrations and mouse pick polling when using transform gizmo 2022-10-24 16:18:18 +08:00
Brandon Mak 982f2de286 Merge remote-tracking branch 'origin/main' into Rendering-Camera-Integration 2022-10-23 16:36:22 +08:00
Brandon Mak d4fe63722a WIP (TODO: remember to change commit message) 2022-10-23 15:05:31 +08:00
Sri Sham Haran 99a69b0020 tweaks + add new ui font 2022-10-21 20:45:03 +08:00
Brandon Mak c252e4ce4b Some restructuring with render graph storage.
Lesser parameters passed around.
2022-10-21 07:01:51 +08:00
Sri Sham Haran 6051b7ded5 Tfm gizmo wip 2022-10-19 20:42:38 +08:00
Brandon Mak 603470eeb6 Fixed some camera resizing issues 2022-10-19 17:06:37 +08:00
Brandon Mak d9136de134 Integrated Daniel's camera
Still need to integrate camera directors
2022-10-19 16:53:45 +08:00
Brandon Mak 284ee12205 Broken Camera 2022-10-19 15:32:07 +08:00
Brandon Mak 9ce5a4a47b Mouse picking system now uses cursor returned from editor
- This new cursor position is relative to where the viewport is rendering
- Window resize callback in Graphics system now checks if editor is enabled before signaling for resize. This is because editor will handle the signaling for resizing when its enabled. When its disabled, the graphics system will signal itself to resize when the window resize callback is called.
2022-10-18 17:41:14 +08:00
Brandon Mak 033ba48304 Editor changes to support viewport integration 2022-10-18 15:04:25 +08:00
Sri Sham Haran 335c19cfc7 Editor 2022-09-25 22:33:07 +08:00