Commit Graph

2413 Commits

Author SHA1 Message Date
XiaoQiDigipen b705db8a8c
Merge pull request #334 from SHADE-DP/SP3-129-AudioSystem
Added global parameter control and VCA volume control
2023-02-03 20:21:28 +08:00
Brandon Mak 6cde511b36 Shadows update
Made it less dark
2023-02-03 20:16:42 +08:00
maverickdgg a6290d9c8f Added texture, modifiable material fix 2023-02-03 20:12:48 +08:00
Xiao Qi 50c3855476 Merge remote-tracking branch 'origin/main' into main 2023-02-03 19:38:02 +08:00
Xiao Qi c9db8262b7 Added preprocessor checks for editor 2023-02-03 19:37:56 +08:00
mushgunAX a6bc9ed2b4 Updates on audio 2023-02-03 19:37:18 +08:00
Brandon Mak ca0b8aabb0 Merge branch 'main' into SP3-1-Rendering 2023-02-03 19:33:22 +08:00
Kah Wei 5bef209189 Modified ScriptAddAction to use serialization 2023-02-03 19:17:20 +08:00
SHAM-DP 98d4dd9483 Merge branch 'main' into SP3-129-AudioSystem 2023-02-03 19:16:25 +08:00
SHAM-DP 5b2f42a920 Added controls for global parameters
Added controls for VCA volume
2023-02-03 19:16:12 +08:00
maverickdgg e3d616b4e1 Merge branch 'main' into SP3-20-UI-System 2023-02-03 18:42:53 +08:00
Diren D Bharwani b02f4ac49b Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-03 18:40:51 +08:00
Diren D Bharwani 36de32447d Fixed some bugs with serialisation 2023-02-03 18:40:45 +08:00
XiaoQiDigipen ffb0a6e20c
Merge pull request #332 from SHADE-DP/SP3-6-c-scripting
Fixed bug where shmeta files in folders would still appear in SHADE_Scripting.csproj's solution explorer
2023-02-03 18:06:32 +08:00
Kah Wei 929bfa8a54 Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset 2023-02-03 17:05:56 +08:00
mushgunAX 60fa4335a0 Merge branch 'main' into AudioImplementation 2023-02-03 17:01:11 +08:00
Kah Wei 4cf17c16b5 Fixed bug where shmeta files in folders would still appear in SHADE_Scripting.csproj's solution explorer 2023-02-03 16:54:35 +08:00
Glence 6b5bd43110 Merge branch 'main' into PlayerController 2023-02-03 16:48:51 +08:00
XiaoQiDigipen 7818c6f2d2
Merge pull request #331 from SHADE-DP/SP3-2-Physics
Refactored Raycasting, Added Layers for Raycasting to C#, Fixed Collision Tag Panel
2023-02-03 16:26:06 +08:00
Diren D Bharwani c73275f2d3 Added temporary use of collision layers to C# and fixed raycast drawing 2023-02-03 16:11:30 +08:00
maverickdgg bb00889553 Merge branch 'main' into SP3-20-UI-System 2023-02-03 15:53:26 +08:00
Diren D Bharwani b81e71ed08 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-03 02:03:12 +08:00
Diren D Bharwani b6d91d5492 Fixed bug with collision tags not behaving as intended
Why the damn hell must react's system be so confusing??
2023-02-03 01:37:45 +08:00
mushgunAX d1a3214d41 Change banks 2023-02-03 00:40:22 +08:00
Glence 5bf3af2ed2 corrected transition to diff scenes 2023-02-03 00:03:05 +08:00
Glence 4af3440db7 added gameplay for level1 and multiplier combo is done 2023-02-02 22:44:48 +08:00
Diren D Bharwani 931f6fe5e2 Fixed almost everything. Ray debug drawing has a small bug 2023-02-02 20:56:55 +08:00
Diren D Bharwani d5c731dd20 Fixed collision shape debug drawing and more serialisation bugs 2023-02-02 20:48:32 +08:00
Diren D Bharwani 931ed58287 Added individual collider debug drawing 2023-02-02 20:19:21 +08:00
mushgunAX e28c6ce1a7 new banks 2023-02-02 20:16:12 +08:00
Diren D Bharwani 3593df3ada Fixed collider shape serialisation 2023-02-02 20:15:59 +08:00
Diren D Bharwani 71f4cdd29e Fixed rigidbody serialisation 2023-02-02 19:23:42 +08:00
Diren D Bharwani 6a57be2e60 Refactored old physics to match new interface
Compiles but still buggy, need a bit of time to clear up all the bugs
2023-02-02 19:06:56 +08:00
mushgunAX 1d0522e334 Audio Implementation for AI 2023-02-02 16:58:40 +08:00
XiaoQiDigipen e5479c31c5
Merge pull request #330 from SHADE-DP/PlayerController
Scripting changes for item and added level 1 scene
2023-02-02 11:20:20 +08:00
Glence 5b628baedf changes breakable to only minus count on items 2023-02-02 11:16:56 +08:00
Glence aaf4919c27 Merge branch 'main' into PlayerController 2023-02-02 11:05:06 +08:00
XiaoQiDigipen 7c53700692
Merge pull request #329 from SHADE-DP/SP3-6-c-scripting
Added UI Element and other QoL fixes for scripting
2023-02-02 10:57:20 +08:00
Glence ec11f8cb8f Merge branch 'main' into PlayerController 2023-02-02 10:45:21 +08:00
Kah Wei ee03722153 Merge branch 'main' into SP3-6-c-scripting 2023-02-01 23:49:44 +08:00
Kah Wei 3a4288d4bc Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset 2023-02-01 19:18:29 +08:00
maverickdgg d149aae6fb Merge branch 'main' into SP3-20-UI-System 2023-02-01 12:44:30 +08:00
maverickdgg 2dfaa75ab3 Add CreateComponentSparseSet and bug fix for togglebutton nt triggering 2023-02-01 12:42:51 +08:00
Kah Wei 0b0590180d Fixed incorrect functor called in SHScriptEngine::onUIElementClicked() 2023-02-01 11:57:11 +08:00
Kah Wei 39fbfbd6fa Added more reliable method of reloading static C# data 2023-02-01 00:34:09 +08:00
Kah Wei 72953762cb Attempt at resetting static data members 2023-01-31 23:48:44 +08:00
XiaoQiDigipen ab48efce30
Merge pull request #326 from SHADE-DP/SP3-1-Rendering
Fixed UI Rendering
2023-01-31 22:53:03 +08:00
Brandon Mak d9833ca8b0 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-01-31 19:07:28 +08:00
XiaoQiDigipen 71613143f6
Merge pull request #325 from SHADE-DP/SP3-4-Editor
Added Asset Browser Filters, double click asset id in inspector to highlight asset in asset browser
2023-01-31 19:05:21 +08:00
Brandon Mak 109f35f297 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-01-31 19:02:11 +08:00