diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8508714 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +# Created by https://www.gitignore.io/api/godot +# Edit at https://www.gitignore.io/?templates=godot + +### Godot ### + +# Godot-specific ignores +.import/ +export.cfg +export_presets.cfg + +# Mono-specific ignores +.mono/ + +# End of https://www.gitignore.io/api/godot diff --git a/export_presets.cfg b/export_presets.cfg deleted file mode 100644 index 11dbd85..0000000 --- a/export_presets.cfg +++ /dev/null @@ -1,113 +0,0 @@ -[preset.0] - -name="Windows Desktop" -platform="Windows Desktop" -runnable=true -custom_features="" -export_filter="scenes" -export_files=PoolStringArray( "res://Credits.tscn", "res://Generic.tscn", "res://backgroubd.tscn", "res://main.tscn", "res://obstacal.tscn", "res://obstacles/Large_rock2.tscn", "res://obstacles/crystal_4.tscn", "res://obstacles/crystal_5.tscn", "res://obstacles/fly_1.tscn", "res://obstacles/fly_2.tscn", "res://obstacles/fly_3.tscn", "res://obstacles/fly_4.tscn", "res://obstacles/fly_5.tscn", "res://obstacles/fly_6.tscn", "res://obstacles/fly_7.tscn", "res://obstacles/fly_8.tscn", "res://obstacles/hill_1.tscn", "res://obstacles/hill_11.tscn", "res://obstacles/hill_2.tscn", "res://obstacles/hill_3.tscn", "res://obstacles/hill_4.tscn", "res://obstacles/hill_5.tscn", "res://obstacles/hill_7.tscn", "res://obstacles/hill_8.tscn", "res://obstacles/icicle_1.tscn", "res://obstacles/large_rock_1.tscn", "res://obstacles/pairs/1.tscn", "res://obstacles/pairs/10.tscn", "res://obstacles/pairs/11.tscn", "res://obstacles/pairs/12.tscn", "res://obstacles/pairs/13.tscn", "res://obstacles/pairs/14.tscn", "res://obstacles/pairs/15.tscn", "res://obstacles/pairs/2.tscn", "res://obstacles/pairs/3.tscn", "res://obstacles/pairs/4.tscn", "res://obstacles/pairs/5.tscn", "res://obstacles/pairs/6.tscn", "res://obstacles/pairs/7.tscn", "res://obstacles/pairs/8.tscn", "res://obstacles/pairs/9.tscn", "res://obstacles/stalacitie_2.tscn", "res://obstacles/stalacitie_5.tscn", "res://obstacles/stalactite_1.tscn", "res://obstacles/stalcitite_4_2.tscn", "res://obstacles/top_1a.tscn", "res://obstacles/top_1b.tscn", "res://obstacles/top_c1.tscn", "res://obstacles/tree_5.tscn", "res://player.tscn", "res://spawner.tscn" ) -include_filter="" -exclude_filter="" -export_path="/home/daniel/Documents/Hackathon demo/Hackathon Demo.exe" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" - -[preset.0.options] - -texture_format/bptc=false -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false -texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -custom_template/release="" -custom_template/debug="" -application/icon="" -application/file_version="" -application/product_version="" -application/company_name="" -application/product_name="" -application/file_description="" -application/copyright="" -application/trademarks="" - -[preset.1] - -name="Mac OSX" -platform="Mac OSX" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="/home/daniel/Documents/Hackathon demo/Hackathon Demo.zip" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" - -[preset.1.options] - -custom_package/debug="" -custom_package/release="" -application/name="" -application/info="Made with Godot Engine" -application/icon="" -application/identifier="" -application/signature="" -application/short_version="1.0" -application/version="1.0" -application/copyright="" -display/high_res=false -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false - -[preset.2] - -name="Linux/X11" -platform="Linux/X11" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="/home/daniel/Documents/Hackathon demo/Hackathon Demo.x86_64" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" - -[preset.2.options] - -texture_format/bptc=false -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false -texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -custom_template/release="" -custom_template/debug="" - -[preset.3] - -name="HTML5" -platform="HTML5" -runnable=true -custom_features="" -export_filter="scenes" -export_files=PoolStringArray( "res://Credits.tscn", "res://Generic.tscn", "res://backgroubd.tscn", "res://main.tscn", "res://obstacal.tscn", "res://obstacles/Large_rock2.tscn", "res://obstacles/crystal_4.tscn", "res://obstacles/crystal_5.tscn", "res://obstacles/fly_1.tscn", "res://obstacles/fly_2.tscn", "res://obstacles/fly_3.tscn", "res://obstacles/fly_4.tscn", "res://obstacles/fly_5.tscn", "res://obstacles/fly_6.tscn", "res://obstacles/fly_7.tscn", "res://obstacles/fly_8.tscn", "res://obstacles/hill_1.tscn", "res://obstacles/hill_11.tscn", "res://obstacles/hill_2.tscn", "res://obstacles/hill_3.tscn", "res://obstacles/hill_4.tscn", "res://obstacles/hill_5.tscn", "res://obstacles/hill_7.tscn", "res://obstacles/hill_8.tscn", "res://obstacles/icicle_1.tscn", "res://obstacles/large_rock_1.tscn", "res://obstacles/pairs/1.tscn", "res://obstacles/pairs/10.tscn", "res://obstacles/pairs/11.tscn", "res://obstacles/pairs/12.tscn", "res://obstacles/pairs/13.tscn", "res://obstacles/pairs/14.tscn", "res://obstacles/pairs/15.tscn", "res://obstacles/pairs/2.tscn", "res://obstacles/pairs/3.tscn", "res://obstacles/pairs/4.tscn", "res://obstacles/pairs/5.tscn", "res://obstacles/pairs/6.tscn", "res://obstacles/pairs/7.tscn", "res://obstacles/pairs/8.tscn", "res://obstacles/pairs/9.tscn", "res://obstacles/stalacitie_2.tscn", "res://obstacles/stalacitie_5.tscn", "res://obstacles/stalactite_1.tscn", "res://obstacles/stalcitite_4_2.tscn", "res://obstacles/top_1a.tscn", "res://obstacles/top_1b.tscn", "res://obstacles/top_c1.tscn", "res://obstacles/tree_5.tscn", "res://player.tscn", "res://spawner.tscn" ) -include_filter="" -exclude_filter="" -export_path="/home/daniel/Documents/Hackathon html/index.html" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" - -[preset.3.options] - -vram_texture_compression/for_desktop=true -vram_texture_compression/for_mobile=false -html/custom_html_shell="" -html/head_include="" -custom_template/release="" -custom_template/debug="" diff --git a/obstacles/pairs/12.tscn b/obstacles/pairs/12.tscn index 207dc3c..58b9410 100644 --- a/obstacles/pairs/12.tscn +++ b/obstacles/pairs/12.tscn @@ -22,8 +22,8 @@ scale = Vector2( 1, 2.36 ) [node name="Position2D" type="Position2D" parent="Area2D3"] position = Vector2( 73.6842, 9.47366 ) -[node name="Position2D" type="Position2D" parent="Area2D3/Position2D"] -position = Vector2( 18.9474, 28.4211 ) +[node name="Position2D2" type="Position2D" parent="Area2D3"] +position = Vector2( 92.6316, 37.8948 ) [node name="Area2D4" parent="." instance=ExtResource( 4 )] position = Vector2( 46.0001, 509.737 ) @@ -34,6 +34,6 @@ position = Vector2( 596.526, 108.684 ) [node name="Position2D" type="Position2D" parent="Area2D5"] position = Vector2( 153.684, 86.3158 ) [connection signal="body_entered" from="Area2D" to="." method="_collide"] -[connection signal="body_entered" from="Area2D3" to="." method="_on_Area2D3_body_entered"] +[connection signal="body_entered" from="Area2D3" to="." method="_collide"] [connection signal="body_entered" from="Area2D4" to="." method="_collide"] [connection signal="body_entered" from="Area2D5" to="." method="_collide"] diff --git a/obstacles/pairs/3.tscn b/obstacles/pairs/3.tscn index db0e6ad..d688eee 100644 --- a/obstacles/pairs/3.tscn +++ b/obstacles/pairs/3.tscn @@ -26,13 +26,13 @@ position = Vector2( 57.4596, 240.839 ) [node name="Area2D3" parent="." instance=ExtResource( 4 )] position = Vector2( 421.426, 80.5163 ) -[node name="Area2D" parent="Area2D3" instance=ExtResource( 5 )] -position = Vector2( 338.733, 386.346 ) +[node name="Area2D4" parent="." instance=ExtResource( 5 )] +position = Vector2( 760.159, 466.862 ) -[node name="Area2D" parent="Area2D3/Area2D" instance=ExtResource( 6 )] -position = Vector2( -745.485, 5.44147 ) +[node name="Area2D5" parent="." instance=ExtResource( 6 )] +position = Vector2( 14.674, 472.304 ) [connection signal="body_entered" from="Area2D" to="." method="_collide"] [connection signal="body_entered" from="Area2D2" to="." method="_collide"] [connection signal="body_entered" from="Area2D3" to="." method="_collide"] -[connection signal="body_entered" from="Area2D3/Area2D" to="." method="_collide"] -[connection signal="body_entered" from="Area2D3/Area2D/Area2D" to="." method="_collide"] +[connection signal="body_entered" from="Area2D4" to="." method="_collide"] +[connection signal="body_entered" from="Area2D5" to="." method="_collide"]