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

10
Gameplay/Actor.cs
View File

@@ -45,6 +45,7 @@ public partial class Actor : Node
{
if (_ballBag.Count > 0)
{
<<<<<<< HEAD
if (_heldBall == null)
{
_heldBall = _ballBag[0];
@@ -78,6 +79,15 @@ public partial class Actor : Node
{
_heldBall = _ballBag[ballIndex - (ballIndex > _ballBag.Count ? 1 : 0)];
}
=======
_activeCue.HideCue();
Vector2 mousePosition = GetViewport().GetMousePosition();
GetNode<Marker2D>("StartPosition").Position = mousePosition;
if (Input.IsActionJustReleased("left_click"))
{
_activeBall.Place(GetNode<Marker2D>("StartPosition").Position);
GD.Print(_activeBall.Position);
>>>>>>> 920c5c27fb732c902987b01dcc093e55b1552a9f
}
}
else