savya/Colorbook
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work_branch #7

Merged
savya merged 7 commits from work_branch into main 2026-05-28 12:24:57 +02:00
Conversation 0 Commits 7 Files Changed 34 +39535 -2571

7 Commits

Author SHA1 Message Date
Mausham
3f14d0b346 completed intro video and mainmenu scene 2026-05-28 15:37:33 +05:45
Mausham
86bf52ced4 Merge remote-tracking branch 'origin/main' into work_branch 
# Conflicts:
#	Assets/Darkmatter/Code/Features/MainMenu/Mascot/MainmenuPresenter.cs
#	Assets/Darkmatter/Code/Features/MainMenu/Mascot/MainmenuPresenter.cs.meta
#	Assets/Darkmatter/Code/Features/MainMenu/Mascot/MainmenuView.cs
#	Assets/Darkmatter/Code/Features/MainMenu/Mascot/MainmenuView.cs.meta
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuPresenter.cs
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuPresenter.cs.meta
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuView.cs
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuView.cs.meta
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuPresenter.cs
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuPresenter.cs.meta
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuView.cs
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuView.cs.meta
 2026-05-28 15:11:46 +05:45
Mausham
4064df19bc Merge remote-tracking branch 'origin/main' into work_branch 2026-05-28 15:06:05 +05:45
Mausham
01ec3bec54 fixes 2026-05-28 15:05:57 +05:45
Mausham
f1f3a35c6d Merge remote-tracking branch 'origin/main' into work_branch 2026-05-28 13:39:01 +05:45
Mausham
84fea79158 commit 2026-05-28 13:38:23 +05:45
Mausham
e5b63e158c added gui in color book scene 2026-05-28 12:35:02 +05:45