From e3c06953a1ca35b4e1868243dc444e8a3c406029 Mon Sep 17 00:00:00 2001 From: Aaron Mahan Date: Sat, 28 Nov 2020 17:02:08 -0700 Subject: [PATCH] Create csproj & sln, update main scene file. - csproj & sln need to exist and be under source control in order for the game to be runnable from different branches. - Recreate csproj & sln files by attaching a test C# script to the main scene, then delete the test script afterward. - Create a gitignore that explicitly excludes csproj & sln from being ignored. --- .gitignore | 2 ++ coa.csproj | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ coa.sln | 19 ++++++++++++++++ main.tscn | 34 +++++++++++++-------------- 4 files changed, 105 insertions(+), 17 deletions(-) create mode 100644 .gitignore create mode 100644 coa.csproj create mode 100644 coa.sln diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..91b2961 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +!*.csproj +!*.sln diff --git a/coa.csproj b/coa.csproj new file mode 100644 index 0000000..207533e --- /dev/null +++ b/coa.csproj @@ -0,0 +1,67 @@ + + + + Debug + AnyCPU + {DCAAD19B-C08C-4F81-9ABF-62976EB0B26E} + Library + .mono/temp/bin/$(Configuration) + coa + coa + v4.7 + 1.0.0.0 + .mono/temp/obj + $(BaseIntermediateOutputPath)/$(Configuration) + Debug + Release + + + true + portable + false + $(GodotDefineConstants);GODOT;DEBUG; + prompt + 4 + false + + + portable + true + $(GodotDefineConstants);GODOT; + prompt + 4 + false + + + true + portable + false + $(GodotDefineConstants);GODOT;DEBUG;TOOLS; + prompt + 4 + false + + + + 1.0.0 + All + + + $(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharp.dll + False + + + $(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/GodotSharpEditor.dll + False + + + + + + + + + + + + \ No newline at end of file diff --git a/coa.sln b/coa.sln new file mode 100644 index 0000000..25402a9 --- /dev/null +++ b/coa.sln @@ -0,0 +1,19 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "coa", "coa.csproj", "{DCAAD19B-C08C-4F81-9ABF-62976EB0B26E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + ExportDebug|Any CPU = ExportDebug|Any CPU + ExportRelease|Any CPU = ExportRelease|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DCAAD19B-C08C-4F81-9ABF-62976EB0B26E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DCAAD19B-C08C-4F81-9ABF-62976EB0B26E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DCAAD19B-C08C-4F81-9ABF-62976EB0B26E}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU + {DCAAD19B-C08C-4F81-9ABF-62976EB0B26E}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU + {DCAAD19B-C08C-4F81-9ABF-62976EB0B26E}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU + {DCAAD19B-C08C-4F81-9ABF-62976EB0B26E}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU + EndGlobalSection +EndGlobal diff --git a/main.tscn b/main.tscn index 1dc319a..713e2cb 100644 --- a/main.tscn +++ b/main.tscn @@ -169,28 +169,28 @@ extents = Vector2( 960, 64 ) [sub_resource type="RectangleShape2D" id=33] extents = Vector2( 960, 64 ) -[sub_resource type="RectangleShape2D" id=38] +[sub_resource type="RectangleShape2D" id=34] extents = Vector2( 960, 1920 ) -[sub_resource type="RectangleShape2D" id=39] +[sub_resource type="RectangleShape2D" id=35] extents = Vector2( 960, 64 ) -[sub_resource type="RectangleShape2D" id=40] +[sub_resource type="RectangleShape2D" id=36] extents = Vector2( 960, 64 ) -[sub_resource type="RectangleShape2D" id=41] +[sub_resource type="RectangleShape2D" id=37] extents = Vector2( 960, 64 ) -[sub_resource type="RectangleShape2D" id=42] +[sub_resource type="RectangleShape2D" id=38] extents = Vector2( 960, 64 ) -[sub_resource type="RectangleShape2D" id=43] +[sub_resource type="RectangleShape2D" id=39] extents = Vector2( 64, 4288 ) -[sub_resource type="RectangleShape2D" id=44] +[sub_resource type="RectangleShape2D" id=40] extents = Vector2( 64, 4288 ) -[sub_resource type="RectangleShape2D" id=45] +[sub_resource type="RectangleShape2D" id=41] extents = Vector2( 63.9966, 960 ) [node name="Main Scene" type="Node2D"] @@ -216,7 +216,7 @@ __meta__ = { scale = Vector2( 8, 8 ) frames = SubResource( 26 ) animation = "player_idle_left" -frame = 3 +frame = 2 playing = true [node name="Camera2D" type="Camera2D" parent="Player" groups=[ @@ -412,7 +412,7 @@ tile_data = PoolIntArray( -3735549, 2, 0, 131072, 23, 0, 131073, 22, 0, 131074, ]] visible = false position = Vector2( 960, 2176 ) -shape = SubResource( 38 ) +shape = SubResource( 34 ) [node name="Lower Cliffs Top Ground Static Collider" type="StaticBody2D" parent="Lower Cliffs" groups=[ "Cliffs", @@ -430,7 +430,7 @@ collision_mask = 29 "Ground", ]] position = Vector2( 0, -1856 ) -shape = SubResource( 39 ) +shape = SubResource( 35 ) one_way_collision = true [node name="Lower Cliffs Top Ground Area Collider" type="Area2D" parent="Lower Cliffs" groups=[ @@ -446,7 +446,7 @@ collision_mask = 29 "Ground", ]] position = Vector2( 960, 320 ) -shape = SubResource( 40 ) +shape = SubResource( 36 ) [node name="Lower Cliffs Bottom Ground Static Collider" type="StaticBody2D" parent="Lower Cliffs" groups=[ "Cliffs", @@ -462,7 +462,7 @@ collision_mask = 29 "Ground", ]] position = Vector2( 960, 4032 ) -shape = SubResource( 41 ) +shape = SubResource( 37 ) one_way_collision = true [node name="Lower Cliffs Bottom Ground Area Collider" type="Area2D" parent="Lower Cliffs" groups=[ @@ -478,7 +478,7 @@ collision_mask = 29 "Ground", ]] position = Vector2( 960, 4160 ) -shape = SubResource( 42 ) +shape = SubResource( 38 ) [node name="Scene Boundary - Left" type="StaticBody2D" parent="."] visible = false @@ -492,7 +492,7 @@ __meta__ = { [node name="CollisionShape2D" type="CollisionShape2D" parent="Scene Boundary - Left"] position = Vector2( 128, -192 ) -shape = SubResource( 43 ) +shape = SubResource( 39 ) [node name="Scene Boundary - Right" type="StaticBody2D" parent="."] visible = false @@ -505,7 +505,7 @@ __meta__ = { [node name="CollisionShape2D" type="CollisionShape2D" parent="Scene Boundary - Right"] position = Vector2( 1984, -64 ) -shape = SubResource( 44 ) +shape = SubResource( 40 ) [node name="Scene Boundary - Top" type="StaticBody2D" parent="."] visible = false @@ -519,7 +519,7 @@ __meta__ = { [node name="CollisionShape2D" type="CollisionShape2D" parent="Scene Boundary - Top"] position = Vector2( 960, -4288 ) rotation = 1.5708 -shape = SubResource( 45 ) +shape = SubResource( 41 ) [connection signal="timeout" from="Player/ClimbingReadyTimer" to="Player" method="_OnClimbingReadyTimerTimeout"] [connection signal="area_entered" from="Upper Cliffs" to="Upper Cliffs" method="_on_cliffs_area_entered"] [connection signal="area_exited" from="Upper Cliffs" to="Upper Cliffs" method="_on_cliffs_area_exited"]