savya/Colorbook
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
86bf52ced4b4e215940d6ee93c73faaf1a173e9a
Colorbook/Assets/Darkmatter/Code/Features
History
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
..
AppBoot
Intro done and event after intro
2026-05-28 15:04:47 +05:45
ColorbookFlow
fixes
2026-05-28 15:05:57 +05:45
Coloring
Scene Loading Script
2026-05-28 14:40:21 +05:45
DrawingCatalog
fixes
2026-05-28 15:05:57 +05:45
DrawingTemplate
Progression. and Drawing Catalog
2026-05-27 18:56:17 +05:45
GameplayFlow
ShapeBuilder Done
2026-05-28 13:20:36 +05:45
History
Progression. and Drawing Catalog
2026-05-27 18:56:17 +05:45
MainMenu
Merge remote-tracking branch 'origin/main' into work_branch
2026-05-28 15:11:46 +05:45
Progression
Progression. and Drawing Catalog
2026-05-27 18:56:17 +05:45
ShapeBuilder
ShapeBuilder Done
2026-05-28 13:20:36 +05:45
AppBoot.meta
ShapeBuilder Done
2026-05-28 13:20:36 +05:45
ColorbookFlow.meta
Colorbook flow and removed old code
2026-05-27 19:24:54 +05:45
Coloring.meta
Scene Loading Script
2026-05-28 14:40:21 +05:45
DrawingCatalog.meta
Progression. and Drawing Catalog
2026-05-27 18:56:17 +05:45
DrawingTemplate.meta
Progression. and Drawing Catalog
2026-05-27 18:56:17 +05:45
GameplayFlow.meta
ShapeBuilder Done
2026-05-28 13:20:36 +05:45
History.meta
added gameplay lifetimescope
2026-05-27 12:13:45 +05:45
MainMenu.meta
added simple UI
2026-05-27 15:05:26 +05:45
Progression.meta
Progression. and Drawing Catalog
2026-05-27 18:56:17 +05:45
ShapeBuilder.meta
Basic Setup For Shape Builder
2026-05-28 12:13:26 +05:45