Merge branch 'AdamLearns:main' into main

AdamLearns · Sep 5, 2024 · 82ed10b · 82ed10b
2 parents 59dd400 + f508c64
commit 82ed10b
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 240 deletions.
diff --git a/JumpRoyale/assets/sprites/backgrounds/Blue.png b/JumpRoyale/assets/sprites/backgrounds/Blue.png
diff --git a/JumpRoyale/assets/sprites/backgrounds/Blue.png.import b/JumpRoyale/assets/sprites/backgrounds/Blue.png.import
diff --git a/JumpRoyale/assets/sprites/backgrounds/Brown.png b/JumpRoyale/assets/sprites/backgrounds/Brown.png
diff --git a/JumpRoyale/assets/sprites/backgrounds/Brown.png.import b/JumpRoyale/assets/sprites/backgrounds/Brown.png.import
diff --git a/JumpRoyale/assets/sprites/backgrounds/Gray.png b/JumpRoyale/assets/sprites/backgrounds/Gray.png
diff --git a/JumpRoyale/assets/sprites/backgrounds/Gray.png.import b/JumpRoyale/assets/sprites/backgrounds/Gray.png.import
diff --git a/JumpRoyale/assets/sprites/backgrounds/Green.png b/JumpRoyale/assets/sprites/backgrounds/Green.png
diff --git a/JumpRoyale/assets/sprites/backgrounds/Green.png.import b/JumpRoyale/assets/sprites/backgrounds/Green.png.import
diff --git a/JumpRoyale/assets/sprites/backgrounds/Pink.png b/JumpRoyale/assets/sprites/backgrounds/Pink.png
diff --git a/JumpRoyale/assets/sprites/backgrounds/Pink.png.import b/JumpRoyale/assets/sprites/backgrounds/Pink.png.import
diff --git a/JumpRoyale/assets/sprites/backgrounds/Purple.png b/JumpRoyale/assets/sprites/backgrounds/Purple.png
diff --git a/JumpRoyale/assets/sprites/backgrounds/Purple.png.import b/JumpRoyale/assets/sprites/backgrounds/Purple.png.import
diff --git a/JumpRoyale/assets/sprites/backgrounds/Yellow.png b/JumpRoyale/assets/sprites/backgrounds/Yellow.png
diff --git a/JumpRoyale/assets/sprites/backgrounds/Yellow.png.import b/JumpRoyale/assets/sprites/backgrounds/Yellow.png.import
diff --git a/JumpRoyale/scenes/Arena.tscn b/JumpRoyale/scenes/Arena.tscn
@@ -7,7 +7,7 @@
 [ext_resource type="PackedScene" uid="uid://c5b384kxo0vyl" path="res://scenes/GameOverlay.tscn" id="5_5yfyu"]
 [ext_resource type="PackedScene" uid="uid://cibfccggfqmwh" path="res://scenes/EndScreenOverlay.tscn" id="6_eibxd"]
 [ext_resource type="PackedScene" uid="uid://bilf6xw44urbm" path="res://scenes/TimerOverlay.tscn" id="7_f58o7"]
-[ext_resource type="Texture2D" uid="uid://dppmxvp2mcbw3" path="res://assets/sprites/backgrounds/Blue.png" id="7_xjx8h"]
+[ext_resource type="Texture2D" uid="uid://bl5jjt55tqvyq" path="res://assets/sprites/backgrounds/Bricks.png" id="8_oquvf"]
 
 [node name="Arena" type="Node2D"]
 script = ExtResource("1_5vcv2")
@@ -62,6 +62,6 @@ grow_horizontal = 1
 [node name="Background" type="Sprite2D" parent="."]
 texture_repeat = 2
 position = Vector2(863.25, -3398.18)
-texture = ExtResource("7_xjx8h")
+texture = ExtResource("8_oquvf")
 region_enabled = true
 region_rect = Rect2(2.08165e-12, 2.08165e-12, 2500, 9000)