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

savya commented 2026-05-28 12:24:36 +02:00

Owner

Copy Link

No description provided.

savya added 7 commits 2026-05-28 12:24:37 +02:00

added gui in color book scene e5b63e158c

commit 84fea79158

Merge remote-tracking branch 'origin/main' into work_branch f1f3a35c6d

fixes 01ec3bec54

Merge remote-tracking branch 'origin/main' into work_branch 4064df19bc

Merge remote-tracking branch 'origin/main' into work_branch ... 86bf52ced4

# 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

completed intro video and mainmenu scene 3f14d0b346

savya merged commit 380e8b63bd into main 2026-05-28 12:24:57 +02:00

savya referenced this issue from a commit 2026-05-28 12:24:58 +02:00

Merge pull request 'work_branch' (#7) from work_branch into main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

mausham savya

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: savya/Colorbook#7