xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Fixed Button texture swapping. Fixed Button scripts on scene change. Added buttons to scenes. Added SHEDITOR define for Managed #341

Merged
maverickdgg merged 17 commits from SP3-20-UI-System into main 2023-02-04 00:32:29 +08:00
Conversation 0 Commits 17 Files Changed 85 +419 -249

17 Commits

Author SHA1 Message Date
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
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
Kah Wei 3cd1778d08 Fixed SHUIComponent serialization 2023-02-04 00:04:25 +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
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
maverickdgg 382a2d0f6a Added start game button. Texture changing for buttons now only change when necessary 2023-02-03 22:44:02 +08:00
maverickdgg a6290d9c8f Added texture, modifiable material fix 2023-02-03 20:12:48 +08:00
maverickdgg e3d616b4e1 Merge branch 'main' into SP3-20-UI-System 2023-02-03 18:42:53 +08:00
maverickdgg bb00889553 Merge branch 'main' into SP3-20-UI-System 2023-02-03 15:53:26 +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