Commit Graph

20 Commits

Author SHA1 Message Date
Mausham
9e1eea664c fixes 2026-05-29 17:00:12 +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
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
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
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
01ec3bec54 fixes 2026-05-28 15:05:57 +05:45
Mausham
e5b63e158c added gui in color book scene 2026-05-28 12:35:02 +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
Mausham
efb6cdb3e6 mainmenu completed 2026-05-27 19:02:36 +05:45