Merge remote-tracking branch 'upstream/master'

This commit is contained in:
CheetoHead 2019-12-20 15:23:14 -05:00
commit 33551c4d81
20 changed files with 1316 additions and 426 deletions

View file

@ -1,9 +1,13 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://Themes & Styles/Main Theme/Main Theme.tres" type="Theme" id=1]
[ext_resource path="res://Themes & Styles/Godot's Theme/Godot's Theme.tres" type="Theme" id=1]
[ext_resource path="res://Scripts/NotificationLabel.gd" type="Script" id=2]
[node name="NotificationLabel" type="Label"]
margin_right = 116.0
margin_bottom = 14.0

View file

@ -12,10 +12,10 @@ script = ExtResource( 1 )
[node name="VBoxContainer" type="VBoxContainer" parent="."]
anchor_left = 0.5
anchor_right = 0.5
margin_left = -92.0
margin_left = -109.0
margin_top = 8.0
margin_right = 92.0
margin_bottom = 34.0
margin_right = 109.0
margin_bottom = 150.0
[node name="OptionsContainer" type="GridContainer" parent="VBoxContainer"]
margin_right = 218.0
@ -33,7 +33,7 @@ margin_left = 67.0
margin_right = 218.0
margin_bottom = 20.0
text = "System Language"
items = [ "System Language", null, false, 0, null, "Deutsch [de]", null, false, 1, null, "Ελληνικά [el]", null, false, 2, null, "English [en]", null, false, 3, null, "Français [fr]", null, false, 4, null, "Polski [pl]", null, false, 5, null, "Русский [ru]", null, false, 6, null, "繁體中文 [zh_TW]", null, false, 7, null ]
items = [ "System Language", null, false, 0, null, "Deutsch [de]", null, false, 1, null, "Ελληνικά [el]", null, false, 2, null, "English [en]", null, false, 3, null, "Français [fr]", null, false, 4, null, "Polski [pl]", null, false, 5, null, "Português Brasileiro [pt_BR]", null, false, 6, null, "Русский [ru]", null, false, 7, null, "繁體中文 [zh_TW]", null, false, 8, null ]
selected = 0
[node name="ThemeLabel" type="Label" parent="VBoxContainer/OptionsContainer"]
@ -47,9 +47,9 @@ margin_left = 67.0
margin_top = 24.0
margin_right = 218.0
margin_bottom = 44.0
text = "Dark Theme"
items = [ "Main Theme", null, false, 0, null, "Dark Theme", null, false, 1, null ]
selected = 1
text = "Dark"
items = [ "Dark", null, false, 0, null, "Gray", null, false, 1, null, "Godot", null, false, 2, null, "Light", null, false, 3, null ]
selected = 0
[node name="GridOptionsLabel" type="Label" parent="VBoxContainer"]
margin_top = 48.0