diff --git a/Game_4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.stex b/Game_4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.stex deleted file mode 100644 index c133fd4..0000000 Binary files a/Game_4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.stex and /dev/null differ diff --git a/Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.md5 b/Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.md5 new file mode 100644 index 0000000..c543f2c --- /dev/null +++ b/Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.md5 @@ -0,0 +1,3 @@ +source_md5="9c64c312fe0c5859c87280aebe19b452" +dest_md5="7e50e59190bf14295c7cbedc26ee3b24" + diff --git a/Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.stex b/Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.stex new file mode 100644 index 0000000..bc3dc9a Binary files /dev/null and b/Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.stex differ diff --git a/Game_4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.stex b/Game_4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.stex deleted file mode 100644 index b78c6b0..0000000 Binary files a/Game_4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.stex and /dev/null differ diff --git a/Game_4/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.md5 b/Game_4/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.md5 new file mode 100644 index 0000000..5d07b18 --- /dev/null +++ b/Game_4/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.md5 @@ -0,0 +1,3 @@ +source_md5="8fad288d82d0e9d24f41f65f4d5e4301" +dest_md5="a9d8bb2f96bc788ab0d7fc16f125c927" + diff --git a/Game_4/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.stex b/Game_4/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.stex new file mode 100644 index 0000000..0d2327c Binary files /dev/null and b/Game_4/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.stex differ diff --git a/Game_4/scenes/floor.tscn b/Game_4/scenes/floor.tscn index cb4a451..248ee3b 100644 --- a/Game_4/scenes/floor.tscn +++ b/Game_4/scenes/floor.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://sprites/floor.png" type="Texture" id=1] +[ext_resource path="res://sprites/floor.svg" type="Texture" id=1] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 960, 24 ) diff --git a/Game_4/scenes/game.tscn b/Game_4/scenes/game.tscn index efe7e23..5633655 100644 --- a/Game_4/scenes/game.tscn +++ b/Game_4/scenes/game.tscn @@ -9,3 +9,7 @@ script = ExtResource( 2 ) [node name="floor" parent="." instance=ExtResource( 1 )] position = Vector2( 960, 1056 ) scale = Vector2( 2, 1 ) + +[node name="floor2" parent="." instance=ExtResource( 1 )] +position = Vector2( 960, -24 ) +scale = Vector2( 2, 1 ) diff --git a/Game_4/scenes/main_menu.tscn b/Game_4/scenes/main_menu.tscn index 7ee8d1e..939bad0 100644 --- a/Game_4/scenes/main_menu.tscn +++ b/Game_4/scenes/main_menu.tscn @@ -7,6 +7,9 @@ anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 2 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="multiplayer_configure" type="Control" parent="."] anchor_right = 1.0 diff --git a/Game_4/scenes/player.tscn b/Game_4/scenes/player.tscn index c0e1d89..9838403 100644 --- a/Game_4/scenes/player.tscn +++ b/Game_4/scenes/player.tscn @@ -1,18 +1,20 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://sprites/sphere.png" type="Texture" id=1] +[ext_resource path="res://sprites/square.svg" type="Texture" id=1] [ext_resource path="res://code/player.gd" type="Script" id=2] -[sub_resource type="CircleShape2D" id=1] -radius = 45.7813 +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 16, 16 ) [node name="player" type="KinematicBody2D"] script = ExtResource( 2 ) -[node name="sphere" type="Sprite" parent="."] +[node name="square" type="Sprite" parent="."] +scale = Vector2( 2.5, 2.5 ) texture = ExtResource( 1 ) -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +[node name="CollisionShape2D2" type="CollisionShape2D" parent="."] +scale = Vector2( 2.5, 2.5 ) shape = SubResource( 1 ) [node name="Tween" type="Tween" parent="."] diff --git a/Game_4/sprites/floor.png b/Game_4/sprites/floor.png deleted file mode 100644 index 54a017f..0000000 Binary files a/Game_4/sprites/floor.png and /dev/null differ diff --git a/Game_4/sprites/floor.svg b/Game_4/sprites/floor.svg new file mode 100644 index 0000000..37a5ab5 --- /dev/null +++ b/Game_4/sprites/floor.svg @@ -0,0 +1,51 @@ + + + + + + + + + + diff --git a/Game_4/sprites/floor.png.import b/Game_4/sprites/floor.svg.import similarity index 72% rename from Game_4/sprites/floor.png.import rename to Game_4/sprites/floor.svg.import index e6a0775..0760c7b 100644 --- a/Game_4/sprites/floor.png.import +++ b/Game_4/sprites/floor.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/floor.png-8870646e23ec8c3ad77089faabc9e773.stex" +path="res://.import/floor.svg-297905206d682966af5dba035b7d5368.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/floor.png" -dest_files=[ "res://.import/floor.png-8870646e23ec8c3ad77089faabc9e773.stex" ] +source_file="res://sprites/floor.svg" +dest_files=[ "res://.import/floor.svg-297905206d682966af5dba035b7d5368.stex" ] [params] diff --git a/Game_4/sprites/sphere.png b/Game_4/sprites/sphere.png deleted file mode 100644 index aaacead..0000000 Binary files a/Game_4/sprites/sphere.png and /dev/null differ diff --git a/Game_4/sprites/square.svg b/Game_4/sprites/square.svg new file mode 100644 index 0000000..28672e8 --- /dev/null +++ b/Game_4/sprites/square.svg @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/Game_4/sprites/sphere.png.import b/Game_4/sprites/square.svg.import similarity index 72% rename from Game_4/sprites/sphere.png.import rename to Game_4/sprites/square.svg.import index 9003d8a..f89d0fe 100644 --- a/Game_4/sprites/sphere.png.import +++ b/Game_4/sprites/square.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/sphere.png-b735a7d58a47546099ef1144a282cd43.stex" +path="res://.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/sphere.png" -dest_files=[ "res://.import/sphere.png-b735a7d58a47546099ef1144a282cd43.stex" ] +source_file="res://sprites/square.svg" +dest_files=[ "res://.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.stex" ] [params]