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

2301 Commits

Author SHA1 Message Date
Glence 9d73806573 Merge branch 'main' into PlayerController 2023-02-04 01:11:56 +08:00
Glence 436846d03c Fix level1 and fix ontrigger calling twice 2023-02-04 01:11:47 +08:00
XiaoQiDigipen e88447bcf0
Merge pull request #342 from SHADE-DP/SP3-2-Physics 
Collision Tags autosave on change, fixed serialisation bug with collision tags
 2023-02-04 01:02:25 +08:00
Diren D Bharwani d517a98bab Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-04 00:54:03 +08:00
Diren D Bharwani a520571d82 Collision Tags now serialise based on index & autosave 2023-02-04 00:52:58 +08:00
maverickdgg 81d63f9776 Merge branch 'main' into SP3-141-Camera-System 2023-02-04 00:43:41 +08:00
maverickdgg 63a546b7aa Merge branch 'main' into SP3-141-Camera-System 2023-02-04 00:32:41 +08:00
XiaoQiDigipen ac93269283
Merge pull request #341 from SHADE-DP/SP3-20-UI-System 
Fixed Button texture swapping. Fixed Button scripts on scene change. Added buttons to scenes. Added SHEDITOR define for Managed
 2023-02-04 00:32:29 +08:00
mushgunAX c7b99df2f6 Merge branch 'main' into AudioImplementation 2023-02-04 00:31:23 +08:00
maverickdgg 358df0768d Merge branch 'SP3-20-UI-System' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-20-UI-System 2023-02-04 00:25:44 +08:00
maverickdgg 4de32341e1 Merge branch 'main' into SP3-20-UI-System 2023-02-04 00:24:59 +08:00
mushgunAX 49fadfed74 Dynamic BGM 2023-02-04 00:23:05 +08:00
Kah Wei 454de9f1ac Added SHEDITOR and _PUBLISH defines to SHADE_Managed 2023-02-04 00:22:17 +08:00
Kah Wei 4a101d97c9 CallbackEvents are now able to handle situations where a CallbackAction results in adding more CallbackActions 2023-02-04 00:19:57 +08:00
maverickdgg c88ce23d45 WIP collision 2023-02-04 00:17:29 +08:00
Kah Wei 3cd1778d08 Fixed SHUIComponent serialization 2023-02-04 00:04:25 +08:00
XiaoQiDigipen 36db5021ac
Merge pull request #338 from SHADE-DP/SP3-2-Physics 
Fixed crash occurring with editing collision tag file
 2023-02-03 23:54:43 +08:00
Diren D Bharwani b5b3761a6c Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-03 23:52:10 +08:00
Diren D Bharwani ff6ee80df2 Fixed bug where collision tag file could not be editir 
Fuck file i/o
 2023-02-03 23:51:31 +08:00
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