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

2471 Commits

Author SHA1 Message Date
XiaoQiDigipen 32043635c5
Merge pull request #346 from SHADE-DP/SP3-141-Camera-System 
Fix camera arm and win scene issue
 2023-02-04 02:44:32 +08:00
Glence d1ae9b3756 Fix camera arm and win scene issue 2023-02-04 02:42:30 +08:00
XiaoQiDigipen f617a1a984
Merge pull request #345 from SHADE-DP/SP3-141-Camera-System 
Camera Collision fix. Still have some minor bugs
 2023-02-04 02:39:55 +08:00
Xiao Qi 1f7f86dd01 Merge remote-tracking branch 'origin/main' into main 2023-02-04 02:39:37 +08:00
Xiao Qi 33807de93d Pushed scene change and animator component bug fix for models without rigs 2023-02-04 02:32:35 +08:00
maverickdgg c5296db6f6 Camera Collision fix 2023-02-04 02:20:42 +08:00
mushgunAX 6e8b2bc460 Merge branch 'main' into AudioImplementation 2023-02-04 02:11:41 +08:00
maverickdgg 5b6217f923 Merge branch 'main' into SP3-141-Camera-System 2023-02-04 02:10:16 +08:00
maverickdgg 94fe055aa9 fixed collision 2023-02-04 02:10:08 +08:00
Sri Sham Haran 0297627599
Merge pull request #344 from SHADE-DP/PlayerController 
Fix collisionTag and playercontroller issue
 2023-02-04 02:09:12 +08:00
Glence 79c1bb229a Merge branch 'main' into PlayerController 2023-02-04 02:05:48 +08:00
Glence 0c455c55f6 correct collision tag issue and fix player controller keypress 2023-02-04 02:05:32 +08:00
Diren D Bharwani 638286b357 Fixed missing trigger state 2023-02-04 01:57:27 +08:00
mushgunAX 1866d4ba40 SFX for item scoring 2023-02-04 01:45:34 +08:00
mushgunAX a7238c6eba Merge branch 'main' into AudioImplementation 2023-02-04 01:45:09 +08:00
mushgunAX 23f7812a70 Fix StopAllSounds 2023-02-04 01:44:00 +08:00
maverickdgg 44e28f0d3f Merge branch 'main' into SP3-141-Camera-System 2023-02-04 01:20:45 +08:00
XiaoQiDigipen b2473c0c48
Merge pull request #343 from SHADE-DP/PlayerController 
Fix scene1 issues and fix scripts
 2023-02-04 01:20:26 +08:00
maverickdgg e5d372c94e Merge branch 'main' into SP3-141-Camera-System 2023-02-04 01:20:22 +08:00
Sri Sham Haran b89be05ceb Shortcuts in hierarchy panel cannot be pressed when any widget is focused 2023-02-04 01:20:01 +08:00
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