Commit Graph

1257 Commits

Author SHA1 Message Date
Kah Wei 450970579a Merge branch 'main' into Fix-SetMesh 2022-11-01 13:38:34 +08:00
Glence c4ed57fea8 sprinting works now 2022-11-01 13:24:14 +08:00
Brandon Mak 78545889da SHSHSHAO 2022-11-01 12:47:50 +08:00
Brandon Mak 53fc1fce95 WIP 2022-11-01 12:10:15 +08:00
mushgunAX 2466ef00f3 Merge branch 'main' into SP3-10-input-management 2022-11-01 12:09:59 +08:00
mushgunAX b0054d62c6 Create AIPrototype.cs 2022-11-01 12:09:50 +08:00
Brandon Mak 5852c409e6 SSAO WIP 2022-11-01 11:57:08 +08:00
Glence d51a87ed36 Merge branch 'main' into PlayerController 2022-11-01 11:07:48 +08:00
Diren D Bharwani 9ec9411ce3 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-01 02:42:33 +08:00
Diren D Bharwani 2d411cad4a Merge remote-tracking branch 'origin/SP3-2-Physics' into SP3-2-Physics 2022-11-01 02:41:28 +08:00
Diren D Bharwani da690e4395 Simplified RigidBody Implementation 2022-11-01 02:41:08 +08:00
Diren D Bharwani a9de63a053 Simplified RigidBody Interface 2022-11-01 02:40:48 +08:00
Brandon Mak 54a36e1476 SSAO WIP 2022-11-01 02:32:14 +08:00
Glence dc7d5a7ec3 updates to the player controller 2022-11-01 01:31:13 +08:00
Kah Wei b35ca86ae9 BatcherDispatcher should now account for mesh changes properly 2022-11-01 00:53:15 +08:00
Xiao Qi a8f5d021d3 Switch case initialisation error fix 2022-11-01 00:50:57 +08:00
Xiao Qi 220e1a7d8b Fixed asset creation broken logic loop 2022-11-01 00:44:37 +08:00
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