savya/Colorbook
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99 Commits 3 Branches 0 Tags
931515193a19d0f8523f697661873401cc88c5c7
Commit Graph

48 Commits

Author SHA1 Message Date
Savya Bikram Shah
931515193a Animations added 2026-05-29 18:06:22 +05:45
Savya Bikram Shah
2d519a37b4 fixes and confetti 2026-05-29 17:35:25 +05:45
Savya Bikram Shah
67c8507fd6 fix 2026-05-29 17:18:25 +05:45
Mausham
166128fa8f fix 2026-05-29 17:15:10 +05:45
Mausham
aa51dd3882 Merge remote-tracking branch 'origin/savya' into work_branch 2026-05-29 17:00:27 +05:45
Mausham
9e1eea664c fixes 2026-05-29 17:00:12 +05:45
Savya Bikram Shah
f970210e64 fixes 2026-05-29 16:57:24 +05:45
Savya Bikram Shah
b39d2a798c Merge remote-tracking branch 'origin/work_branch' into savya 
# Conflicts:
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold SDF.asset
#	Assets/Darkmatter/Scenes/GamePlay.unity
 2026-05-29 16:23:31 +05:45
Savya Bikram Shah
44bdb3286c fixes 2026-05-29 16:17:55 +05:45
Savya Bikram Shah
6c14eaaacf scene fix 2026-05-29 15:38:59 +05:45
Mausham
c57189de80 added confetti 2026-05-29 15:11:55 +05:45
Mausham
75b34c6ef7 Merge remote-tracking branch 'origin/savya' into work_branch 
# Conflicts:
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-Bold SDF Blue Outline.asset
 2026-05-29 15:03:52 +05:45
Mausham
75fae9e76c added particles 2026-05-29 15:03:29 +05:45
Savya Bikram Shah
b4d10f62cb Shape added 2026-05-29 15:02:24 +05:45
Savya Bikram Shah
7a4bd29b57 Merge remote-tracking branch 'origin/main' into savya 
# Conflicts:
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-Bold SDF Blue Outline.asset
 2026-05-29 14:26:23 +05:45
Savya Bikram Shah
b78678a6d8 image save/load 2026-05-29 14:24:36 +05:45
Mausham
6d9b096e8e added anim 2026-05-29 14:24:03 +05:45
Savya Bikram Shah
774a7159d3 Shape and coloring 2026-05-29 13:19:15 +05:45
Mausham
919169157e added some features in artbook 2026-05-29 12:47:21 +05:45
Mausham
a51a73efdd fixess 2026-05-29 10:37:07 +05:45
Mausham
3914adaa84 Merge remote-tracking branch 'origin/main' into work_branch 
# Conflicts:
#	Assets/Darkmatter/Code/Features/ColorbookFlow/Features.Colorbook.asmdef
#	Assets/Darkmatter/Code/Features/ColorbookFlow/System/ColorbookFlowController.cs
 2026-05-29 10:35:04 +05:45
Mausham
4e8f2ae7ad fixes 2026-05-29 10:31:14 +05:45
Mausham
9899a8b549 code added for Artbook 2026-05-28 18:48:08 +05:45
Mausham
820f614415 some additional fixes 2026-05-28 18:32:14 +05:45
Savya Bikram Shah
9ac752b23c Refactored and Animaiton for HOlder 2026-05-28 17:45:58 +05:45
Mausham
f9a2532495 Fixes 2026-05-28 17:09:12 +05:45
Mausham
e6b6683feb Merge remote-tracking branch 'origin/main' into work_branch 2026-05-28 16:54:28 +05:45
Mausham
9ad3c34099 rearranged UI 2026-05-28 16:52:36 +05:45
Savya Bikram Shah
09ad3469f2 Loading finalized 2026-05-28 16:52:06 +05:45
Savya Bikram Shah
98fbad9233 Merge remote-tracking branch 'origin/work_branch' into savya 
# Conflicts:
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-Bold SDF.asset
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-Medium SDF.asset
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold SDF.asset
 2026-05-28 16:10:23 +05:45
Savya Bikram Shah
d239dbd9b5 Loading Done 2026-05-28 16:08:57 +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
Savya Bikram Shah
0e50fa5e55 Intro done and event after intro 2026-05-28 15:04:47 +05:45
savya
55c243ba64 Merge pull request 'work_branch' (#5) from work_branch into main 
Reviewed-on: #5
 2026-05-28 10:58:48 +02:00
Savya Bikram Shah
e0e7601c27 Intro done and bug fix 2026-05-28 14:19:06 +05:45
Mausham
f1f3a35c6d Merge remote-tracking branch 'origin/main' into work_branch 2026-05-28 13:39:01 +05:45
Savya Bikram Shah
b38f4d592c ShapeBuilder Done 2026-05-28 13:20:36 +05:45
Mausham
e5b63e158c added gui in color book scene 2026-05-28 12:35:02 +05:45
Savya Bikram Shah
9f9d51c22c Signals Created 2026-05-28 10:49:58 +05:45
Mausham
1af242bebd fixes 2026-05-28 10:31:35 +05:45
Mausham
17770a9ab3 Merge remote-tracking branch 'origin/main' into work_branch 
# Conflicts:
#	Packages/manifest.json
 2026-05-27 19:54:47 +05:45
Mausham
c1118b3271 ignore 2026-05-27 19:39:26 +05:45
Savya Bikram Shah
14bffd1492 Colorbook flow and removed old code 2026-05-27 19:24:54 +05:45
Mausham
efb6cdb3e6 mainmenu completed 2026-05-27 19:02:36 +05:45
Mausham
d51ec3eaa7 added simple UI 2026-05-27 15:05:26 +05:45
Savya Bikram Shah
0b4aeb8fd8 Added BaseLifetimescope and gameplay scene 2026-05-26 18:59:54 +05:45