Commit Graph

100 Commits

Author SHA1 Message Date
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
82386cae08 fixes 2026-06-01 14:09:51 +05:45
Mausham
0c39c1a229 some fixes 2026-06-01 14:09:33 +05:45
Savya Bikram Shah
e821d4e65e background fixes 2026-06-01 14:06:28 +05:45
Mausham
d700760524 some additional fixes 2026-06-01 14:00:54 +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
6f79bcd018 fixes, improvements. firebase 2026-06-01 13:15:40 +05:45
Savya Bikram Shah
384176fdcc fxies 2026-06-01 12:22:47 +05:45
Savya Bikram Shah
5c7a9f38a9 Responsiveness 2026-06-01 11:36:41 +05:45
Savya Bikram Shah
113b82bd46 fixes 2026-05-29 20:58:40 +05:45
Savya Bikram Shah
3e5ff544bf fixes 2026-05-29 20:31:37 +05:45
Savya Bikram Shah
b74af8867e Minor Fix 2026-05-29 20:04:53 +05:45
Savya Bikram Shah
b669bcc0e0 ads added 2026-05-29 20:02:46 +05:45
Savya Bikram Shah
9b6100b5bb Minor fixes 2026-05-29 19:53:09 +05:45
Savya Bikram Shah
f51286468a fixes 2026-05-29 19:47:45 +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
Savya Bikram Shah
84689a6755 audio fixes 2026-05-29 19:12:23 +05:45
Savya Bikram Shah
41c9969996 Audio fixes 2026-05-29 19:07:21 +05:45
Mausham
c6b06bb5ee added figures 2026-05-29 18:58:07 +05:45
Savya Bikram Shah
0b22ed6d09 Music and transparent fixes 2026-05-29 18:42:12 +05:45
Savya Bikram Shah
47fb204446 artbook added to drawing 2026-05-29 18:28:06 +05:45
Savya Bikram Shah
676b389244 Artt book tweaks 2026-05-29 18:20:25 +05:45
Savya Bikram Shah
931515193a Animations added 2026-05-29 18:06:22 +05:45
Mausham
02a58a1652 Merge remote-tracking branch 'origin/savya' into work_branch 2026-05-29 17:49:28 +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
Savya Bikram Shah
67c8507fd6 fix 2026-05-29 17:18:25 +05:45
Mausham
386760842c Merge remote-tracking branch 'origin/savya' into work_branch 2026-05-29 17:15:14 +05:45
Mausham
166128fa8f fix 2026-05-29 17:15:10 +05:45
Savya Bikram Shah
940fed41be snap fix 2026-05-29 17:14:51 +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
6872158d2d Minor fix 2026-05-29 16:24:50 +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
c899da030a fix 2026-05-29 16:23:16 +05:45
Mausham
e63fea3712 added confitte 2026-05-29 16:22:45 +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