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 |
|
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 |
|
|
|
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 |
|
