Skip to content

Commit

Permalink
Fixed cutscenes not being centered (#4948)
Browse files Browse the repository at this point in the history
* Fixed cutscenes not being centered

* Fixed pause menu options being aligned to the left

* Fixed duplicate title font file with different case

of one letter
  • Loading branch information
hhyyrylainen committed Mar 19, 2024
1 parent fdfae5d commit 38b774e
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 32 deletions.
2 changes: 1 addition & 1 deletion src/auto-evo/AutoEvoExploringTool.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -751,8 +751,8 @@ Movable = false
[connection signal="value_changed" from="GUI/VBoxContainer/WorldEditor/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer3/FinishXGenerationsSpin" to="." method="OnFinishXGenerationsSpinBoxValueChanged"]
[connection signal="pressed" from="GUI/VBoxContainer/WorldEditor/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer3/FinishXGenerations" to="." method="OnFinishXGenerationsButtonPressed"]
[connection signal="value_changed" from="GUI/VBoxContainer/WorldEditor/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/RunXWorldsSpin" to="." method="OnRunXWorldsSpinBoxValueChanged"]
[connection signal="pressed" from="GUI/VBoxContainer/WorldEditor/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/RunXWorlds" to="." method="OnFinishXGenerationsButtonPressed"]
[connection signal="pressed" from="GUI/VBoxContainer/WorldEditor/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/RunXWorlds" to="." method="OnRunXWorldsButtonPressed"]
[connection signal="pressed" from="GUI/VBoxContainer/WorldEditor/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer4/RunXWorlds" to="." method="OnFinishXGenerationsButtonPressed"]
[connection signal="pressed" from="GUI/VBoxContainer/WorldEditor/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/Abort" to="." method="OnAbortButtonPressed"]
[connection signal="pressed" from="GUI/VBoxContainer/WorldEditor/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/PlayWithThis" to="." method="PlayWithCurrentSettingPressed"]
[connection signal="pressed" from="GUI/VBoxContainer/WorldEditor/VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/WorldExportButton" to="." method="ExportWorlds"]
Expand Down
21 changes: 15 additions & 6 deletions src/general/PauseMenu.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
[ext_resource type="Script" path="res://src/general/PauseMenu.cs" id="1"]
[ext_resource type="Theme" uid="uid://b4cx0o110g4b6" path="res://src/gui_common/thrive_theme.tres" id="2"]
[ext_resource type="PackedScene" path="res://src/saving/SaveList.tscn" id="3"]
[ext_resource type="PackedScene" path="res://src/general/HelpScreen.tscn" id="4"]
[ext_resource type="PackedScene" uid="uid://l3t2irtebxii" path="res://src/general/HelpScreen.tscn" id="4"]
[ext_resource type="PackedScene" path="res://src/saving/NewSaveMenu.tscn" id="5"]
[ext_resource type="PackedScene" path="res://src/general/OptionsMenu.tscn" id="6"]
[ext_resource type="PackedScene" path="res://src/gui_common/dialogs/CustomConfirmationDialog.tscn" id="7"]
[ext_resource type="PackedScene" path="res://src/thriveopedia/Thriveopedia.tscn" id="8"]
[ext_resource type="PackedScene" uid="uid://khgb1ctp1e5o" path="res://src/general/OptionsMenu.tscn" id="6"]
[ext_resource type="PackedScene" uid="uid://cl64wvnxs6ivs" path="res://src/gui_common/dialogs/CustomConfirmationDialog.tscn" id="7"]
[ext_resource type="PackedScene" uid="uid://bt4wq0ddch84i" path="res://src/thriveopedia/Thriveopedia.tscn" id="8"]
[ext_resource type="PackedScene" path="res://src/gui_common/FocusGrabber.tscn" id="9"]
[ext_resource type="PackedScene" path="res://src/gui_common/TopLevelContainer.tscn" id="10"]

Expand Down Expand Up @@ -136,6 +136,8 @@ offset_right = 0.0
offset_bottom = 0.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme = ExtResource("2")
script = ExtResource("1")
Expand Down Expand Up @@ -263,19 +265,26 @@ layout_mode = 2
[node name="HelpScreen" parent="." index="2" instance=ExtResource("4")]
visible = false
anchors_preset = 0
anchor_right = 0.0
anchor_bottom = 0.0
grow_horizontal = 1
grow_vertical = 1
Category = "MicrobeStage"

[node name="OptionsMenu" parent="." index="3" instance=ExtResource("6")]
visible = false
anchors_preset = 0
layout_mode = 1

[node name="Thriveopedia" parent="." index="4" instance=ExtResource("8")]
visible = false
anchors_preset = 0
anchor_right = 0.0
anchor_bottom = 0.0
grow_horizontal = 1
grow_vertical = 1

[node name="UnsavedProgressWarning" parent="." index="5" instance=ExtResource("7")]
custom_minimum_size = Vector2(391, 0)
anchors_preset = 0
offset_right = 391.0
WindowTitle = "CONFIRM_EXIT"

Expand Down
30 changes: 16 additions & 14 deletions src/gui_common/Cutscene.tscn
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
[gd_scene load_steps=2 format=2]
[gd_scene load_steps=2 format=3 uid="uid://2u5vq8yfushf"]

[ext_resource path="res://src/gui_common/Cutscene.cs" type="Script" id=1]
[ext_resource type="Script" path="res://src/gui_common/Cutscene.cs" id="1"]

[node name="Cutscene" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 1 )
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 3
size_flags_vertical = 3
script = ExtResource("1")

[node name="Background" type="ColorRect" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
color = Color( 0, 0, 0, 1 )
__meta__ = {
"_edit_use_anchors_": false
}
color = Color(0, 0, 0, 1)

[node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="."]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -640.0
offset_top = -360.0
offset_right = 640.0
offset_bottom = 360.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 3
size_flags_vertical = 3
__meta__ = {
"_edit_use_anchors_": false
}
7 changes: 0 additions & 7 deletions src/gui_common/fonts/Title-Semibold-AlmostHuge.tres

This file was deleted.

8 changes: 4 additions & 4 deletions src/microbe_stage/gui/PatchDetailsPanel.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene load_steps=33 format=3 uid="uid://bjl5o7oy7yr15"]

[ext_resource type="PackedScene" path="res://src/gui_common/CustomRichTextLabel.tscn" id="1"]
[ext_resource type="LabelSettings" uid="uid://b6d3jtfqx07xn" path="res://src/gui_common/fonts/Title-Semibold-AlmostHuge.tres" id="3_xknfg"]
[ext_resource type="LabelSettings" uid="uid://dcekwe8j7ep16" path="res://src/gui_common/fonts/Title-SemiBold-AlmostHuge.tres" id="3_lpicf"]
[ext_resource type="Script" path="res://src/microbe_stage/gui/PatchDetailsPanel.cs" id="4"]
[ext_resource type="LabelSettings" uid="uid://tgseeon8t360" path="res://src/gui_common/fonts/Title-Bold-Smaller-Green.tres" id="5_133c0"]
[ext_resource type="LabelSettings" uid="uid://cns7wsfktfld4" path="res://src/gui_common/fonts/Title-SemiBold-Bigger.tres" id="5_xv7pc"]
Expand Down Expand Up @@ -112,7 +112,7 @@ custom_minimum_size = Vector2(150, 0)
layout_mode = 2
size_flags_horizontal = 3
text = "SELECT_A_PATCH"
label_settings = ExtResource("3_xknfg")
label_settings = ExtResource("3_lpicf")
horizontal_alignment = 1
autowrap_mode = 3

Expand All @@ -126,7 +126,7 @@ custom_minimum_size = Vector2(150, 0)
layout_mode = 2
size_flags_horizontal = 3
text = "UNKNOWN_PATCH"
label_settings = ExtResource("3_xknfg")
label_settings = ExtResource("3_lpicf")
horizontal_alignment = 1
autowrap_mode = 3

Expand Down Expand Up @@ -406,7 +406,7 @@ expand_mode = 1
[node name="NitrogenLabel" type="Label" parent="VBoxContainer/MarginContainer/ScrollContainer/VBoxContainer/PatchDetailsContainer/AtmosphericGasses/Clip/GridContainer/Nitrogen"]
editor_description = "PLACEHOLDER"
layout_mode = 2
text = "NITROGEN"
text = "Nitrogen"
label_settings = ExtResource("15_ng6rp")

[node name="CO2" type="HBoxContainer" parent="VBoxContainer/MarginContainer/ScrollContainer/VBoxContainer/PatchDetailsContainer/AtmosphericGasses/Clip/GridContainer"]
Expand Down

0 comments on commit 38b774e

Please sign in to comment.