From 1330a4e29ab8bb2d9a3e4d4cdf234df62c911aaa Mon Sep 17 00:00:00 2001 From: Sebastian Dieguez Date: Wed, 10 Aug 2022 08:36:11 -0300 Subject: [PATCH] Updated to Godot 3.5 stable --- game/content/base/startup.gd | 2 +- game/content/base/startup.tscn | 1 + game/content/dev/boot-splash/boot-splash.png.import | 1 + game/content/dev/icons-base/icon.png.import | 1 + game/content/environment/default_env.tres | 0 game/content/ui/menus/options/options.png.import | 1 + game/content/ui/menus/splash/SplashScreens.gd | 4 ++-- game/content/ui/menus/splash/splash001.png.import | 1 + game/content/ui/menus/splash/splash002.png.import | 1 + game/content/ui/menus/title/title-bg.png.import | 1 + game/project.godot | 7 ++++++- 11 files changed, 16 insertions(+), 4 deletions(-) mode change 100755 => 100644 game/content/base/startup.gd mode change 100755 => 100644 game/content/base/startup.tscn mode change 100755 => 100644 game/content/dev/boot-splash/boot-splash.png.import mode change 100755 => 100644 game/content/dev/icons-base/icon.png.import mode change 100755 => 100644 game/content/environment/default_env.tres mode change 100755 => 100644 game/content/ui/menus/options/options.png.import mode change 100755 => 100644 game/content/ui/menus/splash/splash001.png.import mode change 100755 => 100644 game/content/ui/menus/splash/splash002.png.import mode change 100755 => 100644 game/content/ui/menus/title/title-bg.png.import mode change 100755 => 100644 game/project.godot diff --git a/game/content/base/startup.gd b/game/content/base/startup.gd old mode 100755 new mode 100644 index f3bc0ac..4003323 --- a/game/content/base/startup.gd +++ b/game/content/base/startup.gd @@ -11,7 +11,7 @@ func _ready(): _display_menu() # WARNING, don't put too much stuff here, this runs every frame -func _process(delta): +func _process(_delta): # if the user press cancel (Escape) and we are in splash, just go to title menu if Input.is_action_pressed("ui_cancel"): match menu_state: diff --git a/game/content/base/startup.tscn b/game/content/base/startup.tscn old mode 100755 new mode 100644 index e2965e4..33116a7 --- a/game/content/base/startup.tscn +++ b/game/content/base/startup.tscn @@ -15,6 +15,7 @@ visible = false [node name="OptionsMenu" parent="." instance=ExtResource( 4 )] visible = false + [connection signal="finished_Loop" from="SplashScreens" to="." method="_on_SplashScreens_finished_Loop"] [connection signal="menu_activated" from="TitleMenu" to="." method="_on_TitleMenu_menu_activated"] [connection signal="options_back" from="OptionsMenu" to="." method="_on_OptionsMenu_options_back"] diff --git a/game/content/dev/boot-splash/boot-splash.png.import b/game/content/dev/boot-splash/boot-splash.png.import old mode 100755 new mode 100644 index bd73965..1674d5f --- a/game/content/dev/boot-splash/boot-splash.png.import +++ b/game/content/dev/boot-splash/boot-splash.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/content/dev/icons-base/icon.png.import b/game/content/dev/icons-base/icon.png.import old mode 100755 new mode 100644 index 119e847..72fa4a9 --- a/game/content/dev/icons-base/icon.png.import +++ b/game/content/dev/icons-base/icon.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/content/environment/default_env.tres b/game/content/environment/default_env.tres old mode 100755 new mode 100644 diff --git a/game/content/ui/menus/options/options.png.import b/game/content/ui/menus/options/options.png.import old mode 100755 new mode 100644 index b1e774f..f37af8f --- a/game/content/ui/menus/options/options.png.import +++ b/game/content/ui/menus/options/options.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/content/ui/menus/splash/SplashScreens.gd b/game/content/ui/menus/splash/SplashScreens.gd index 2738886..6908ede 100644 --- a/game/content/ui/menus/splash/SplashScreens.gd +++ b/game/content/ui/menus/splash/SplashScreens.gd @@ -4,5 +4,5 @@ extends Node2D signal finished_Loop # on child signal triggered, we propagate outside the scene -func _on_anima_animation_finished(anim_name): - emit_signal("finished_Loop") \ No newline at end of file +func _on_anima_animation_finished(_anim_name): + emit_signal("finished_Loop") diff --git a/game/content/ui/menus/splash/splash001.png.import b/game/content/ui/menus/splash/splash001.png.import old mode 100755 new mode 100644 index 2388df8..8fb080a --- a/game/content/ui/menus/splash/splash001.png.import +++ b/game/content/ui/menus/splash/splash001.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/content/ui/menus/splash/splash002.png.import b/game/content/ui/menus/splash/splash002.png.import old mode 100755 new mode 100644 index c082d93..bfb2398 --- a/game/content/ui/menus/splash/splash002.png.import +++ b/game/content/ui/menus/splash/splash002.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/content/ui/menus/title/title-bg.png.import b/game/content/ui/menus/title/title-bg.png.import old mode 100755 new mode 100644 index 5bcd1fd..0a09deb --- a/game/content/ui/menus/title/title-bg.png.import +++ b/game/content/ui/menus/title/title-bg.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/project.godot b/game/project.godot old mode 100755 new mode 100644 index 8c7daaa..7da2757 --- a/game/project.godot +++ b/game/project.godot @@ -10,7 +10,6 @@ config_version=4 _global_script_classes=[ ] _global_script_class_icons={ - } [application] @@ -37,7 +36,13 @@ window/stretch/aspect="keep_height" locale_filter=[ 0, [ "en", "es", "fr", "it" ] ] +[physics] + +3d/smooth_trimesh_collision=true +common/physics_interpolation=true + [rendering] +2d/snapping/use_gpu_pixel_snap=true environment/default_clear_color=Color( 0, 0, 0, 1 ) environment/default_environment="res://content/environment/default_env.tres"