Commit Graph

16 Commits

Author SHA1 Message Date
Mausham
abc3df086d Merge remote-tracking branch 'origin/savya' into work_branch
# Conflicts:
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold SDF.asset
2026-06-01 18:04:29 +05:45
Mausham
1641ed6b3c added some more figures 2026-06-01 18:01:04 +05:45
Savya Bikram Shah
705d6b4825 fixes 2026-06-01 16:52:00 +05:45
Savya Bikram Shah
140a252350 Merge remote-tracking branch 'origin/work_branch' into savya
# Conflicts:
#	Assets/Darkmatter/Scenes/Colorbook.unity
2026-06-01 14:10:04 +05:45
Savya Bikram Shah
0bf6f64548 analyitcs 2026-06-01 13:38:28 +05:45
Mausham
ac0f3a458a added 5 more drawing 2026-06-01 13:29:05 +05:45
Savya Bikram Shah
8a4a84dadf adservice added 2026-05-29 19:21:13 +05:45
Savya Bikram Shah
9b2e4c915c Merge remote-tracking branch 'origin/work_branch' into savya
# Conflicts:
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold SDF.asset
2026-05-29 19:12:35 +05:45
Mausham
c6b06bb5ee added figures 2026-05-29 18:58:07 +05:45
Savya Bikram Shah
931515193a Animations added 2026-05-29 18:06:22 +05:45
Mausham
5b2a30a7f6 added dog 2026-05-29 17:49:16 +05:45
Savya Bikram Shah
2d519a37b4 fixes and confetti 2026-05-29 17:35:25 +05:45
Mausham
166128fa8f fix 2026-05-29 17:15:10 +05:45
Mausham
9e1eea664c fixes 2026-05-29 17:00:12 +05:45
Savya Bikram Shah
b4d10f62cb Shape added 2026-05-29 15:02:24 +05:45
Savya Bikram Shah
774a7159d3 Shape and coloring 2026-05-29 13:19:15 +05:45