From e8da3ca6c640ecc7887a51eb7e1f0751d73b9d52 Mon Sep 17 00:00:00 2001 From: OddlyTimbot Date: Sun, 4 Aug 2024 18:00:21 -0400 Subject: [PATCH] added parallax background --- ...state-6d8e6ff1e6f20a36e0402d27c623c86c.cfg | 2 +- ...state-b6bd7a241034177d7fe082a7597ba8ea.cfg | 2 +- ...state-65637dc57c83dac3d15ec1cb22439bd7.cfg | 2 +- .../.godot/editor/create_recent.Node | 6 +- .../.godot/editor/editor_layout.cfg | 2 +- .../.godot/editor/filesystem_cache8 | 17 ++--- .../.godot/editor/filesystem_update4 | 1 - ...state-c2a7af834e91ff64325daddf58e45dc0.cfg | 6 +- ...lding-c2a7af834e91ff64325daddf58e45dc0.cfg | 2 +- ...state-cc2f727180cd42d9c13434cb55b1ce69.cfg | 4 +- .../.godot/editor/script_editor_cache.cfg | 2 +- week4/updated_project/.godot/uid_cache.bin | Bin 751 -> 706 bytes week4/updated_project/scenes/game.tscn | 65 +++++++++++------- 13 files changed, 62 insertions(+), 49 deletions(-) diff --git a/week4/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg b/week4/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg index b631069..e74f388 100644 --- a/week4/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg +++ b/week4/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg @@ -172,4 +172,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/Platform")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/TileMap")]) diff --git a/week4/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg b/week4/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg index 41c2282..04e6768 100644 --- a/week4/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg +++ b/week4/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg @@ -172,4 +172,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/Platform")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/TileMap")]) diff --git a/week4/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg b/week4/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg index 5e116cc..0ef8215 100644 --- a/week4/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg +++ b/week4/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg @@ -172,4 +172,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/Platform")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/TileMap")]) diff --git a/week4/updated_project/.godot/editor/create_recent.Node b/week4/updated_project/.godot/editor/create_recent.Node index a387969..0ea4127 100644 --- a/week4/updated_project/.godot/editor/create_recent.Node +++ b/week4/updated_project/.godot/editor/create_recent.Node @@ -1,9 +1,9 @@ -AnimationPlayer -CollisionShape2D -AnimatableBody2D Sprite2D ParallaxLayer ParallaxBackground +AnimationPlayer +CollisionShape2D +AnimatableBody2D StaticBody2D Camera2D TileMap diff --git a/week4/updated_project/.godot/editor/editor_layout.cfg b/week4/updated_project/.godot/editor/editor_layout.cfg index f03a81e..47c1daf 100644 --- a/week4/updated_project/.godot/editor/editor_layout.cfg +++ b/week4/updated_project/.godot/editor/editor_layout.cfg @@ -19,7 +19,7 @@ dock_filesystem_split=0 dock_filesystem_display_mode=0 dock_filesystem_file_sort=0 dock_filesystem_file_list_display_mode=1 -dock_filesystem_selected_paths=PackedStringArray("res://scenes/platform.tscn") +dock_filesystem_selected_paths=PackedStringArray("res://graphics/background/Additional Water.png") dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/", "res://graphics/", "res://graphics/background/") dock_3="Scene,Import" dock_4="FileSystem" diff --git a/week4/updated_project/.godot/editor/filesystem_cache8 b/week4/updated_project/.godot/editor/filesystem_cache8 index b3a9303..5b24989 100644 --- a/week4/updated_project/.godot/editor/filesystem_cache8 +++ b/week4/updated_project/.godot/editor/filesystem_cache8 @@ -1,5 +1,5 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1722285155 +::res://::1722807659 icon.svg::CompressedTexture2D::9114977118871582245::1722277386::1722277386::1::::<><>:: ::res://graphics/::1722285155 Terrain (32x32).png::CompressedTexture2D::8707534964839485024::1722277386::1722277386::1::::<><>:: @@ -17,13 +17,14 @@ player jump 48x48.png::CompressedTexture2D::1627608568707791839::1722277386::172 player land 48x48.png::CompressedTexture2D::3499637713582873633::1722277386::1722277386::1::::<><>:: ::res://graphics/Player Run/::1722277386 player run 48x48.png::CompressedTexture2D::1502492849971408816::1722277386::1722277386::1::::<><>:: -::res://scenes/::1722285264 -bullet.tscn::PackedScene::6880909734590904373::1722285264::0::1::::<><>::res://scripts/bullet.gd -character.tscn::PackedScene::451838158579532324::1722285264::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://c0iiaebonyhh0::::res://graphics/Player Idle/Player Idle 48x48.png<>uid://xgoqfqmvorcx::::res://graphics/Player Jump/player jump 48x48.png<>uid://vn23qn3f0dvc::::res://graphics/Player Run/player run 48x48.png -crate.tscn::PackedScene::41931541512830250::1722285264::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png -game.tscn::PackedScene::1738196330916037717::1722285264::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://cw50mfjp2np08::::res://graphics/background/Additional Sky.png<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://6olcj1w1svdg::::res://graphics/background/Additional Water.png<>uid://ukuu7p7vhlq::::res://scenes/crate.tscn -::res://scripts/::1722277386 +::res://scenes/::1722807322 +bullet.tscn::PackedScene::6880909734590904373::1722807322::0::1::::<><>::res://scripts/bullet.gd +character.tscn::PackedScene::451838158579532324::1722807322::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://c0iiaebonyhh0::::res://graphics/Player Idle/Player Idle 48x48.png<>uid://xgoqfqmvorcx::::res://graphics/Player Jump/player jump 48x48.png<>uid://vn23qn3f0dvc::::res://graphics/Player Run/player run 48x48.png +crate.tscn::PackedScene::41931541512830250::1722807322::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png +game.tscn::PackedScene::1738196330916037717::1722807322::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://ukuu7p7vhlq::::res://scenes/crate.tscn<>uid://dvd1p6xue0ub2::::res://scenes/platform.tscn +platform.tscn::PackedScene::8641027994130079701::1722807322::0::1::::<><>:: +::res://scripts/::1722287010 bullet.gd::GDScript::-1::1722277386::0::1::::<>Area2D<>:: -CharacterBody2D.gd::GDScript::-1::1722277386::0::1::::<>CharacterBody2D<>:: +CharacterBody2D.gd::GDScript::-1::1722287010::0::1::::<>CharacterBody2D<>:: gamecontroller.gd::GDScript::-1::1722277386::0::1::::<>Node2D<>:: Trigger.gd::GDScript::-1::1722277386::0::1::::<>Area2D<>:: diff --git a/week4/updated_project/.godot/editor/filesystem_update4 b/week4/updated_project/.godot/editor/filesystem_update4 index 5290c05..901a6f7 100644 --- a/week4/updated_project/.godot/editor/filesystem_update4 +++ b/week4/updated_project/.godot/editor/filesystem_update4 @@ -2,5 +2,4 @@ res://scenes/game.tscn res://scenes/character.tscn res://scenes/bullet.tscn res://scenes/crate.tscn -res://scripts/CharacterBody2D.gd res://scenes/platform.tscn diff --git a/week4/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/week4/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg index ffac810..b259480 100644 --- a/week4/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/week4/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-239.851, -147.52), +"ofs": Vector2(-412, -162), "primary_grid_step": Vector2i(8, 8), "show_edit_locks": true, "show_guides": true, @@ -32,7 +32,7 @@ Anim={ "snap_rotation_step": 0.261799, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 1.41421 +"zoom": 1.0 } 3D={ "fov": 70.01, @@ -172,4 +172,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/Platform")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/TileMap")]) diff --git a/week4/updated_project/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg b/week4/updated_project/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg index 8b146f6..c616045 100644 --- a/week4/updated_project/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/week4/updated_project/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("TileMap"), PackedStringArray("layer__array", "tile_set"), NodePath("level"), PackedStringArray("Transform"), NodePath("AreaTrigger"), PackedStringArray("Transform"), NodePath("Platform"), PackedStringArray("Transform")] +node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("TileMap"), PackedStringArray("layer__array", "tile_set"), NodePath("level"), PackedStringArray("Transform"), NodePath("AreaTrigger"), PackedStringArray("Transform"), NodePath("Platform"), PackedStringArray("Transform"), NodePath("ParallaxBackground/ParallaxLayer"), PackedStringArray("Motion"), NodePath("ParallaxBackground/ParallaxLayer/Sprite2D"), PackedStringArray("Transform", "texture")] resource_unfolds=["res://scenes/game.tscn::TileSet_47g5u", PackedStringArray("terrain_set_0/terrain__array", "physics_layer__array"), "res://scenes/game.tscn::WorldBoundaryShape2D_xkyim", PackedStringArray(), "res://scenes/game.tscn::CircleShape2D_x8qck", PackedStringArray("Resource")] nodes_folded=[NodePath("level"), NodePath("CharacterBody2D"), NodePath("AreaTrigger")] diff --git a/week4/updated_project/.godot/editor/platform.tscn-editstate-cc2f727180cd42d9c13434cb55b1ce69.cfg b/week4/updated_project/.godot/editor/platform.tscn-editstate-cc2f727180cd42d9c13434cb55b1ce69.cfg index ec4c3c1..ccfedda 100644 --- a/week4/updated_project/.godot/editor/platform.tscn-editstate-cc2f727180cd42d9c13434cb55b1ce69.cfg +++ b/week4/updated_project/.godot/editor/platform.tscn-editstate-cc2f727180cd42d9c13434cb55b1ce69.cfg @@ -1,7 +1,7 @@ [editor_states] Anim={ -"visible": true +"visible": false } 2D={ "grid_offset": Vector2(0, 0), @@ -172,4 +172,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/Platform")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/TileMap")]) diff --git a/week4/updated_project/.godot/editor/script_editor_cache.cfg b/week4/updated_project/.godot/editor/script_editor_cache.cfg index 3b57a53..5d47be4 100644 --- a/week4/updated_project/.godot/editor/script_editor_cache.cfg +++ b/week4/updated_project/.godot/editor/script_editor_cache.cfg @@ -18,7 +18,7 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), "column": 26, -"folded_lines": Array[int]([76, 84, 87, 93]), +"folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 53, "scroll_position": 44.0, diff --git a/week4/updated_project/.godot/uid_cache.bin b/week4/updated_project/.godot/uid_cache.bin index 366476560cf73f8c894bc9e09d81dc010186858c..b0daefa6dccbdc535bbb71d46ed95da0fa1e5e04 100644 GIT binary patch delta 38 wcmV+>0NMZV1;Pal4*&oFXVa}P)%c58ER&!D9g|A}ez64F0h7rBCX?O)8W0E$8vpiB>HMXAMB`uds4`FVQ9W$Edc*BV^?(H)@( tmq{;5EXc@AF4lKUNy#k9%+E{AQ3%ei)GNq?E7qA