Commit Graph

2547 Commits

Author SHA1 Message Date
XiaoQiDigipen 557a198367
Merge pull request #201 from SHADE-DP/SP3-6-c-scripting
References path for csproj generated file is now dynamically generated
2022-11-13 22:30:46 +08:00
Kah Wei 73a5d5e4b9 References path for csproj generated file is now dynamically generated 2022-11-13 22:29:04 +08:00
Glence d9beeda7e0 adding the base for fsm for player 2022-11-13 21:56:28 +08:00
Xiao Qi e3d2515740 Modular house part asset test 2022-11-13 20:49:31 +08:00
Xiao Qi d0bcd4869f Removed unused raw asset files 2022-11-13 20:19:26 +08:00
XiaoQiDigipen 0f38ed304d
Merge pull request #200 from SHADE-DP/SP3-13-Assets-Manager
On building of asset file directory, check for recognised assets without meta file and generate
2022-11-13 20:04:23 +08:00
Xiao Qi a8d4f9c756 On building of asset file directory, check for recognised assets without meta file and generate 2022-11-13 19:51:19 +08:00
XiaoQiDigipen ed25262914
Merge pull request #199 from SHADE-DP/SP3-2-Physics
SP3-2 Physics System restructure & bugfixes
UPDATES

If a collider is added without a rigidbody, it is treated as a static body.
BUGFIXES

Physics components can be deleted during play
Physics behaviour SHOULD be deterministic from now on
2022-11-13 18:53:45 +08:00
Diren D Bharwani c98693c6bc missing change from last commit 2022-11-13 17:57:46 +08:00
Diren D Bharwani c953931f4f Merge branch 'main' into SP3-2-Physics 2022-11-13 17:57:30 +08:00
XiaoQiDigipen 0e7d547782
Merge pull request #198 from SHADE-DP/SP3-4-Editor
New Undo/Redo commands + Integration of editor camera arm
Added undo/redo for copy/paste entities
Added undo/redo for entity deletion
Integration of editor camera arm (Alt + Left Click)
2022-11-13 17:44:57 +08:00
Diren D Bharwani 277a3ca011 Fixed deletion bugs 2022-11-13 17:42:48 +08:00
Sri Sham Haran eed950f26f Merge branch 'main' into SP3-4-Editor 2022-11-13 17:26:56 +08:00
Sri Sham Haran b1c004771c Gave the damn entities names cuz i was going crazy 2022-11-13 17:26:35 +08:00
Sri Sham Haran 895eb56cc0 Integrate cam arm 2022-11-13 17:26:21 +08:00
XiaoQiDigipen 57182f9715
Merge pull request #197 from SHADE-DP/SP3-6-c-scripting
Modified how scripts are added and updated to support runtime adding of scripts
2022-11-13 16:38:32 +08:00
Kah Wei 4dc8527395 Reworked scripts to no longer need definition of constructors 2022-11-13 16:29:25 +08:00
Kah Wei 39e26f1b6e Merge branch 'main' into SP3-6-c-scripting 2022-11-13 16:07:40 +08:00
Kah Wei af361062e7 Modified how scripts are added and updated to support runtime adding of scripts 2022-11-13 16:07:14 +08:00
Diren D Bharwani 6fd6ee61a6 Merge remote-tracking branch 'origin/SP3-2-Physics' into SP3-2-Physics 2022-11-13 16:02:18 +08:00
Diren D Bharwani 3512ed3397 AHHHHHH
i want to pull my hair out
2022-11-13 15:50:03 +08:00
Diren D Bharwani 6fc08f21ed AHHHHHH 2022-11-13 15:49:35 +08:00
XiaoQiDigipen f62ce2297d
Merge pull request #195 from SHADE-DP/SP3-6-c-scripting
Fixed crash on launch due to script rebuilds and support undo-ing add/remove of scripts

Also restricted access to internal types that SHADE_Scripting should not be accessing.
Redo wonkiness has also been fixed
2022-11-13 14:52:33 +08:00
Diren D Bharwani 86ca047c88 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-13 14:49:44 +08:00
Kah Wei 23320863e3 Added support for undo-redo of adding/removing scripts 2022-11-13 14:49:32 +08:00
Sri Sham Haran 66dbd7df93 Merge branch 'main' into SP3-4-Editor 2022-11-13 13:55:57 +08:00
Sri Sham Haran 276e0806fa Can now undo/redo entity deletion (working afaik) 2022-11-13 13:55:30 +08:00
Kah Wei 635d999c2c Fixed redo not working correctly 2022-11-13 13:16:36 +08:00
Kah Wei a83a38eba8 Fixed bin and obj folders respawning and causing engine crashes 2022-11-13 13:07:49 +08:00
Kah Wei 4b6ede88e2 Merge branch 'main' into SP3-6-c-scripting 2022-11-13 12:44:50 +08:00
Kah Wei fd7a47b4c0 Added changes to hide internal types and constructors that should not be available to SHADE_Scripting 2022-11-13 12:44:23 +08:00
XiaoQiDigipen 897294426f
Merge pull request #194 from SHADE-DP/SP3-141-Camera-System
Sp3 141 camera system
Added EditorCameraArm functionality
Added helper functions in SceneManager to help check scene node and component actives
2022-11-13 11:58:50 +08:00
XiaoQiDigipen 2d8dc8c44e
Merge pull request #193 from SHADE-DP/SP3-6-ArraySerialization
List Serialization and Editor for Scripts
Also improved editor fields for single value numbers
Reworked Undo-Redo system for scripts which should be more stable
[Known Issue] Editor for List<Vector2/Vector3> looks a bit off but works for now
2022-11-13 11:58:06 +08:00
Sri Sham Haran 19f0c0ea70 Copy/Paste of entities can now be undone
Fixed bug where Shift Select would reset in a duplicate entity selection
Moved editor window manager to its own file.
2022-11-13 11:43:08 +08:00
maverickdgg efed33ce94 Added code to test EditorCameraArm. 2022-11-13 05:45:43 +08:00
maverickdgg 922d5b0996 Merge branch 'main' into SP3-141-Camera-System 2022-11-13 05:31:34 +08:00
maverickdgg 258c07e857 Added helper functions to check if Scene nodes are active 2022-11-13 05:31:18 +08:00
maverickdgg 4d0598a7f5 Added Editor Camera Arm function 2022-11-13 05:19:46 +08:00
Kah Wei 26e0e72b25 Fixed lists not deserialising correctly 2022-11-13 04:57:10 +08:00
Kah Wei cf60210b4a Merge branch 'main' into SP3-6-ArraySerialization 2022-11-13 02:43:12 +08:00
Kah Wei d98deda63d Implemented deserialization of lists 2022-11-13 02:42:47 +08:00
XiaoQiDigipen f0d7ee655d
Merge pull request #192 from SHADE-DP/SP3-4-Editor
Editor Tweaks
Play/Pause/Stop bound to F5/F6/F7
Gizmo does not render on play now
Command Manager uses separate stack for undo/redo when editor state is in play
2022-11-13 01:05:32 +08:00
Sri Sham Haran e2bcb0bbbb play pause stop bound to F5 F6 F7 2022-11-12 23:57:12 +08:00
Kah Wei 889d3dac4c Split serialization code into SerialisationUtilities, refactored serialisation code and implemented list serialisation 2022-11-12 23:14:25 +08:00
Sri Sham Haran 69ac074926 change entity active to scene node active 2022-11-12 18:38:57 +08:00
Sri Sham Haran 78ca464c65 Editor now uses separate stacks; 1 set of stacks when in play and another set of stacks otherwise.
CommandStack now uses SHDeque
2022-11-12 18:22:45 +08:00
Sri Sham Haran 3402992189 dont draw gizmos on play 2022-11-12 18:09:55 +08:00
Diren D Bharwani f8bbcdd909 Small fixes 2022-11-12 17:28:49 +08:00
Diren D Bharwani 4ad23a605f Fixed compilation issues from merge 2022-11-12 17:04:09 +08:00
Diren D Bharwani 3faf3804aa Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-12 16:57:45 +08:00