Commit Graph

1832 Commits

Author SHA1 Message Date
XiaoQiDigipen 9ada09dec1
Merge pull request #223 from SHADE-DP/SP3-20-UI-System
Added UI and Canvas to editor
2022-11-18 16:39:46 +08:00
maverickdgg e5b9192044 Merge branch 'main' into SP3-20-UI-System 2022-11-18 16:37:41 +08:00
maverickdgg a181d7b896 Added Canvas and UI to editor 2022-11-18 16:37:33 +08:00
Brandon Mak 03ce142137 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-11-18 16:37:06 +08:00
Brandon Mak b5f37195a9 Merge branch 'FontIntegration' into SP3-1-Rendering 2022-11-18 16:36:10 +08:00
Brandon Mak 66f33554a3 Tested adding text component to entities 2022-11-18 16:35:49 +08:00
XiaoQiDigipen 8f513de9c3
Merge pull request #222 from SHADE-DP/SP3-20-UI-System
Implemented Canvas and UI Component
2022-11-18 12:29:40 +08:00
maverickdgg 36a1a1c696 Merge branch 'main' into SP3-20-UI-System 2022-11-18 12:24:24 +08:00
XiaoQiDigipen 84dc63d6d3
Merge pull request #221 from SHADE-DP/SP3-141-Camera-System
Separated Ortho and perspective matrices in camera
2022-11-18 12:24:19 +08:00
maverickdgg 0b5ec34b00 Merge branch 'main' into SP3-141-Camera-System 2022-11-18 09:38:52 +08:00
maverickdgg 9ac1c01008 Merge branch 'main' into SP3-20-UI-System 2022-11-18 09:38:42 +08:00
maverickdgg d997cd4da6 Added canvas ID to UI Component 2022-11-18 09:38:31 +08:00
XiaoQiDigipen c493432f3f
Merge pull request #219 from SHADE-DP/SP3-6-c-scripting
Scripts are now always built on engine launch
2022-11-17 17:38:17 +08:00
Kah Wei e8bd33ec9e Scripts are now always built on engine launch 2022-11-17 17:36:35 +08:00
XiaoQiDigipen 379c44086d
Merge pull request #218 from SHADE-DP/SP3-6-c-scripting
Fixed edge cases for serialization and deserialization of scripts
2022-11-17 17:17:12 +08:00
XiaoQiDigipen e31f868257
Merge pull request #217 from SHADE-DP/SP3-2-Physics
Fixed various Physics bugs
2022-11-17 17:13:01 +08:00
XiaoQiDigipen c54c59a445
Merge pull request #216 from SHADE-DP/SP3-4-Editor
Added controls to adjust editor camera movement speed and turn speed
2022-11-17 17:12:16 +08:00
Kah Wei 042bff5c1a Added additional exception handling for serialization and deserialization failures for scripts to prevent data loss 2022-11-17 15:49:06 +08:00
Kah Wei 6efbea54e1 Fixed issue where scripts of Entities destroyed during scene unloading are not properly disposed 2022-11-17 15:43:35 +08:00
Kah Wei 17662abef1 Fixed bug where certain null objects in deserialization was not handled 2022-11-17 15:42:40 +08:00
Sri Sham Haran 920e977232 Merge branch 'main' into SP3-4-Editor 2022-11-17 13:34:34 +08:00
Sri Sham Haran e170a5fca8 Added controls to editor viewport menu bar to adjust movement speed and turn speed for editor camera 2022-11-17 13:33:22 +08:00
Diren D Bharwani b3fbfce56f FIxed debug draw for offset colliders 2022-11-17 12:58:01 +08:00
Glence 7d2435131f added game manager along with scoring zones for item to be thrown in 2022-11-17 12:54:08 +08:00
Diren D Bharwani 360c55fa2b Disabled automass on rigid bodies 2022-11-17 12:27:00 +08:00
Diren D Bharwani 18218443ec Fixed a bug 2022-11-17 12:20:28 +08:00
Diren D Bharwani c967f9355f Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-17 10:42:53 +08:00
Diren D Bharwani 7288894507 Fixed bug where adding colliders would fail to maintain previous collider sizes 2022-11-17 10:42:45 +08:00
XiaoQiDigipen 098c621316
Merge pull request #215 from SHADE-DP/SP3-1-MaterialEditSupport
Added full support for runtime editing of material properties
2022-11-17 09:22:52 +08:00
maverickdgg ad30f150d1 UI component and UI System prep 2022-11-17 07:12:38 +08:00
maverickdgg 0bb97413ef Added Canvas and UI Components 2022-11-17 05:39:55 +08:00
maverickdgg 7d71390d43 separated ortho and proj matrix in camera comp 2022-11-17 05:29:11 +08:00
maverickdgg 6b80a4baa9 Merge branch 'main' into SP3-141-Camera-System 2022-11-17 04:56:04 +08:00
maverickdgg c80a819b6e Guard Find entity by name function 2022-11-17 04:55:46 +08:00
Diren D Bharwani 8f9fedff41 Added sleeping debug info to Rigidbody Inspector 2022-11-17 01:39:05 +08:00
Glence e4f23dc6c3 added a game manager along with some player controller changes 2022-11-17 00:23:38 +08:00
Diren D Bharwani 503f32c3a6 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-17 00:21:18 +08:00
Diren D Bharwani 39a8ca131f Fixed Collision & Trigger Messages not being cleared on deactivating objects 2022-11-17 00:11:55 +08:00
Kah Wei b129a68680 Disabled setting of shader for now as it is buggy 2022-11-16 23:19:25 +08:00
Kah Wei ae5f7801d4 Merge branch 'main' into SP3-1-MaterialEditSupport 2022-11-16 22:52:42 +08:00
Glence e4bba27671 Merge branch 'main' into PlayerController 2022-11-16 22:30:38 +08:00
Glence df9cb11446 add to vel instead of setting it 2022-11-16 22:28:08 +08:00
Kah Wei 19bc90845f Added additional checks for SetProperty() of Material and MaterialInstance 2022-11-16 21:01:51 +08:00
Kah Wei 8869b42db2 Fixed memory corruption in SHSubpass 2022-11-16 21:00:27 +08:00
Kah Wei fe91f58d28 Fixed material inspector saving not saving the correct texture ID into the runtime material 2022-11-16 19:25:17 +08:00
Kah Wei c5bca4111b Fixed validation error caused by deleting empty batches 2022-11-16 19:23:26 +08:00
Kah Wei f0c09817ce EnsureBufferAndCopy utility functions now avoid resizes if new size is smaller or equal 2022-11-16 17:49:11 +08:00
Kah Wei 29b4465dfd Split pre-rendering tasks to a PrepareRenderRoutine 2022-11-16 17:48:15 +08:00
Sri Sham Haran edd44604f1 Merge branch 'main' into SP3-4-Editor 2022-11-16 17:47:36 +08:00
Sri Sham Haran 37e845336b Fix line draws for asset browser 2022-11-16 17:46:48 +08:00