diff --git a/gui/control_gallery/project.pandemonium b/gui/control_gallery/project.pandemonium index af98f4f..ec1efd7 100644 --- a/gui/control_gallery/project.pandemonium +++ b/gui/control_gallery/project.pandemonium @@ -24,6 +24,5 @@ window/stretch/aspect="expand" [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/gui/drag_and_drop/project.pandemonium b/gui/drag_and_drop/project.pandemonium index c19d135..9f01e25 100644 --- a/gui/drag_and_drop/project.pandemonium +++ b/gui/drag_and_drop/project.pandemonium @@ -30,6 +30,5 @@ singletons=[ ] [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/gui/input_mapping/project.pandemonium b/gui/input_mapping/project.pandemonium index 1250daf..8bf3655 100644 --- a/gui/input_mapping/project.pandemonium +++ b/gui/input_mapping/project.pandemonium @@ -65,6 +65,5 @@ dash={ [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/gui/multiple_resolutions/project.pandemonium b/gui/multiple_resolutions/project.pandemonium index dba1a12..86f5c7b 100644 --- a/gui/multiple_resolutions/project.pandemonium +++ b/gui/multiple_resolutions/project.pandemonium @@ -44,5 +44,4 @@ window/stretch/aspect="expand" [rendering] -quality/driver/driver_name="GLES2" environment/default_clear_color=Color( 0.133333, 0.133333, 0.2, 1 ) diff --git a/gui/regex/project.pandemonium b/gui/regex/project.pandemonium index 91d62cb..d7810b0 100644 --- a/gui/regex/project.pandemonium +++ b/gui/regex/project.pandemonium @@ -28,6 +28,5 @@ singletons=[ ] [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/gui/rich_text_bbcode/project.pandemonium b/gui/rich_text_bbcode/project.pandemonium index 3c21903..03bb910 100644 --- a/gui/rich_text_bbcode/project.pandemonium +++ b/gui/rich_text_bbcode/project.pandemonium @@ -31,7 +31,6 @@ multithread/thread_rid_pool_prealloc=60 [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false environment/default_clear_color=Color( 0.145098, 0.145098, 0.164706, 1 ) diff --git a/gui/rich_text_bbcode/rich_text_bbcode.tscn b/gui/rich_text_bbcode/rich_text_bbcode.tscn index f74efc7..6b246e0 100644 --- a/gui/rich_text_bbcode/rich_text_bbcode.tscn +++ b/gui/rich_text_bbcode/rich_text_bbcode.tscn @@ -6,21 +6,21 @@ [ext_resource path="res://Titillium-Bold.otf" type="DynamicFontData" id=4] [ext_resource path="res://Titillium-Regular.otf" type="DynamicFontData" id=5] -[sub_resource type="DynamicFont" id=1] +[sub_resource type="DynamicFont" id=4] size = 20 -font_data = ExtResource( 2 ) - -[sub_resource type="DynamicFont" id=2] -size = 20 -font_data = ExtResource( 3 ) +font_data = ExtResource( 5 ) [sub_resource type="DynamicFont" id=3] size = 20 font_data = ExtResource( 4 ) -[sub_resource type="DynamicFont" id=4] +[sub_resource type="DynamicFont" id=2] size = 20 -font_data = ExtResource( 5 ) +font_data = ExtResource( 3 ) + +[sub_resource type="DynamicFont" id=1] +size = 20 +font_data = ExtResource( 2 ) [node name="RichTextBBCode" type="Control"] anchor_left = 0.5 @@ -44,10 +44,10 @@ margin_right = -48.0 margin_bottom = -62.0 size_flags_horizontal = 2 size_flags_vertical = 2 -custom_fonts/bold_italics_font = SubResource( 1 ) -custom_fonts/italics_font = SubResource( 2 ) -custom_fonts/bold_font = SubResource( 3 ) custom_fonts/normal_font = SubResource( 4 ) +custom_fonts/bold_font = SubResource( 3 ) +custom_fonts/italics_font = SubResource( 2 ) +custom_fonts/bold_italics_font = SubResource( 1 ) bbcode_enabled = true bbcode_text = "[b][u]Rich Text Test[/u][/b] diff --git a/gui/theming_override/project.pandemonium b/gui/theming_override/project.pandemonium index 3810490..87b6c72 100644 --- a/gui/theming_override/project.pandemonium +++ b/gui/theming_override/project.pandemonium @@ -24,7 +24,6 @@ window/stretch/aspect="expand" [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false environment/default_clear_color=Color( 0.133333, 0.133333, 0.133333, 1 ) diff --git a/gui/theming_override/test.gd b/gui/theming_override/test.gd index 130e610..6e60534 100644 --- a/gui/theming_override/test.gd +++ b/gui/theming_override/test.gd @@ -10,7 +10,7 @@ onready var button = $VBoxContainer/Button onready var button2 = $VBoxContainer/Button2 onready var reset_all_button = $VBoxContainer/ResetAllButton # Save the label color so it can be reset. -onready var default_label_color = label.get_color("font_color") +onready var default_label_color = label.get_theme_color("font_color") func _ready(): # Focus the first button automatically for keyboard/controller-friendly navigation. @@ -22,33 +22,33 @@ func _on_button_pressed(): # to get a correct appearance when the button is hovered or pressed. # We can't use a single StyleBox for all of them as these have different # background colors. - var new_stylebox_normal = button.get_stylebox("normal").duplicate() + var new_stylebox_normal = button.get_theme_stylebox("normal").duplicate() new_stylebox_normal.border_color = Color(1, 1, 0) - var new_stylebox_hover = button.get_stylebox("hover").duplicate() + var new_stylebox_hover = button.get_theme_stylebox("hover").duplicate() new_stylebox_hover.border_color = Color(1, 1, 0) - var new_stylebox_pressed = button.get_stylebox("pressed").duplicate() + var new_stylebox_pressed = button.get_theme_stylebox("pressed").duplicate() new_stylebox_pressed.border_color = Color(1, 1, 0) - button.add_stylebox_override("normal", new_stylebox_normal) - button.add_stylebox_override("hover", new_stylebox_hover) - button.add_stylebox_override("pressed", new_stylebox_pressed) + button.add_theme_stylebox_override("normal", new_stylebox_normal) + button.add_theme_stylebox_override("hover", new_stylebox_hover) + button.add_theme_stylebox_override("pressed", new_stylebox_pressed) - label.add_color_override("font_color", Color(1, 1, 0.5)) + label.add_theme_color_override("font_color", Color(1, 1, 0.5)) func _on_button2_pressed(): - var new_stylebox_normal = button2.get_stylebox("normal").duplicate() + var new_stylebox_normal = button2.get_theme_stylebox("normal").duplicate() new_stylebox_normal.border_color = Color(0, 1, 0.5) - var new_stylebox_hover = button2.get_stylebox("hover").duplicate() + var new_stylebox_hover = button2.get_theme_stylebox("hover").duplicate() new_stylebox_hover.border_color = Color(0, 1, 0.5) - var new_stylebox_pressed = button2.get_stylebox("pressed").duplicate() + var new_stylebox_pressed = button2.get_theme_stylebox("pressed").duplicate() new_stylebox_pressed.border_color = Color(0, 1, 0.5) - button2.add_stylebox_override("normal", new_stylebox_normal) - button2.add_stylebox_override("hover", new_stylebox_hover) - button2.add_stylebox_override("pressed", new_stylebox_pressed) + button2.add_theme_stylebox_override("normal", new_stylebox_normal) + button2.add_theme_stylebox_override("hover", new_stylebox_hover) + button2.add_theme_stylebox_override("pressed", new_stylebox_pressed) - label.add_color_override("font_color", Color(0.5, 1, 0.75)) + label.add_theme_color_override("font_color", Color(0.5, 1, 0.75)) func _on_reset_all_button_pressed(): @@ -56,12 +56,12 @@ func _on_reset_all_button_pressed(): # - `null` for fonts, icons, styleboxes, and shaders. # - `0` for constants. # - Colors must be reset manually by adding the previous color value as an override. - button.add_stylebox_override("normal", null) - button.add_stylebox_override("hover", null) - button.add_stylebox_override("pressed", null) + button.add_theme_stylebox_override("normal", null) + button.add_theme_stylebox_override("hover", null) + button.add_theme_stylebox_override("pressed", null) - button2.add_stylebox_override("normal", null) - button2.add_stylebox_override("hover", null) - button2.add_stylebox_override("pressed", null) + button2.add_theme_stylebox_override("normal", null) + button2.add_theme_stylebox_override("hover", null) + button2.add_theme_stylebox_override("pressed", null) - label.add_color_override("font_color", default_label_color) + label.add_theme_color_override("font_color", default_label_color) diff --git a/gui/translation/hello_en.wav.import b/gui/translation/hello_en.wav.import index 32d5908..76924e7 100644 --- a/gui/translation/hello_en.wav.import +++ b/gui/translation/hello_en.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/gui/translation/hello_es.wav.import b/gui/translation/hello_es.wav.import index 2d1236b..172a597 100644 --- a/gui/translation/hello_es.wav.import +++ b/gui/translation/hello_es.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/gui/translation/hello_jp.wav.import b/gui/translation/hello_jp.wav.import index 50dd285..248b6cd 100644 --- a/gui/translation/hello_jp.wav.import +++ b/gui/translation/hello_jp.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/gui/translation/project.pandemonium b/gui/translation/project.pandemonium index dc1edaa..a7ae242 100644 --- a/gui/translation/project.pandemonium +++ b/gui/translation/project.pandemonium @@ -40,7 +40,6 @@ multithread/thread_rid_pool_prealloc=60 [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false environment/default_clear_color=Color( 0.145098, 0.145098, 0.164706, 1 )