aboutsummaryrefslogtreecommitdiff
path: root/game/src/GameSession/GameSession.tscn
diff options
context:
space:
mode:
author ClarkeCode <33846391+ClarkeCode@users.noreply.github.com>2023-04-18 21:05:41 +0200
committer GitHub <noreply@github.com>2023-04-18 21:05:41 +0200
commitae06fbce51f91b15aeed8ede7973f4ec24d05ff0 (patch)
tree9a49865bb6e6bc56c26a291de9c48d483225ac17 /game/src/GameSession/GameSession.tscn
parentea077c8a7c78477bd247c7fbd21de13bcf2285e9 (diff)
parent0ead900c96f1f40028d53b0e4b9c2d93312a6621 (diff)
Merge pull request #91 from OpenVic2Project/minor-map-ui
Minor map UI
Diffstat (limited to 'game/src/GameSession/GameSession.tscn')
-rw-r--r--game/src/GameSession/GameSession.tscn16
1 files changed, 15 insertions, 1 deletions
diff --git a/game/src/GameSession/GameSession.tscn b/game/src/GameSession/GameSession.tscn
index d23cb6c..8a8b18c 100644
--- a/game/src/GameSession/GameSession.tscn
+++ b/game/src/GameSession/GameSession.tscn
@@ -1,11 +1,13 @@
-[gd_scene load_steps=7 format=3 uid="uid://bgnupcshe1m7r"]
+[gd_scene load_steps=9 format=3 uid="uid://bgnupcshe1m7r"]
[ext_resource type="Script" path="res://src/GameSession/GameSession.gd" id="1_eklvp"]
+[ext_resource type="PackedScene" uid="uid://cvl76duuym1wq" path="res://src/MusicConductor/MusicPlayer.tscn" id="2_kt6aa"]
[ext_resource type="PackedScene" uid="uid://g524p8lr574w" path="res://src/GameSession/MapControlPanel.tscn" id="3_afh6d"]
[ext_resource type="PackedScene" uid="uid://dvdynl6eir40o" path="res://src/GameSession/GameSessionMenu.tscn" id="3_bvmqh"]
[ext_resource type="PackedScene" uid="uid://dkehmdnuxih2r" path="res://src/GameSession/MapView.tscn" id="4_xkg5j"]
[ext_resource type="PackedScene" uid="uid://byq323jbel48u" path="res://src/GameSession/ProvinceOverviewPanel.tscn" id="5_osjnn"]
[ext_resource type="PackedScene" uid="uid://cnbfxjy1m6wja" path="res://src/OptionMenu/OptionsMenu.tscn" id="6_p5mnx"]
+[ext_resource type="PackedScene" uid="uid://dd8k3p7r3huwc" path="res://src/GameSession/GameSpeedPanel.tscn" id="7_myy4q"]
[node name="GameSession" type="Control" node_paths=PackedStringArray("_game_session_menu")]
editor_description = "SS-102, UI-546"
@@ -19,6 +21,15 @@ mouse_filter = 2
script = ExtResource("1_eklvp")
_game_session_menu = NodePath("GameSessionMenu")
+[node name="MusicPlayer" parent="." instance=ExtResource("2_kt6aa")]
+layout_mode = 1
+anchors_preset = 1
+anchor_left = 1.0
+anchor_right = 1.0
+offset_left = -150.0
+offset_bottom = 110.0
+grow_horizontal = 0
+
[node name="MapView" parent="." instance=ExtResource("4_xkg5j")]
[node name="GameSessionMenu" parent="." instance=ExtResource("3_bvmqh")]
@@ -49,6 +60,9 @@ layout_mode = 1
visible = false
layout_mode = 1
+[node name="GameSpeedPanel" parent="." instance=ExtResource("7_myy4q")]
+layout_mode = 0
+
[connection signal="map_view_camera_changed" from="MapView" to="MapControlPanel" method="_on_map_view_camera_changed"]
[connection signal="province_selected" from="MapView" to="ProvinceOverviewPanel" method="_on_province_selected"]
[connection signal="options_button_pressed" from="GameSessionMenu" to="OptionsMenu" method="show"]