70 Commits

Author SHA1 Message Date
b002f8e021 Merge branch 'Gameplay/main-gameplay' into Gameplay/ashby-gameplay 2026-01-30 21:53:20 +05:30
e57be039ff Game over flow changes. 2026-01-30 21:51:33 +05:30
f2d9a7f7cc Merge remote-tracking branch 'origin/UI/main-ui' into UI/siva-ui
# Conflicts:
#	Assets/Prefabs/UI/Player V AI Popup .prefab
#	Assets/Scripts/UI/Pages/PopUp/PvAIModePopup.cs
2026-01-30 21:47:28 +05:30
41c2fdbee5 PvP & PvBot changes. 2026-01-30 19:14:08 +05:30
d20503fd9b Added player count visual updates 2026-01-30 19:04:14 +05:30
9afdacde72 Added color selection to P v AI mode. 2026-01-30 14:13:52 +05:30
45699adcc8 Added additional safe tile logic. 2026-01-30 13:54:19 +05:30
f7c2f4c612 Merge remote-tracking branch 'origin/Gameplay/main-gameplay' into Gameplay/siva-gameplay 2026-01-30 13:33:07 +05:30
9eef3eb04c Merge branch 'Gameplay/ashby-gameplay' into Gameplay/main-gameplay
# Conflicts:
#	Assets/External-Assets/packages/Project/Scripts/Gameplay/Snake and Ladder/DiceView.cs
#	Assets/Scripts/Gameplay/GameplayManager.cs
#	Assets/Scripts/Input/DiceRollHandler.cs
2026-01-30 12:57:17 +05:30
14d4a562a4 New dice logic + fixes. 2026-01-30 12:54:43 +05:30
c42db86e28 Merge remote-tracking branch 'origin/Gameplay/main-gameplay' into Gameplay/siva-gameplay 2026-01-30 11:36:37 +05:30
253b5affc3 Merge branch 'UI/ashby-ui' into UI/main-ui
# Conflicts:
#	Assets/Scripts/UI/Pages/PopUp/PvPModePopup.cs
2026-01-30 11:32:51 +05:30
6f374f0d21 Added logic for connecting pvp and bot ui with gameplay. 2026-01-30 11:30:40 +05:30
6e74d05851 Highlight selected button in P v AI Mode selection 2026-01-30 11:28:19 +05:30
47880ef652 Added Game Mode UI Prefab with selection updates
- On PVP, Player can now chose color
2026-01-30 11:08:44 +05:30
9af9ac09fb Refactored changes along with flow updations/ 2026-01-30 09:35:31 +05:30
224c29f19d Merge remote-tracking branch 'origin/Gameplay/main-gameplay' into Gameplay/siva-gameplay 2026-01-29 22:18:02 +05:30
f8eed62a9f Refix: Dice roll. 2026-01-29 22:16:54 +05:30
d2cfc4ad4a Merge remote-tracking branch 'origin/Gameplay/main-gameplay' into Gameplay/siva-gameplay 2026-01-29 21:37:32 +05:30
4fd71569ef Hotfix: Dice rolling. 2026-01-29 21:36:23 +05:30
78fce93bec Added Game Icon 2026-01-29 21:21:05 +05:30
c3ab5552ea Added logic for switching player when player gets six through rolling dice 3 times. 2026-01-29 21:15:48 +05:30
a291dff121 Safe Zone visual 2026-01-29 20:24:16 +05:30
384356dc51 Merge branch 'Gameplay/main-gameplay' into Gameplay/ashby-gameplay 2026-01-29 20:01:07 +05:30
1f10a0a52e Fix: Bot repeating upon 6 rolled upon. 2026-01-29 19:59:17 +05:30
be79221cbd Fixes: Player data is still cached after leaving end index of general tiles, 2026-01-29 19:48:25 +05:30
025b13a400 Fix: Completed players turn issue. 2026-01-29 18:44:41 +05:30
874e44a7f7 Attached few SFX and added prefab to show player count 2026-01-29 18:34:30 +05:30
87d99d03a4 Added More Audio Clips 2026-01-29 18:32:07 +05:30
4b2720759c Fix: Attacking logic for multiple pawns in the same tile. 2026-01-29 18:13:07 +05:30
f86216c729 Merge branch 'Gameplay/main-gameplay' into Gameplay/ashby-gameplay 2026-01-29 16:20:55 +05:30
eecba2779b Added safe zone sprite 2026-01-29 16:17:34 +05:30
aaaf88c72a Refactored changes. 2026-01-29 16:17:19 +05:30
eb6295bee3 Added Player Visuals
- Added character
- Linked animation
- Player rotation based on next tile
2026-01-29 15:54:13 +05:30
d247307e51 Bot and player bug fixes.
Fixes for selecting wrong player, switching player.
2026-01-29 15:45:49 +05:30
d93ffe6fad Fix: AI's not aligning properly in safe zone. 2026-01-28 22:00:39 +05:30
5a90b0961c Merge branch 'main' into feature/main-gameplay 2026-01-28 21:01:49 +05:30
bc552e57ff Removed project folder. 2026-01-28 20:59:08 +05:30
67b6da28c0 Bug Fixes: AI. 2026-01-28 20:57:35 +05:30
20513808e9 Added Dice 2026-01-28 20:46:45 +05:30
1084e5dd08 Merge branch 'main' into feature/main-gameplay 2026-01-28 17:41:09 +05:30
f06062dfec Added Visuals to Game Scene 2026-01-28 17:37:33 +05:30
031b3201c6 Fixes for AI logic. 2026-01-28 17:34:06 +05:30
675dc73ae7 Merge branch 'main' into feature/main-gameplay 2026-01-28 16:58:46 +05:30
32b7069b8f Changes for AI logic. 2026-01-28 16:57:27 +05:30
aa1592ea9f Added Sound Manager and gave vol Control. 2026-01-28 16:54:37 +05:30
bdc4b2feb7 Added Pause Menu and In-Game HUDS 2026-01-28 15:54:35 +05:30
0edcb2b491 Added Audio Clips 2026-01-28 15:50:00 +05:30
ab7217ce5b Merge remote-tracking branch 'origin/feature/main-ui' into feature/siva-ui 2026-01-28 09:20:56 +05:30
bfa63f0e8f Changes for bot logic. 2026-01-27 20:55:55 +05:30