Skip to content

Commit

Permalink
Updated to Godot 3.5 stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Dieguez committed Aug 10, 2022
1 parent 0d641d3 commit 1330a4e
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion game/content/base/startup.gd
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions game/content/base/startup.tscn
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
1 change: 1 addition & 0 deletions game/content/dev/boot-splash/boot-splash.png.import
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions game/content/dev/icons-base/icon.png.import
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Empty file modified game/content/environment/default_env.tres
100755 → 100644
Empty file.
1 change: 1 addition & 0 deletions game/content/ui/menus/options/options.png.import
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions game/content/ui/menus/splash/SplashScreens.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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")
func _on_anima_animation_finished(_anim_name):
emit_signal("finished_Loop")
1 change: 1 addition & 0 deletions game/content/ui/menus/splash/splash001.png.import
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions game/content/ui/menus/splash/splash002.png.import
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions game/content/ui/menus/title/title-bg.png.import
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion game/project.godot
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ config_version=4

_global_script_classes=[ ]
_global_script_class_icons={

}

[application]
Expand All @@ -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"

0 comments on commit 1330a4e

Please sign in to comment.