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

Gameplay/Actor.cs

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

Gameplay/Ball.cs

@@ -46,6 +46,7 @@ public partial class Ball : RigidBody2D
 		}
 		else if (LinearVelocity.Length() >= _moveThreshold)
 		{
+			GD.Print(Position);
 			if (!_moving)
 			{
 				_moving = true;

Gameplay/Battle.cs

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

Gameplay/actor.tscn

@@ -4,3 +4,5 @@
 
 [node name="Actor" type="Node"]
 script = ExtResource("1_hr3hk")
+
+[node name="StartPosition" type="Marker2D" parent="."]

addons/godot-git-plugin/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2016-2023 The Godot Engine community
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

addons/godot-git-plugin/git_plugin.gdextension

@@ -1,12 +0,0 @@
-[configuration]
-
-entry_symbol = "git_plugin_init"
-compatibility_minimum = "4.1.0"
-
-[libraries]
-
-macos.editor = "macos/libgit_plugin.macos.editor.universal.dylib"
-windows.editor.x86_64 = "win64/libgit_plugin.windows.editor.x86_64.dll"
-linux.editor.x86_64 = "linux/libgit_plugin.linux.editor.x86_64.so"
-linux.editor.arm64 = "linux/libgit_plugin.linux.editor.arm64.so"
-linux.editor.rv64 = ""

addons/godot-git-plugin/git_plugin.gdextension.uid

@@ -1 +0,0 @@
-uid://bhdyd6xrovc6

addons/godot-git-plugin/plugin.cfg

@@ -1,7 +0,0 @@
-[plugin]
-
-name="Godot Git Plugin"
-description="This plugin lets you interact with Git without leaving the Godot editor. More information can be found at https://github.com/godotengine/godot-git-plugin/wiki"
-author="twaritwaikar"
-version="v3.1.1"
-script="godot-git-plugin.gd"