diff --git a/assets/test/musiques/Sangakanat (short instrumental theme).ogg b/assets/musics/Sangakanat (short instrumental theme).ogg similarity index 100% rename from assets/test/musiques/Sangakanat (short instrumental theme).ogg rename to assets/musics/Sangakanat (short instrumental theme).ogg diff --git a/assets/test/musiques/pre-mix_Le_concours_de_tartes_aux_klums.ogg b/assets/musics/pre-mix_Le_concours_de_tartes_aux_klums.ogg similarity index 100% rename from assets/test/musiques/pre-mix_Le_concours_de_tartes_aux_klums.ogg rename to assets/musics/pre-mix_Le_concours_de_tartes_aux_klums.ogg diff --git a/assets/test/musiques/pre-mix_khanat_main_theme_2018-07-23.ogg b/assets/musics/pre-mix_khanat_main_theme_2018-07-23.ogg similarity index 100% rename from assets/test/musiques/pre-mix_khanat_main_theme_2018-07-23.ogg rename to assets/musics/pre-mix_khanat_main_theme_2018-07-23.ogg diff --git a/assets/musics/pre-mix_menu_pantin_remake.ogg b/assets/musics/pre-mix_menu_pantin_remake.ogg new file mode 100644 index 0000000..882a218 Binary files /dev/null and b/assets/musics/pre-mix_menu_pantin_remake.ogg differ diff --git a/global.tscn b/global.tscn index 901e6c5..135b0a0 100644 --- a/global.tscn +++ b/global.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://background_loader_scene/background_loader.tscn" type="PackedScene" id=2] [ext_resource path="res://gui_scene/GUI/GUI.tscn" type="PackedScene" id=3] -[node name="global" type="Node" index="0"] +[node name="global" type="Node"] pause_mode = 2 script = ExtResource( 1 ) diff --git a/login_scene/login_scene.gd b/login_scene/login_scene.gd index 42f23e2..42d6c9c 100644 --- a/login_scene/login_scene.gd +++ b/login_scene/login_scene.gd @@ -7,7 +7,7 @@ func _ready(): $login_menu.show() self.connect( "character_creation_finished", global, "_on_login_scene_character_creation_finished" ) - global.get_node( "audio_stream_player" ).stream = load( "res://assets/test/musiques/pre-mix_khanat_main_theme_2018-07-23.ogg" ) + global.get_node( "audio_stream_player" ).stream = load( "res://assets/musics/pre-mix_menu_pantin_remake.ogg" ) global.get_node( "audio_stream_player" ).play() $login_menu.show() diff --git a/login_scene/login_scene.tscn b/login_scene/login_scene.tscn index e5c42ba..72349fe 100644 --- a/login_scene/login_scene.tscn +++ b/login_scene/login_scene.tscn @@ -53,6 +53,7 @@ _sections_unfolded = [ "Size Flags" ] [node name="buttons" type="HBoxContainer" parent="." index="5"] +editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 diff --git a/scenes/GUI/MusicControls/MusicControls.tscn b/scenes/GUI/MusicControls/MusicControls.tscn index bcce4d8..d2763fc 100644 --- a/scenes/GUI/MusicControls/MusicControls.tscn +++ b/scenes/GUI/MusicControls/MusicControls.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://scenes/GUI/MusicControls/Music.gd" type="Script" id=1] -[ext_resource path="res://assets/test/musiques/pre-mix_khanat_main_theme_2018-07-23.ogg" type="AudioStream" id=2] -[ext_resource path="res://assets/test/musiques/Sangakanat (short instrumental theme).ogg" type="AudioStream" id=3] -[ext_resource path="res://assets/test/musiques/pre-mix_Le_concours_de_tartes_aux_klums.ogg" type="AudioStream" id=4] +[ext_resource path="res://assets/musics/pre-mix_khanat_main_theme_2018-07-23.ogg" type="AudioStream" id=2] +[ext_resource path="res://assets/musics/Sangakanat (short instrumental theme).ogg" type="AudioStream" id=3] +[ext_resource path="res://assets/musics/pre-mix_Le_concours_de_tartes_aux_klums.ogg" type="AudioStream" id=4] [node name="Music" type="VBoxContainer"]