Commit Graph

1368 Commits

Author SHA1 Message Date
mushgunAX 901e49cf1c Merge branch 'main' into SP3-10-input-management 2022-11-02 14:50:56 +08:00
Brandon Mak eb569a4263 Shader updates 2022-11-02 14:21:27 +08:00
XiaoQiDigipen be53244a00
Merge pull request #161 from SHADE-DP/SP3-6-c-scripting
Added IsInterpolating to RigidBody in C#
2022-11-02 13:53:28 +08:00
Kah Wei 7bda8b3998 Added IsInterpolating to RigidBody in C# 2022-11-02 13:48:53 +08:00
Kah Wei 93c684fbb1 Merge branch 'main' into SP3-6-c-scripting 2022-11-02 13:42:41 +08:00
mushgunAX f513603479 AI Prototype implemented 2022-11-02 13:14:17 +08:00
mushgunAX 3826406f55 Merge branch 'main' into SP3-10-input-management 2022-11-02 11:37:23 +08:00
mushgunAX 4eb7879bf2 Revert "Create AIPrototype.cs"
This reverts commit b0054d62c6.
2022-11-02 11:37:03 +08:00
Kah Wei 82e0e4df5c Added editor gridlines and cardinal axes 2022-11-02 10:33:17 +08:00
Glence 218fc89fc8 Merge branch 'main' into PlayerController 2022-11-02 10:24:09 +08:00
Glence 8df82cae09 Merge remote-tracking branch 'origin/PlayerController' into PlayerController 2022-11-02 10:22:13 +08:00
Kah Wei 41e1f01f29 Added support for persistent debug draw 2022-11-02 10:11:13 +08:00
Kah Wei 1371302a40 Generalised Draw functions in SHDebugDrawSystem for potentially any number of draw queues 2022-11-02 09:34:36 +08:00
XiaoQiDigipen 8c666ef236
Merge pull request #160 from SHADE-DP/SP3-1-DebugDraw2
Added Debug Draw System
2022-11-02 02:29:33 +08:00
XiaoQiDigipen b8e4c2b1bb
Merge pull request #159 from SHADE-DP/SP3-16-Math
SP3-16 Slight rework to SHColour for compatibility
UPDATES
*SHColour is now compatible with SHVec4
2022-11-02 02:29:06 +08:00
Kah Wei 5f7b28e8a0 Added SHDebugDraw convenience static class for debug drawing 2022-11-02 01:11:28 +08:00
Kah Wei ed446002aa Merge branch 'SP3-16-Math' into SP3-1-DebugDraw2 2022-11-02 01:05:29 +08:00
Diren D Bharwani b9ada6a5be Reworked SHColour to be compatible with SHVec4 2022-11-02 00:47:19 +08:00
Glence 4eef6143dc base for pick and throw 2022-11-02 00:25:43 +08:00
Diren D Bharwani 07bfb2f485 Merge remote-tracking branch 'origin/main' into SP3-16-Math 2022-11-02 00:22:36 +08:00
Glence 97a39d62c6 player controller done for now 2022-11-01 23:28:31 +08:00
Glence dd0d336ccb Merge branch 'main' into PlayerController 2022-11-01 22:03:52 +08:00
Kah Wei dc8ed48be3 Fixed debug draw system cube rendering 2022-11-01 21:49:57 +08:00
Sri Sham Haran 129f92e4b6 mat inspector properties handling (WIP) 2022-11-01 21:49:42 +08:00
Kah Wei 904d6be6b0 Merge branch 'main' into SP3-1-DebugDraw2
# Conflicts:
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
2022-11-01 21:00:55 +08:00
Xiao Qi e2778da955 WIP Rewrite flow from compiling to loading to recognising assets 2022-11-01 20:54:51 +08:00
Kah Wei 0096bc4975 Debug Draw fixes 2022-11-01 20:32:35 +08:00
Kah Wei 674b4d5155 Fixed extra # appearing on all names of script variables 2022-11-01 20:29:03 +08:00
Brandon Mak b0d08d27fd SSAO is fully implemented 2022-11-01 20:10:59 +08:00
XiaoQiDigipen 5fe81932e1
Merge pull request #158 from SHADE-DP/SP3-12-SceneGraph
SP3-12 Hierarchy Interface for C#
UPDATES

Setting & Getting of Parent has been moved from Transform to GameObject
2022-11-01 19:03:16 +08:00
Sri Sham Haran 26591e8c24 material inspector 2022-11-01 19:03:08 +08:00
Diren D Bharwani 72dc07bbd9 Shifted Hierarchy interface from Transform to GameObject 2022-11-01 19:00:31 +08:00
Diren D Bharwani 40be8a7962 Merge branch 'main' into SP3-12-SceneGraph 2022-11-01 19:00:12 +08:00
Glence 04f6e54007 Merge branch 'main' into PlayerController 2022-11-01 17:50:53 +08:00
Glence e397d180dd jumping almost there 2022-11-01 17:49:01 +08:00
XiaoQiDigipen ff74c090d5
Merge pull request #157 from SHADE-DP/SP3-6-c-scripting
GameObjects on scripts can now be edited in the inspector and are serialized
Also credit to @srishamharan for fix to SHHierarchyPanel's drag and drop
2022-11-01 17:26:26 +08:00
Kah Wei 8afe8c1a79 GameObjects on scripts can now be edited in the inspector and are serialized 2022-11-01 17:24:20 +08:00
XiaoQiDigipen 1f7abc7a96
Merge pull request #156 from SHADE-DP/SP3-141-Camera-System
Sp3 141 camera system
Added C# interface for Camera and Camera Arm
Added Time.DeltaTimeF and Input.GetMouseVelocity to C# interface
Added ThirdPersonCamera and Camera Control scripts
Added a GetForward function to Camera C# interface. This gets the forward of the last calculated view Matrix.
2022-11-01 16:06:37 +08:00
maverickdgg eb54b49a5e Merge branch 'main' into SP3-141-Camera-System 2022-11-01 15:50:45 +08:00
maverickdgg 39910afa54 Added GetForward to Camera C# interface.
GetForward gets the forward according to Camera's last calculated view matrix
2022-11-01 15:49:15 +08:00
XiaoQiDigipen 294e61a549
Merge pull request #153 from SHADE-DP/SP3-2-Physics
SP3-2 Reworked Physics Component Removal, Added Editor State Change events

NEW

Events for editor state change added:
SH_EDITOR_ON_PLAY_EVENT,
SH_EDITOR_ON_PAUSE_EVENT,
SH_EDITOR_ON_STOP_EVENT
BUGFIX

Reworked physics component removal to match ECS update
2022-11-01 15:36:34 +08:00
maverickdgg a45432ef66 Merge conflict 2022-11-01 15:35:50 +08:00
XiaoQiDigipen e8553b6181
Merge pull request #152 from SHADE-DP/SP3-6-c-scripting
Added EntityID retrieval from GameObject and compiled docs for Intellisense in C# projects
2022-11-01 15:35:46 +08:00
XiaoQiDigipen f0c90ceb37
Merge pull request #151 from SHADE-DP/Fix-SetMesh
Fix SetMesh(), SHResourceManager and BatcherDispatcher issues that blocked mesh switching
2022-11-01 15:35:04 +08:00
Diren D Bharwani e0dcf9e13e Added Editor State Change events 2022-11-01 15:32:01 +08:00
maverickdgg d917159f67 Merge branch 'main' into SP3-141-Camera-System 2022-11-01 15:31:11 +08:00
maverickdgg f919d95c0b Added C# interface for Camera and Camera Arm. Added some test scripts 2022-11-01 15:30:13 +08:00
Kah Wei 00ee8a4641 Added compiled documentation for C# interfaces 2022-11-01 15:29:12 +08:00
Kah Wei 69e625014d Added EntityID retrieval from GameObject 2022-11-01 15:25:19 +08:00
Diren D Bharwani 4dcd60f239 Added rotation offsets to colliders 2022-11-01 15:10:47 +08:00