xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity
2,432 Commits 81 Branches 9 Tags 86 MiB
Commit Graph

2432 Commits

Author SHA1 Message Date
Xiao Qi 0281446538 Merge remote-tracking branch 'origin/main' into main 2023-02-03 23:50:40 +08:00
Xiao Qi 1bae1c97d6 Added demo animation objects 2023-02-03 23:50:35 +08:00
Kah Wei 7ded7a0706 Merge branch 'SP3-20-UI-System' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-20-UI-System 
# Conflicts:
#	Assets/Editor/Layouts/UserLayout.ini
 2023-02-03 23:33:40 +08:00
Kah Wei 940c55d665 Fixed Renderables not being removed from a batch if their modifiable material was retrieved 2023-02-03 23:33:23 +08:00
maverickdgg 21695fd4f3 Merge branch 'main' into SP3-20-UI-System 2023-02-03 23:28:17 +08:00
maverickdgg fdacaf5036 Added reminaing buttons for win and lose screens 2023-02-03 23:28:08 +08:00
XiaoQiDigipen 2be7469762
Merge pull request #337 from SHADE-DP/SP3-2-Physics 
Unretarded the collision tags
 2023-02-03 23:23:20 +08:00
Diren D Bharwani 7a79cda729 Reworked Collision Tag Interface and Logic 2023-02-03 23:22:21 +08:00
mushgunAX 136d86dce3 Fix Item Score SFX 2023-02-03 23:19:12 +08:00
mushgunAX d71790022f Merge branch 'main' into AudioImplementation 2023-02-03 23:16:47 +08:00
maverickdgg b15b5eadbc Merge branch 'main' into SP3-20-UI-System 2023-02-03 22:59:56 +08:00
maverickdgg ebf1ab39cf Added some buttons to lose screen 2023-02-03 22:59:49 +08:00
Diren D Bharwani c61be35da0 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-03 22:44:58 +08:00
maverickdgg 382a2d0f6a Added start game button. Texture changing for buttons now only change when necessary 2023-02-03 22:44:02 +08:00
XiaoQiDigipen 0e4400fc98
Merge pull request #336 from SHADE-DP/PlayerController 
Scene changes and Bug fixes
 2023-02-03 22:08:18 +08:00
Glence e00b891bf7 added lights to level 2 2023-02-03 22:03:55 +08:00
Glence 5284066cee Merge branch 'main' into PlayerController 2023-02-03 21:29:02 +08:00
Glence 2ee46f33df update collision tag to have a save button and clamp raycast draw 2023-02-03 21:28:50 +08:00
XiaoQiDigipen 0bf1fc9839
Merge pull request #335 from SHADE-DP/SP3-1-Rendering 
Updated shadow implementation
 2023-02-03 20:22:03 +08:00
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