admin/hotdesking
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04amMerge branch 'main' of https://git.cojoedmo.com/admin/hotdesking

Browse Source
This commit is contained in:
cojoedmo
2025-07-15 03:03:46 -04:00
parent 022f0948db 920c5c27fb
commit 7c81e03613
14 changed files with 18 additions and 1390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Gameplay/Battle.cs
View File

@@ -85,8 +85,13 @@ public partial class Battle : Node
}
if (BODY == _player._actor._selectedBall)
{
<<<<<<< HEAD
_player._actor._selectedBall._potted = true;
_player._actor._selectedBall._placed = false;
=======
_player._actor._activeBall._potted = true;
_player._actor._activeBall._placed = false;
>>>>>>> 920c5c27fb732c902987b01dcc093e55b1552a9f
}
else
{