diff --git a/.gitignore b/.gitignore index 06d53b30..b2f2ab68 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ .import/ .mono/ **/.DS_Store -**/*.import \ No newline at end of file +**/*.import +*.blob \ No newline at end of file diff --git a/addons/dialogic/Nodes/DialogNode.tscn b/addons/dialogic/Nodes/DialogNode.tscn index a2b7822e..623663ee 100644 --- a/addons/dialogic/Nodes/DialogNode.tscn +++ b/addons/dialogic/Nodes/DialogNode.tscn @@ -277,9 +277,9 @@ margin_bottom = 0.0 [node name="ChangeKarmaContainer" parent="." instance=ExtResource( 52 )] margin_left = 1292.0 margin_right = 0.0 -margin_bottom = -1030.0 [node name="BackButton" type="Control" parent="."] +visible = false margin_right = 36.0 margin_bottom = 27.0 diff --git a/addons/dialogic/Nodes/TextBubble.tscn b/addons/dialogic/Nodes/TextBubble.tscn index cb93fd59..4e4a9b78 100644 --- a/addons/dialogic/Nodes/TextBubble.tscn +++ b/addons/dialogic/Nodes/TextBubble.tscn @@ -177,9 +177,6 @@ custom_fonts/font = SubResource( 10 ) custom_styles/normal = SubResource( 6 ) align = 1 valign = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="ColorRect" type="ColorRect" parent="NameLabel"] visible = false diff --git a/resources/audio/sfx/01Signal_Mashina.wav b/resources/audio/sfx/01Signal_Mashina.wav deleted file mode 100644 index 0b0fe49d..00000000 Binary files a/resources/audio/sfx/01Signal_Mashina.wav and /dev/null differ diff --git a/resources/audio/sfx/DOOR.wav b/resources/audio/sfx/DOOR.wav deleted file mode 100644 index e751d642..00000000 Binary files a/resources/audio/sfx/DOOR.wav and /dev/null differ diff --git a/resources/audio/sfx/zvuk-skripa-dveri.wav b/resources/audio/sfx/zvuk-skripa-dveri.wav deleted file mode 100644 index f5a4c570..00000000 Binary files a/resources/audio/sfx/zvuk-skripa-dveri.wav and /dev/null differ diff --git a/resources/audio/voice/text913.1 - Copy.ogg b/resources/audio/voice/text913.1 - Copy.ogg deleted file mode 100644 index 69d8cda4..00000000 Binary files a/resources/audio/voice/text913.1 - Copy.ogg and /dev/null differ diff --git a/resources/customControls/VolumeSlider.tscn b/resources/customControls/VolumeSlider.tscn index 0f92e8eb..2a267fd2 100644 --- a/resources/customControls/VolumeSlider.tscn +++ b/resources/customControls/VolumeSlider.tscn @@ -16,8 +16,11 @@ font_data = SubResource( 1 ) script = ExtResource( 1 ) [node name="Label" type="Label" parent="."] +margin_left = -50.0 margin_top = 13.0 +margin_right = -50.0 margin_bottom = 27.0 +rect_scale = Vector2( 1.25, 1.25 ) custom_fonts/font = SubResource( 2 ) [node name="TextureProgress" type="TextureProgress" parent="."] @@ -32,6 +35,7 @@ margin_left = 1009.0 margin_top = 13.0 margin_right = 1009.0 margin_bottom = 27.0 +rect_scale = Vector2( 1.25, 1.25 ) custom_fonts/font = SubResource( 2 ) [connection signal="mouse_entered" from="TextureProgress" to="." method="_on_TextureProgress_mouse_entered"] diff --git a/scenes/Map.tscn b/scenes/Map.tscn index cf81c4b0..c24e6dcc 100644 --- a/scenes/Map.tscn +++ b/scenes/Map.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=61 format=2] +[gd_scene load_steps=60 format=2] [ext_resource path="res://scripts/Map.gd" type="Script" id=1] [ext_resource path="res://resources/graphics/GUI/Map/Inside/disabled/exit.webp" type="Texture" id=2] @@ -23,7 +23,6 @@ [ext_resource path="res://resources/graphics/GUI/Map/Outside/garage.webp" type="Texture" id=21] [ext_resource path="res://resources/graphics/GUI/Map/Outside/dock_pier.webp" type="Texture" id=22] [ext_resource path="res://resources/graphics/GUI/Map/Outside/dock_pier_disabled.webp" type="Texture" id=23] -[ext_resource path="res://resources/graphics/GUI/Map/Outside/smoking_area_clickmask.png" type="BitMap" id=24] [ext_resource path="res://resources/graphics/GUI/Map/Inside/disabled/basement.webp" type="Texture" id=25] [ext_resource path="res://resources/graphics/GUI/Map/Inside/active/3rdFloor_active.webp" type="Texture" id=26] [ext_resource path="res://resources/graphics/GUI/Map/Inside/active/garage_active.webp" type="Texture" id=27] @@ -459,7 +458,6 @@ rect_rotation = -5.9 rect_scale = Vector2( 0.4, 0.4 ) texture_normal = ExtResource( 11 ) texture_disabled = ExtResource( 12 ) -texture_click_mask = ExtResource( 24 ) [node name="Restaurant" type="TextureButton" parent="Map/Outside/Places"] margin_left = 1182.0 diff --git a/scenes/Settings.tscn b/scenes/Settings.tscn index 14225359..17e74f0e 100644 --- a/scenes/Settings.tscn +++ b/scenes/Settings.tscn @@ -234,6 +234,7 @@ margin_right = 570.0 margin_bottom = 278.0 [node name="VideoButton" type="Button" parent="AllSettingsView"] +visible = false margin_right = 137.0 margin_bottom = 80.0 custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) @@ -244,9 +245,9 @@ text = "Video" flat = true [node name="AudioButton" type="Button" parent="AllSettingsView"] -margin_top = 79.0 +margin_top = 21.0 margin_right = 147.0 -margin_bottom = 159.0 +margin_bottom = 101.0 custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 13 ) @@ -255,9 +256,9 @@ text = "Audio" flat = true [node name="TextButton" type="Button" parent="AllSettingsView"] -margin_top = 158.0 +margin_top = 100.0 margin_right = 110.0 -margin_bottom = 238.0 +margin_bottom = 180.0 custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 14 ) @@ -266,9 +267,9 @@ text = "Text" flat = true [node name="LanguageButton" type="Button" parent="AllSettingsView"] -margin_top = 237.0 +margin_top = 179.0 margin_right = 232.0 -margin_bottom = 317.0 +margin_bottom = 259.0 custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 24 ) @@ -278,9 +279,9 @@ flat = true align = 0 [node name="TwitchButton" type="Button" parent="AllSettingsView"] -margin_top = 319.0 +margin_top = 261.0 margin_right = 153.0 -margin_bottom = 399.0 +margin_bottom = 341.0 custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 25 ) @@ -411,18 +412,19 @@ margin_bottom = 295.4 [node name="GeneralVolumeSlider" parent="AudioSettingsView" instance=ExtResource( 3 )] [node name="MusicVolumeSlider" parent="AudioSettingsView" instance=ExtResource( 3 )] -margin_top = 50.0 -margin_bottom = 50.0 +margin_top = 66.0 +margin_bottom = 66.0 [node name="DialogueVolumeSlider" parent="AudioSettingsView" instance=ExtResource( 3 )] -margin_top = 100.0 -margin_bottom = 100.0 +margin_top = 130.0 +margin_bottom = 130.0 [node name="EffectsVolumeSlider" parent="AudioSettingsView" instance=ExtResource( 3 )] -margin_top = 150.0 -margin_bottom = 150.0 +margin_top = 194.0 +margin_bottom = 194.0 [node name="TextSettingsView" type="Control" parent="."] +visible = false margin_left = 864.0 margin_top = 140.4 margin_right = 1210.0 @@ -430,8 +432,11 @@ margin_bottom = 311.4 rect_pivot_offset = Vector2( -442, 219.6 ) [node name="AutoReadCheck" type="CheckBox" parent="TextSettingsView"] -margin_right = 200.0 -margin_bottom = 57.0 +margin_left = -165.0 +margin_top = 22.85 +margin_right = 39.0 +margin_bottom = 79.85 +rect_scale = Vector2( 1.25, 1.25 ) rect_pivot_offset = Vector2( -316, 53 ) custom_colors/font_color_hover_pressed = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) @@ -443,9 +448,11 @@ custom_styles/focus = ExtResource( 11 ) text = "Auto read" [node name="SkipSeenCheck" type="CheckBox" parent="TextSettingsView"] -margin_top = 57.0 -margin_right = 180.0 -margin_bottom = 114.0 +margin_left = -164.0 +margin_top = 102.85 +margin_right = 20.0 +margin_bottom = 159.85 +rect_scale = Vector2( 1.25, 1.25 ) rect_pivot_offset = Vector2( -316, 53 ) custom_colors/font_color_hover_pressed = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) @@ -457,13 +464,17 @@ custom_styles/focus = ExtResource( 11 ) text = "Skip seen" [node name="TextSpeedSlider" parent="TextSettingsView" instance=ExtResource( 3 )] -margin_top = 110.0 -margin_bottom = 110.0 +margin_left = -4.0 +margin_top = 164.6 +margin_right = -4.0 +margin_bottom = 164.6 [node name="ThemeCheck" type="CheckBox" parent="TextSettingsView"] -margin_top = 195.0 -margin_right = 333.0 -margin_bottom = 252.0 +margin_left = -86.0 +margin_top = 247.85 +margin_right = 247.0 +margin_bottom = 304.85 +rect_scale = Vector2( 1.25, 1.25 ) custom_colors/font_color_hover_pressed = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) @@ -474,9 +485,11 @@ custom_styles/focus = ExtResource( 11 ) text = "Use default theme" [node name="CustomTheme" type="Control" parent="TextSettingsView"] -margin_top = 275.0 -margin_right = 394.0 -margin_bottom = 415.0 +margin_left = -49.0 +margin_top = 346.6 +margin_right = 345.0 +margin_bottom = 486.6 +rect_scale = Vector2( 1.25, 1.25 ) [node name="Back" type="HBoxContainer" parent="TextSettingsView/CustomTheme"] margin_right = 390.0 @@ -526,18 +539,18 @@ margin_right = 35.0 margin_bottom = 233.6 [node name="TextureRect" type="TextureRect" parent="TextSettingsView/CustomTheme/Example"] -margin_left = 1.0 -margin_top = 50.6 -margin_right = 1185.0 -margin_bottom = 169.6 +margin_left = -79.0 +margin_top = -30.6 +margin_right = 1105.0 +margin_bottom = 88.4 rect_scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 13 ) [node name="Label" type="Label" parent="TextSettingsView/CustomTheme/Example"] -margin_left = 69.0 -margin_top = 50.6 -margin_right = 502.0 -margin_bottom = 107.6 +margin_left = -10.9999 +margin_top = -30.5999 +margin_right = 422.0 +margin_bottom = 26.4001 custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 30 ) text = "This is sample text" @@ -552,39 +565,42 @@ margin_right = 904.0 margin_bottom = 180.4 [node name="InterfaceAndTextLabel" type="Label" parent="LanguageSettingsView"] -margin_top = 6.0 +margin_top = 10.0 margin_right = 314.0 -margin_bottom = 55.0 +margin_bottom = 59.0 +rect_scale = Vector2( 1.25, 1.25 ) custom_fonts/font = SubResource( 23 ) text = "Interface and Text" valign = 1 [node name="InterfaceAndText" type="ScrollContainer" parent="LanguageSettingsView"] -margin_top = 60.0 +margin_top = 87.0 margin_right = 551.0 -margin_bottom = 179.0 +margin_bottom = 206.0 +rect_scale = Vector2( 1.25, 1.25 ) [node name="VBoxContainer" type="VBoxContainer" parent="LanguageSettingsView/InterfaceAndText"] custom_constants/separation = 2 [node name="VoiceLanguageLabel" type="Label" parent="LanguageSettingsView"] -margin_top = 190.0 +margin_top = 268.0 margin_right = 145.0 -margin_bottom = 239.0 +margin_bottom = 317.0 +rect_scale = Vector2( 1.25, 1.25 ) custom_fonts/font = SubResource( 23 ) text = "Voiceover" valign = 1 [node name="Voiceover" type="ScrollContainer" parent="LanguageSettingsView"] -margin_top = 245.0 +margin_top = 350.0 margin_right = 551.0 -margin_bottom = 425.0 +margin_bottom = 530.0 +rect_scale = Vector2( 1.25, 1.25 ) [node name="VBoxContainer" type="VBoxContainer" parent="LanguageSettingsView/Voiceover"] custom_constants/separation = 2 [node name="TwitchSettingsView" type="Control" parent="."] -visible = false margin_left = 864.0 margin_top = 140.4 margin_right = 904.0 @@ -595,10 +611,13 @@ rect_pivot_offset = Vector2( 159, 503 ) script = ExtResource( 5 ) [node name="TwitchCheck" type="CheckBox" parent="TwitchSettingsView"] -margin_left = -4.0 -margin_top = 3.0 -margin_right = 247.0 -margin_bottom = 60.0 +anchor_top = 1.324 +anchor_bottom = 1.324 +margin_left = -162.0 +margin_top = -22.36 +margin_right = 89.0 +margin_bottom = 34.64 +rect_scale = Vector2( 1.25, 1.25 ) rect_pivot_offset = Vector2( -316, 53 ) custom_colors/font_color_hover_pressed = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) @@ -610,31 +629,37 @@ custom_styles/focus = ExtResource( 11 ) text = "Enable Twitch" [node name="ChannelLabel" type="Label" parent="TwitchSettingsView"] -margin_top = 60.0 -margin_right = 120.0 -margin_bottom = 109.0 +margin_left = -48.0 +margin_top = 99.6 +margin_right = 72.0 +margin_bottom = 148.6 +rect_scale = Vector2( 1.25, 1.25 ) custom_fonts/font = SubResource( 23 ) text = "Channel" valign = 1 [node name="ChannelBox" type="TextEdit" parent="TwitchSettingsView"] -margin_top = 115.0 -margin_right = 400.0 -margin_bottom = 166.0 +margin_left = -48.0 +margin_top = 169.6 +margin_right = 352.0 +margin_bottom = 220.6 +rect_scale = Vector2( 1.25, 1.25 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color_readonly = Color( 0.619608, 0.619608, 0.619608, 1 ) custom_fonts/font = SubResource( 26 ) custom_styles/normal = SubResource( 27 ) [node name="TimerSlider" parent="TwitchSettingsView" instance=ExtResource( 3 )] -margin_top = 175.0 -margin_bottom = 175.0 +margin_left = 3.0 +margin_top = 241.6 +margin_right = 3.0 +margin_bottom = 241.6 [node name="StatusContainer" type="HBoxContainer" parent="TwitchSettingsView"] -margin_left = -5.0 -margin_top = 240.0 -margin_right = 266.0 -margin_bottom = 295.0 +margin_left = -59.0 +margin_top = 334.0 +margin_right = 212.0 +margin_bottom = 389.0 custom_constants/separation = 20 [node name="CheckConnectionButton" type="Button" parent="TwitchSettingsView/StatusContainer"]