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 |
|
|
|
96e69c3d1a
|
Merge pull request 'work_branch' (#12) from work_branch into main
Reviewed-on: #12
|
2026-05-29 06:52:37 +02:00 |
|
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 |
|
|
|
bdac5b485f
|
Merge pull request 'Game flow and coloring done' (#11) from savya into main
Reviewed-on: #11
|
2026-05-29 06:45:39 +02:00 |
|
Savya Bikram Shah
|
b3c096a150
|
Game flow and coloring done
|
2026-05-28 19:45:15 +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 |
|
|
|
92aa1d2751
|
Merge pull request 'Refactored and Animaiton for HOlder' (#10) from savya into main
Reviewed-on: #10
|
2026-05-28 14:02:15 +02:00 |
|
Savya Bikram Shah
|
9ac752b23c
|
Refactored and Animaiton for HOlder
|
2026-05-28 17:45:58 +05:45 |
|
|
|
252c1b8a41
|
Merge pull request 'work_branch' (#9) from work_branch into main
Reviewed-on: #9
|
2026-05-28 13:24:44 +02:00 |
|
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 |
|
|
|
b16f535499
|
Merge pull request 'savya' (#8) from savya into main
Reviewed-on: #8
|
2026-05-28 13:07:38 +02:00 |
|
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 |
|
|
|
380e8b63bd
|
Merge pull request 'work_branch' (#7) from work_branch into main
Reviewed-on: #7
|
2026-05-28 12:24:55 +02:00 |
|
Savya Bikram Shah
|
d239dbd9b5
|
Loading Done
|
2026-05-28 16:08:57 +05:45 |
|
Mausham
|
3f14d0b346
|
completed intro video and mainmenu scene
|
2026-05-28 15:37:33 +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 |
|
|
|
e96fefa642
|
Merge pull request 'savya' (#6) from savya into main
Reviewed-on: #6
|
2026-05-28 11:20:23 +02:00 |
|
Savya Bikram Shah
|
0e50fa5e55
|
Intro done and event after intro
|
2026-05-28 15:04:47 +05:45 |
|
Savya Bikram Shah
|
f1b0834a72
|
Merge remote-tracking branch 'origin/main' into savya
|
2026-05-28 14:44:37 +05:45 |
|
Savya Bikram Shah
|
af5c181f32
|
Merge remote-tracking branch 'origin/main' into savya
|
2026-05-28 14:44:13 +05:45 |
|
|
|
55c243ba64
|
Merge pull request 'work_branch' (#5) from work_branch into main
Reviewed-on: #5
|
2026-05-28 10:58:48 +02:00 |
|
|
|
e6e2f65259
|
Merge pull request 'savya' (#4) from savya into main
Reviewed-on: #4
|
2026-05-28 10:56:05 +02:00 |
|
Savya Bikram Shah
|
dd6a7be1fc
|
Scene Loading Script
|
2026-05-28 14:40:21 +05:45 |
|
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 |
|
Mausham
|
84fea79158
|
commit
|
2026-05-28 13:38:23 +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 |
|
|
|
874c18df1c
|
Merge pull request 'savya' (#3) from savya into main
Reviewed-on: #3
|
2026-05-28 08:29:24 +02:00 |
|
Savya Bikram Shah
|
3c2e486529
|
Basic Setup For Shape Builder
|
2026-05-28 12:13:26 +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
|
a0cedfe9fb
|
mainmenu completed
|
2026-05-27 20:18:59 +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 |
|
|
|
f0feeab69c
|
Merge pull request 'savya' (#2) from savya into main
Reviewed-on: #2
|
2026-05-27 15:41:45 +02:00 |
|
Savya Bikram Shah
|
14bffd1492
|
Colorbook flow and removed old code
|
2026-05-27 19:24:54 +05:45 |
|
Savya Bikram Shah
|
43584fade0
|
Comment removce
|
2026-05-27 19:08:09 +05:45 |
|
Mausham
|
efb6cdb3e6
|
mainmenu completed
|
2026-05-27 19:02:36 +05:45 |
|
Savya Bikram Shah
|
93950e8bc6
|
Progression. and Drawing Catalog
|
2026-05-27 18:56:17 +05:45 |
|
