From 0c966786407d6ce444207115ea64effe9ace30be Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 00:09:48 +0200 Subject: [PATCH 1/3] idk what i changed --- Game/Assets/Scenes/cems scene.unity | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Game/Assets/Scenes/cems scene.unity b/Game/Assets/Scenes/cems scene.unity index b1cd53a..5dc4bab 100644 --- a/Game/Assets/Scenes/cems scene.unity +++ b/Game/Assets/Scenes/cems scene.unity @@ -141,11 +141,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_LocalPosition.x - value: -4.270053 + value: -2.56 objectReference: {fileID: 0} - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_LocalPosition.y - value: 0.7652666 + value: 1.91 objectReference: {fileID: 0} - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_LocalPosition.z @@ -202,11 +202,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.x - value: -4.73 + value: -6.02 objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.y - value: -2.3359 + value: -0.82 objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.z From 46c7885cabf46ee61c779a5c37826a0ff989caa3 Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 00:32:10 +0200 Subject: [PATCH 2/3] trying to figure out how to jump --- Game/.vsconfig | 6 ++++++ Game/Assets/Scripts/DropletMovement.cs | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 Game/.vsconfig diff --git a/Game/.vsconfig b/Game/.vsconfig new file mode 100644 index 0000000..f019fd0 --- /dev/null +++ b/Game/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 76b61a6..a1a0a27 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -2,11 +2,26 @@ using UnityEngine; public class DropletMovement : MonoBehaviour { +<<<<<<< Updated upstream public float moveSpeed = 5f; private Rigidbody2D rb; private Vector2 movement; +======= + private Rigidbody2D rb; + public float moveSpeed = 5f; + public float jumpingPower = 5f; + private Vector2 movement; + private Animator playerAnim; //for animation + private float xInput; + + //helper variables + private bool isGrounded = true; + [SerializeField] private float dashSpeed; + [SerializeField] private float dashDuration; + private float dashTime; +>>>>>>> Stashed changes // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() @@ -19,10 +34,15 @@ public class DropletMovement : MonoBehaviour { movement.x = Input.GetAxisRaw("Horizontal"); movement.y = Input.GetAxisRaw("Vertical"); + if (isGrounded && Input.GetKeyDown(KeyCode.Space)) + { + rb.AddForce(Vector2.up * jumpingPower, ForceMode2D.Impulse); + } } private void FixedUpdate() { rb.linearVelocity = movement.normalized * moveSpeed; } + } From 1c6c3bd110ae98cd692689dd4adc0a7d01cef95d Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 00:36:37 +0200 Subject: [PATCH 3/3] jump merge conflict idk --- Game/Assets/Scripts/DropletMovement.cs | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index a1a0a27..477e3e6 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -2,47 +2,39 @@ using UnityEngine; public class DropletMovement : MonoBehaviour { -<<<<<<< Updated upstream - - public float moveSpeed = 5f; - - private Rigidbody2D rb; - private Vector2 movement; -======= private Rigidbody2D rb; + public float moveSpeed = 5f; public float jumpingPower = 5f; + private Vector2 movement; - private Animator playerAnim; //for animation + + private Animator playerAnim; private float xInput; - //helper variables private bool isGrounded = true; + [SerializeField] private float dashSpeed; [SerializeField] private float dashDuration; private float dashTime; ->>>>>>> Stashed changes - // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { rb = GetComponent(); } - // Update is called once per frame void Update() { movement.x = Input.GetAxisRaw("Horizontal"); - movement.y = Input.GetAxisRaw("Vertical"); + if (isGrounded && Input.GetKeyDown(KeyCode.Space)) { - rb.AddForce(Vector2.up * jumpingPower, ForceMode2D.Impulse); + rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower); } } private void FixedUpdate() { - rb.linearVelocity = movement.normalized * moveSpeed; + rb.linearVelocity = new Vector2(movement.x * moveSpeed, rb.linearVelocity.y); } - -} +} \ No newline at end of file