Diren D Bharwani
c4e391a6db
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-22 19:56:18 +08:00
XiaoQiDigipen
8a292a5e9d
Merge pull request #248 from SHADE-DP/SP3-6-c-scripting
...
Fixed compilation error in Editor.h++
2022-11-22 19:49:55 +08:00
Kah Wei
8cdc49463a
Merge branch 'main' into SP3-6-c-scripting
2022-11-22 19:44:18 +08:00
Kah Wei
fb25d2b714
Fixed compilation error in Editor.h++
2022-11-22 19:44:07 +08:00
Diren D Bharwani
053c3e04fd
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-22 19:26:47 +08:00
Diren D Bharwani
c18d58cba3
Fixed various physics bugs
...
Fixed bug where world was prebuilt and entity IDs were wrongly synced
Fixed collider properties not being synced in the first frame during mass property computations
Fixed static objects being wrongly updated post world update
2022-11-22 19:26:17 +08:00
XiaoQiDigipen
9e49d223d1
Merge pull request #247 from SHADE-DP/SP3-6-c-scripting
...
Added C# Assets System and Serialization of Script Enabled State
2022-11-22 18:59:32 +08:00
Kah Wei
9964d5dfce
Fixed missing comments for SHEditorUI
2022-11-22 18:17:24 +08:00
Kah Wei
1bd19b90a8
Merge branch 'main' into SP3-6-c-scripting
2022-11-22 18:11:17 +08:00
Kah Wei
6afcaa9263
Enabled state of scripts are now serialised
2022-11-22 18:09:50 +08:00
Kah Wei
9a7bf335bb
Added serialization and deserialization of MeshAsset, FontAsset and MaterialAsset
2022-11-22 17:58:07 +08:00
Kah Wei
4478b6db62
Added editor support for FontAsset, MeshAsset and MaterialAsset.
2022-11-22 17:48:01 +08:00
Glence
c91897f46a
made changescene a public in sceneManager.hxx
...
added a main menu scene
added some new texture
2022-11-22 17:28:48 +08:00
Kah Wei
7d692061fb
Reworked how Materials are handled on C#
2022-11-22 17:23:50 +08:00
Kah Wei
719d29dec3
Renamed Mesh and Font structs in Managed to MeshAsset and FontAsset and reworked them to be a abstraction for asset IDs
2022-11-22 16:51:07 +08:00
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