xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity
1,838 Commits 81 Branches 9 Tags 86 MiB
Commit Graph

1838 Commits

Author SHA1 Message Date
Glence 4cacbb3300 adding main/lose/win scene 2022-11-23 00:44:27 +08:00
Diren D Bharwani 899736d54a Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-22 22:33:44 +08:00
Glence 332d0a846d Merge branch 'main' into PlayerController 2022-11-22 22:13:52 +08:00
Diren D Bharwani 4277ba10d7 Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph 2022-11-22 22:11:42 +08:00
XiaoQiDigipen 1962d449cd
Merge pull request #254 from SHADE-DP/SP3-13-Assets-Manager 
Fixed major bug when generating new meta files for materials
 2022-11-22 21:55:22 +08:00
Xiao Qi cc2587a7bd Added recognition for material and prefab types when generating meta files 2022-11-22 21:54:51 +08:00
Xiao Qi bcd8b37fd7 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-22 21:53:46 +08:00
Diren D Bharwani 82b92d45cf Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph 2022-11-22 21:31:45 +08:00
Diren D Bharwani 807ad54d7d Fixed Scene Node SetActive & SceneGraph CheckActiveInHierarchy 2022-11-22 21:31:37 +08:00
Sri Sham Haran f119acdb65 collider tag panel 2022-11-22 21:15:18 +08:00
XiaoQiDigipen 524ecebc7e
Merge pull request #253 from SHADE-DP/SP3-20-UI-System 
Fix for Canvas Scaler
 2022-11-22 21:06:25 +08:00
maverickdgg 44733308f1 Merge branch 'main' into SP3-20-UI-System 2022-11-22 21:04:03 +08:00
maverickdgg 7c36886669 Fix for Canvas scaler 2022-11-22 21:03:53 +08:00
XiaoQiDigipen 31d88f3691
Merge pull request #252 from SHADE-DP/Fix-RemoveDocGen 
Disabled xmldoc build, admin mode no longer required to build the engine
 2022-11-22 21:00:04 +08:00
Kah Wei ac09007862 Disabled xmldoc build, admin mode no longer required to build the engine 2022-11-22 20:59:17 +08:00
XiaoQiDigipen cecd8ab717
Merge pull request #251 from SHADE-DP/SP3-2-Physics 
Fixed Rigidbodies not sleeping
 2022-11-22 20:58:11 +08:00
XiaoQiDigipen 5049effd0f
Merge pull request #250 from SHADE-DP/SP3-20-UI-System 
Added Buttons, Added Canvas Scaling matrix, Added Serialization of buttons and camera arm
 2022-11-22 20:57:49 +08:00
maverickdgg 142f025692 Added check for editor camera. 2022-11-22 20:54:16 +08:00
Diren D Bharwani 0bf549f478 Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph 2022-11-22 20:53:15 +08:00
Diren D Bharwani 72d70e4747 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-22 20:46:37 +08:00
Diren D Bharwani 62c4b3837d Fixed bug where transform dirty flags were not being properly cleared. 
This was preventing bodies from going to sleep and transforms always updating.
 2022-11-22 20:46:31 +08:00
maverickdgg a57145b510 Merge branch 'main' into SP3-20-UI-System 2022-11-22 20:39:39 +08:00
maverickdgg a612e71f0c Added Buttons, Added Canvas Scaling matrix, Added Serialization of buttons and camera arm 2022-11-22 20:39:15 +08:00
XiaoQiDigipen 720ccb6eab
Merge pull request #249 from SHADE-DP/SP3-2-Physics 
Fixed various physics bugs and added Physics Material to Inspector
 2022-11-22 20:14:31 +08:00
Xiao Qi 57a0bbdb8c Added entity count at the bottom bar of editor 
Changed colour of bottom bar
 2022-11-22 20:14:21 +08:00
Diren D Bharwani dab51ee4cf Readded testing function in physics routines for future use 2022-11-22 20:00:58 +08:00
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