aboutsummaryrefslogtreecommitdiff
path: root/game/src
diff options
context:
space:
mode:
author Hop311 <Hop3114@gmail.com>2023-04-07 16:29:09 +0200
committer GitHub <noreply@github.com>2023-04-07 16:29:09 +0200
commit21aeaadf332d1a0d874f2c3850944fbdc6e64ff1 (patch)
tree8bb75b6bfc1be4717043eeb46b161ff86c5aaf03 /game/src
parent0c110a5de255d7fbddf77b549cf019dcfef88751 (diff)
Logo on Mainmenu + icon imports + whitespace cleanup (#82)
* Whitespace cleanup * Icon import files * Logo on main menu.
Diffstat (limited to 'game/src')
-rw-r--r--game/src/MainMenu/MainMenu.tscn16
-rw-r--r--game/src/MusicConductor/MusicConductor.gd2
2 files changed, 9 insertions, 9 deletions
diff --git a/game/src/MainMenu/MainMenu.tscn b/game/src/MainMenu/MainMenu.tscn
index 5fb6ca9..a10fa27 100644
--- a/game/src/MainMenu/MainMenu.tscn
+++ b/game/src/MainMenu/MainMenu.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=5 format=3 uid="uid://bp5n3mlu45ygw"]
+[gd_scene load_steps=6 format=3 uid="uid://bp5n3mlu45ygw"]
[ext_resource type="Theme" uid="uid://qoi3oec48jp0" path="res://theme/main_menu.tres" id="1_1yri4"]
[ext_resource type="Script" path="res://src/MainMenu/MainMenu.gd" id="2_nm1fq"]
+[ext_resource type="Texture2D" uid="uid://dxys0wg0f0ic5" path="res://theme/assets/OpenVicFINALREALTRANS.png" id="3_58ess"]
[ext_resource type="PackedScene" uid="uid://b7oncobnacxmt" path="res://src/LocaleButton.tscn" id="3_amonp"]
[ext_resource type="PackedScene" uid="uid://cen7wkmn6og66" path="res://src/MainMenu/ReleaseInfoBox.tscn" id="3_km0er"]
@@ -29,14 +30,13 @@ theme_type_variation = &"BackgroundPanel"
[node name="VBox" type="VBoxContainer" parent="Panel"]
layout_mode = 2
-[node name="TitleLabel" type="Label" parent="Panel/VBox"]
+[node name="TextureRect" type="TextureRect" parent="Panel/VBox"]
layout_mode = 2
-size_flags_vertical = 6
-size_flags_stretch_ratio = 1.5
-theme_type_variation = &"TitleLabel"
-text = "MAINMENU_TITLE"
-horizontal_alignment = 1
-vertical_alignment = 1
+size_flags_vertical = 3
+size_flags_stretch_ratio = 1.75
+texture = ExtResource("3_58ess")
+expand_mode = 1
+stretch_mode = 5
[node name="Margin" type="MarginContainer" parent="Panel/VBox"]
layout_mode = 2
diff --git a/game/src/MusicConductor/MusicConductor.gd b/game/src/MusicConductor/MusicConductor.gd
index c0cfc46..08fa86a 100644
--- a/game/src/MusicConductor/MusicConductor.gd
+++ b/game/src/MusicConductor/MusicConductor.gd
@@ -36,7 +36,7 @@ func is_paused() -> bool:
func toggle_play_pause() -> void:
$AudioStreamPlayer.stream_paused = !$AudioStreamPlayer.stream_paused
-
+
func start_current_song() -> void:
$AudioStreamPlayer.stream = _available_songs[_selected_track].song_stream
$AudioStreamPlayer.play()