XiaoQiDigipen
dd76d16a2c
Merge pull request #246 from SHADE-DP/PlayerController
...
Bug fixes and new assets
2022-11-22 16:25:14 +08:00
Glence
f1c7f42e13
Merge branch 'main' into PlayerController
2022-11-22 16:21:28 +08:00
Glence
71e8ba6044
doing up the main menu
2022-11-22 16:18:16 +08:00
XiaoQiDigipen
1ca216801f
Merge pull request #245 from SHADE-DP/SP3-1-Rendering
...
Updated SSAO shader
2022-11-22 16:01:11 +08:00
Brandon Mak
780c716199
Updated SSAO shader
2022-11-22 16:00:05 +08:00
Kah Wei
a78b3c0123
Reworked NativeAsset system
2022-11-22 15:52:55 +08:00
Kah Wei
81d067dc87
Merge branch 'main' into SP3-6-c-scripting
2022-11-22 15:27:12 +08:00
Glence
be16e46872
Merge branch 'main' into PlayerController
2022-11-22 15:12:22 +08:00
Glence
81d44e6c59
small changes to the scene
2022-11-22 14:59:46 +08:00
XiaoQiDigipen
25c9d6eea2
Merge pull request #244 from SHADE-DP/SP3-5-ECS
...
Added SceneManager Managed code to change scene
2022-11-22 14:57:18 +08:00
Kah Wei
893ab9ed46
Merge branch 'main' into SP3-6-c-scripting
2022-11-22 14:56:46 +08:00
Xiao Qi
681e7f3506
Added invalid Asset ID Macro
2022-11-22 14:26:10 +08:00
maverickdgg
3f39cfc637
include pch
2022-11-22 14:14:58 +08:00
Glence
219d5025f3
adding in the env and world
2022-11-22 14:14:55 +08:00
maverickdgg
fcf258d773
Added SceneManager managed code
2022-11-22 14:11:10 +08:00
maverickdgg
5d04149797
buttons WIP
2022-11-22 14:02:45 +08:00
Xiao Qi
3b6d1c815d
Merge branch 'main' into SP3-17-animation-system
2022-11-22 13:55:17 +08:00
Xiao Qi
5024956c04
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-22 13:54:40 +08:00
XiaoQiDigipen
7e7ee8002f
Merge pull request #243 from SHADE-DP/SP3-6-c-scripting
...
Fixed TextRenderable components not being retrievable by C# scripts
2022-11-22 13:51:08 +08:00
Kah Wei
06b2a5640e
Merge branch 'main' into SP3-6-c-scripting
2022-11-22 13:51:00 +08:00
Glence
6c4ec7c807
Merge branch 'main' into PlayerController
2022-11-22 13:44:27 +08:00
maverickdgg
cf10724f3a
Update SHSerialization.cpp
2022-11-22 13:17:45 +08:00
maverickdgg
3e4ebaab7b
Merge branch 'main' into SP3-20-UI-System
2022-11-22 13:16:04 +08:00
maverickdgg
080c2c70d5
Added canvas to serialization
2022-11-22 13:09:40 +08:00
XiaoQiDigipen
437cb075d3
Merge pull request #242 from SHADE-DP/SP3-141-Camera-System
...
FIxed major crashes caused by main camera retrieval and entity destroy
2022-11-22 12:55:17 +08:00
maverickdgg
858e200fb3
Bug fixes
2022-11-22 11:32:19 +08:00
Kah Wei
ece0a92717
Fixed TextRenderable components not being retrievable by C# scripts
2022-11-22 11:29:01 +08:00
XiaoQiDigipen
69d07992dc
Merge pull request #241 from SHADE-DP/SP3-1-Rendering
...
Added functionality for graphics system to render to swapchain image when SHEDITOR is disabled.
2022-11-22 10:58:26 +08:00
Brandon Mak
cf0b94e97d
Merge branch 'main' into SP3-1-Rendering
2022-11-22 10:50:04 +08:00
Brandon Mak
dfe86ce7db
Fixed resizing bug
2022-11-22 10:43:59 +08:00
Brandon Mak
4377972315
Added functionality for graphics system to render to swapchain image
...
- Added functionality for graphics system to render to swapchain image when SHEDITOR is disabled. This is done via rendering a simple quad on screen and using an input attachment as a texture to the shader.
2022-11-22 10:10:26 +08:00
Brandon Mak
964b375ccd
Write to swapchain image without SHEDITOR defined WIP
2022-11-22 09:05:56 +08:00
XiaoQiDigipen
8f7c7e5e13
Merge pull request #239 from SHADE-DP/SP3-6-c-scripting
...
Renamed SHTextRenderer and to SHTextRenderable and added C# interface
2022-11-22 01:19:51 +08:00
Diren D Bharwani
23bae3d515
Fixed bug with Bounciness failing to serialise
2022-11-22 00:46:32 +08:00
Kah Wei
07efa1ab51
Added an abstract base class for NativeAsset to prepare to support serialization of Assets for scripts
2022-11-22 00:39:53 +08:00
Diren D Bharwani
f1ac689bb0
Added Physics Materials to Inspector
2022-11-22 00:37:09 +08:00
Glence
56e7f73bbb
adding var audios into scripting
2022-11-21 21:01:44 +08:00
Kah Wei
af2ad6cc80
Merge branch 'main' into SP3-6-c-scripting
2022-11-21 20:59:08 +08:00
Kah Wei
6550846b0f
Added C# interface for Fonts and TextRenderable
2022-11-21 20:58:47 +08:00
Diren D Bharwani
857e4a6b75
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-21 20:57:33 +08:00
Kah Wei
4172362790
Renamed SHTextRenderer to SHTextRenderable
2022-11-21 20:35:31 +08:00
Brandon Mak
cd6edeeee4
Merge branch 'main' into SP3-1-Rendering
2022-11-21 20:29:10 +08:00
XiaoQiDigipen
6d8fba8e05
Merge pull request #238 from SHADE-DP/Fix-BatchPersistence
...
Fixed ghosts of a renderable being rendered when a material is changed
2022-11-21 20:27:48 +08:00
Xiao Qi
1ed0181c9e
Reverted premake changes
2022-11-21 20:27:38 +08:00
XiaoQiDigipen
81043a5927
Merge pull request #237 from SHADE-DP/SP3-2-Physics
...
Added more debug drawing & Fixed Physics running without SHEDITOR
2022-11-21 20:24:05 +08:00
XiaoQiDigipen
3c7346885f
Merge pull request #236 from SHADE-DP/SP3-6-c-scripting
...
Added GameObject.Null and Enabling/Disabling of Scripts
2022-11-21 20:21:48 +08:00
Kah Wei
9cc008eaf4
Fixed ghosts of a renderable being rendered when a material is changed
2022-11-21 20:21:08 +08:00
Diren D Bharwani
3baedd8ffa
Merge branch 'main' into SP3-2-Physics
2022-11-21 20:15:58 +08:00
Diren D Bharwani
1d692d3301
Physics works without SHEDITOR defines. Mass is temporarily auto computed.
2022-11-21 19:59:32 +08:00
Kah Wei
1a20eeed96
Added system routine stub for the SHAnimationSystem
2022-11-21 19:46:53 +08:00