Commit Graph

2840 Commits

Author SHA1 Message Date
XiaoQiDigipen 7ed5279f8c
Merge pull request #148 from SHADE-DP/SP3-6-c-scripting
Added collision and trigger event functions for scripts and double multiplication with vectors
2022-11-01 00:39:08 +08:00
Diren D Bharwani 20c1057314 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-01 00:38:14 +08:00
Kah Wei c08afcb804 Fixed incorrect FixedUpdate() execution and added Time.FixedDeltaTime 2022-11-01 00:37:09 +08:00
Diren D Bharwani 45cc8c01b6 Merge remote-tracking branch 'origin/main' into SP3-16-Math 2022-11-01 00:31:02 +08:00
Kah Wei 4e97392098 Added support for multiplying doubles with Vectors in C# 2022-11-01 00:27:45 +08:00
Kah Wei 76737a735a Merge branch 'main' into SP3-6-c-scripting
# Conflicts:
#	SHADE_Engine/src/Physics/SHPhysicsSystem.cpp
2022-11-01 00:12:51 +08:00
Kah Wei e4cb8ede5a Added support for collision and trigger events in code properly 2022-11-01 00:11:09 +08:00
XiaoQiDigipen ec9aa4bb6e
Merge pull request #147 from SHADE-DP/SP3-2-Physics
SP3-2 Relative Collider Size Bugfix
BUGFIXES

Fixed bug where collider size was wrongly displayed and set
2022-10-31 23:50:40 +08:00
Kah Wei b7aca5b118 Merge branch 'main' into SP3-6-c-scripting 2022-10-31 23:39:56 +08:00
Brandon Mak 53b9c8f746 SSAO WIP 2022-10-31 23:28:46 +08:00
Diren D Bharwani 6e604fe7e9 Fixed bug with relative collider sizes 2022-10-31 23:18:20 +08:00
Diren D Bharwani da561421b2 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-31 22:31:14 +08:00
Glence dcd257229b Merge branch 'main' into PlayerController 2022-10-31 22:28:45 +08:00
XiaoQiDigipen b6c595f175
Merge pull request #146 from SHADE-DP/SP3-10-input-management
Update C# Input Enums
Most input enums are now reachable by C# scripting, including Left Shift
2022-10-31 22:11:30 +08:00
mushgunAX caf6006c9e Update C# Input Enums 2022-10-31 22:06:28 +08:00
Glence 75a5127648 Merge branch 'main' into PlayerController 2022-10-31 21:49:30 +08:00
Kah Wei a6a8700b82 Moved commits over to C# Branch 2022-10-31 21:39:53 +08:00
Kah Wei f9810684ed Added functions for execution of OnCollision*() and OnTrigger*() 2022-10-31 21:38:17 +08:00
Kah Wei 60c2c9facb Added collision and trigger event functions for Script 2022-10-31 21:31:33 +08:00
Kah Wei 40044cbbfe Added definitions for CollisionInfo properties 2022-10-31 21:26:39 +08:00
Kah Wei 27e71558ad SHPhysicsSystemInterface now uses a forward declaration for SHPhysicsUtils 2022-10-31 21:26:12 +08:00
Kah Wei ccbbdc6485 Added CollisionInfo and SHPhysicsSystemInterface 2022-10-31 21:05:46 +08:00
Brandon Mak 441207260b shmeta 2022-10-31 20:49:49 +08:00
Brandon Mak 2bd3b45ba0 SSAO sort of working 2022-10-31 20:49:28 +08:00
XiaoQiDigipen 68237ae086
Merge pull request #145 from SHADE-DP/SP3-2-Physics
SP3-2 Remove component bugfix
BUGFIX

Fixed crash from attempted removal of non-existent rigidbodies / colliders
2022-10-31 18:42:56 +08:00
XiaoQiDigipen 93284bcbfb
Merge pull request #144 from SHADE-DP/SP3-1-SerialisedRenderable
Materials are now Serializable and Renderables will load the correct Material if it exists
2022-10-31 18:36:35 +08:00
Diren D Bharwani b0544d69d2 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-31 18:24:21 +08:00
Kah Wei 2ca353a0b7 Fixed compilation issues in SHResourceManager 2022-10-31 18:18:06 +08:00
Glence 48f01e4164 camp vel 2022-10-31 18:05:36 +08:00
maverickdgg a5e1862649 Merge branch 'main' into SP3-141-Camera-System 2022-10-31 17:59:09 +08:00
Diren D Bharwani a8cb36b46f Fixed component removal bug on application close 2022-10-31 17:55:32 +08:00
Kah Wei 33431d71a6 Merge branch 'main' into SP3-1-SerialisedRenderable 2022-10-31 17:48:02 +08:00
Kah Wei 5bb728663c Materials are now serializable and deserializable 2022-10-31 17:47:38 +08:00
XiaoQiDigipen d96ba153ed
Merge pull request #143 from SHADE-DP/SP3-141-Camera-System
Sp3 141 camera system
Added Camera Look at.
Fixed Camera Arm.
Added Camera Set View Matrix.
Added ViewMatrix decomposition
2022-10-31 17:44:20 +08:00
Kah Wei 797f4bfd75 Fixed shader changes 2022-10-31 17:35:52 +08:00
Diren D Bharwani 90bcae03a8 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-31 17:33:27 +08:00
XiaoQiDigipen 0957c39283
Merge pull request #141 from SHADE-DP/SP3-5-ECS
SP3-5 ECS
Bugfix: Added remove component broadcast to removeComponentOfEntity
2022-10-31 17:32:42 +08:00
Glence c572bb0f58 Merge branch 'main' into PlayerController 2022-10-31 17:30:12 +08:00
XiaoQiDigipen 13c8928828
Merge pull request #140 from SHADE-DP/SP3-2-Physics
SP3-2 Physics Bugfixes
BUGFIXES
Fixed the same velocity bug from before :<
Trigger Info are now stored in the correct container
2022-10-31 17:27:40 +08:00
Diren D Bharwani dc20317a70 M dumb again. 2022-10-31 17:25:31 +08:00
maverickdgg a9c1bd7e7a Added remove component broadcast to removeComponentOfEntity 2022-10-31 17:25:17 +08:00
maverickdgg 883c5460bc Added a boolean for CameraArm to lock and unlock camera look at 2022-10-31 17:23:03 +08:00
maverickdgg acf52c77ce Merge branch 'main' into SP3-141-Camera-System 2022-10-31 16:55:56 +08:00
Glence f498cfe1fe Merge branch 'main' into PlayerController 2022-10-31 16:54:29 +08:00
Diren D Bharwani 3d53a7cd40 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-31 16:53:41 +08:00
Diren D Bharwani c6cc327141 M dumb. 2022-10-31 16:53:34 +08:00
Diren D Bharwani f863f57466 Triggers were being stored in the wrong container 2022-10-31 16:49:09 +08:00
Glence 0ffd596734 update player controller 2022-10-31 16:45:47 +08:00
maverickdgg 65013969a8 Added Camera LookAt and CameraArmComponent works now 2022-10-31 16:39:06 +08:00
XiaoQiDigipen 75e073d45b
Merge pull request #138 from SHADE-DP/SP3-6-c-scripting
Added proper implementation of IsActiveInHierarchy()
2022-10-31 16:32:53 +08:00