diff --git a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/Screens/PlayerSelection.tscn b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/Screens/PlayerSelection.tscn index cdbf2dc..fa1e992 100644 --- a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/Screens/PlayerSelection.tscn +++ b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/Screens/PlayerSelection.tscn @@ -1,12 +1,14 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://UserInterface/But_ChangeScene.tscn" type="PackedScene" id=1] +[ext_resource path="res://Screens/PlayerSelection.gd" type="Script" id=2] [ext_resource path="res://assets/ui_controlNode_dark_theme.tres" type="Theme" id=6] [node name="PlayerSelection" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 theme = ExtResource( 6 ) +script = ExtResource( 2 ) [node name="Background" type="Panel" parent="."] anchor_right = 1.0 diff --git a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/Screens/SettingsMenuConfig.gd b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/Screens/SettingsMenuConfig.gd index f63b265..e8be7aa 100644 --- a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/Screens/SettingsMenuConfig.gd +++ b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/Screens/SettingsMenuConfig.gd @@ -15,27 +15,27 @@ onready var saveObject = get_node('/root/GlobalSaveInstance') #res://SettingsMenuControl.tscn # Vars For UI Widgets -onready var NameVar = get_node('Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/DisplayNameLineEdit') +onready var NameVar = get_node('SettingsScroll/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/DisplayNameLineEdit') -onready var NRiskVar = get_node('Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor/RiskSlider') +onready var NRiskVar = get_node('SettingsScroll/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor/RiskSlider') -onready var FontVar = get_node("Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox/FontSizeSlider") +onready var FontVar = get_node("SettingsScroll/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox/FontSizeSlider") -onready var BrightnessVar = get_node('Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox/BrightnessSlider') +onready var BrightnessVar = get_node('SettingsScroll/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox/BrightnessSlider') -onready var VolumeVar = get_node("Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/VolumeSlider") +onready var VolumeVar = get_node("SettingsScroll/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/VolumeSlider") -onready var ClosedCaptionsVar = get_node('Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxClosedCaptions/ClosedCaptionsCheckBox') +onready var ClosedCaptionsVar = get_node('SettingsScroll/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxClosedCaptions/ClosedCaptionsCheckBox') -onready var ConsoleCommandVar = get_node('Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxDevConsole/DevConsoleCheckbox') +onready var ConsoleCommandVar = get_node('SettingsScroll/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxDevConsole/DevConsoleCheckbox') -onready var saveButton = get_node("Panel/HBoxBottomRow/SaveButton") +onready var saveButton = get_node("HBoxBottomRow/SaveButton") -onready var bKeyboardEnabled = get_node("Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxVirtualKeyboardEnabled/VisualKeyboardCheckBox") +onready var bKeyboardEnabled = get_node("SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxVirtualKeyboardEnabled/VisualKeyboardCheckBox") -onready var keyboardLayoutList = get_node('Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/LayoutItemList') +onready var keyboardLayoutList = get_node('SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/LayoutItemList') -onready var themeChoiceList = get_node('Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/ThemeItemList') +onready var themeChoiceList = get_node('SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/ThemeItemList') var iniFile = ConfigFile.new() @@ -55,9 +55,16 @@ func saveToInstance(): var savedThemeItems = themeChoiceList.get_selected_items() var themeSelection = savedThemeItems[0] saveObject.settingsInstance.themeChoiceInt = themeSelection - #Trigger re-load of the file name - saveObject.load_settings_file() + #DKM TEMP: for web version, setting this to the singleton without requiring reprocess of file + if(saveObject.settingsInstance.themeChoiceInt == 1): + saveObject.settingsInstance.themeFile = "res://assets/ui_controlNode_light_theme.tres" + else: + saveObject.settingsInstance.themeFile = "res://assets/ui_controlNode_dark_theme.tres" + #Load selected theme: theme=load(saveObject.settingsInstance.themeFile) + #Trigger re-load of the file name + #saveObject.load_settings_file() + #theme=load(saveObject.settingsInstance.themeFile) func saveFile(): diff --git a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/Screens/SettingsMenuControl.tscn b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/Screens/SettingsMenuControl.tscn index e5b5f3e..0385209 100644 --- a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/Screens/SettingsMenuControl.tscn +++ b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/Screens/SettingsMenuControl.tscn @@ -8,50 +8,62 @@ default_font = ExtResource( 2 ) [node name="Control" type="Control"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -512.0 -margin_top = -300.0 -margin_right = 512.0 -margin_bottom = 300.0 +anchor_right = 1.0 +anchor_bottom = 1.0 theme = SubResource( 1 ) script = ExtResource( 1 ) [node name="Panel" type="Panel" parent="."] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -512.0 -margin_top = -302.0 -margin_right = 512.0 -margin_bottom = 298.0 -rect_pivot_offset = Vector2( -276, 469 ) +anchor_right = 1.0 +anchor_bottom = 1.0 + +[node name="HBoxBottomRow" type="HBoxContainer" parent="."] +margin_right = 146.0 +margin_bottom = 25.0 +alignment = 1 + +[node name="SaveButton" type="Button" parent="HBoxBottomRow"] +margin_right = 97.0 +margin_bottom = 25.0 +text = "Save Settings" + +[node name="But_ChangeScene" type="Button" parent="HBoxBottomRow"] +margin_left = 101.0 +margin_right = 146.0 +margin_bottom = 25.0 +size_flags_vertical = 3 +text = "Back" +script = ExtResource( 3 ) __meta__ = { "_edit_use_anchors_": false } +next_scene_path = "res://Screens/MenuScreen.tscn" -[node name="HBoxContainer" type="HBoxContainer" parent="Panel"] -anchor_left = 0.5 -anchor_right = 0.5 -margin_left = -298.5 -margin_right = 298.5 +[node name="SettingsScroll" type="ScrollContainer" parent="."] +anchor_top = 0.568 +anchor_right = 0.601 +anchor_bottom = 0.669 +margin_left = 20.0 +margin_top = -300.8 +margin_right = 4.57599 +margin_bottom = 38.6 + +[node name="HBoxContainer" type="HBoxContainer" parent="SettingsScroll"] +margin_right = 597.0 margin_bottom = 19.0 custom_constants/separation = 60 alignment = 1 -[node name="RootVboxVisualControls" type="VBoxContainer" parent="Panel/HBoxContainer"] +[node name="RootVboxVisualControls" type="VBoxContainer" parent="SettingsScroll/HBoxContainer"] margin_right = 98.0 margin_bottom = 19.0 -[node name="VisualControlsLabel" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls"] +[node name="VisualControlsLabel" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls"] margin_right = 98.0 margin_bottom = 19.0 text = "Visual Controls" -[node name="VisualControlsVBox" type="VBoxContainer" parent="Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel"] +[node name="VisualControlsVBox" type="VBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls/VisualControlsLabel"] anchor_left = 0.5 anchor_right = 0.5 margin_left = -77.5 @@ -62,16 +74,16 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="HBoxFontSize" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox"] +[node name="HBoxFontSize" type="HBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox"] margin_right = 155.0 margin_bottom = 19.0 -[node name="FontLabel" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox/HBoxFontSize"] +[node name="FontLabel" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox/HBoxFontSize"] margin_right = 64.0 margin_bottom = 19.0 text = "Font Size:" -[node name="FontSizeSlider" type="HSlider" parent="Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox"] +[node name="FontSizeSlider" type="HSlider" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox"] margin_top = 23.0 margin_right = 155.0 margin_bottom = 39.0 @@ -82,13 +94,13 @@ rounded = true tick_count = 10 ticks_on_borders = true -[node name="BrightnessLabel" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox"] +[node name="BrightnessLabel" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox"] margin_top = 43.0 margin_right = 155.0 margin_bottom = 62.0 text = "Brightness:" -[node name="BrightnessSlider" type="HSlider" parent="Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox"] +[node name="BrightnessSlider" type="HSlider" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox"] margin_top = 66.0 margin_right = 155.0 margin_bottom = 82.0 @@ -99,37 +111,37 @@ rounded = true tick_count = 10 ticks_on_borders = true -[node name="RootVboxPlayerPreferences" type="VBoxContainer" parent="Panel/HBoxContainer"] +[node name="RootVboxPlayerPreferences" type="VBoxContainer" parent="SettingsScroll/HBoxContainer"] margin_left = 158.0 margin_right = 275.0 margin_bottom = 19.0 -[node name="Label" type="Label" parent="Panel/HBoxContainer/RootVboxPlayerPreferences"] +[node name="Label" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxPlayerPreferences"] margin_right = 117.0 margin_bottom = 19.0 text = "Player Preferances" -[node name="VBoxPlayerPreferances" type="VBoxContainer" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label"] +[node name="VBoxPlayerPreferances" type="VBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxPlayerPreferences/Label"] margin_left = -18.5 margin_top = 30.0 margin_right = 126.5 margin_bottom = 125.0 -[node name="HBoxDisplayName" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances"] +[node name="HBoxDisplayName" type="HBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances"] margin_right = 145.0 margin_bottom = 19.0 -[node name="DisplayNameLabel" type="Label" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/HBoxDisplayName"] +[node name="DisplayNameLabel" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/HBoxDisplayName"] margin_right = 95.0 margin_bottom = 19.0 text = "Display Name:" -[node name="DisplayNameLineEdit" type="LineEdit" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances"] +[node name="DisplayNameLineEdit" type="LineEdit" parent="SettingsScroll/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances"] margin_top = 23.0 margin_right = 145.0 margin_bottom = 52.0 -[node name="VBoxRiskFactor" type="VBoxContainer" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances"] +[node name="VBoxRiskFactor" type="VBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances"] margin_top = 56.0 margin_right = 145.0 margin_bottom = 95.0 @@ -137,16 +149,16 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="HBoxRiskFactor" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor"] +[node name="HBoxRiskFactor" type="HBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor"] margin_right = 145.0 margin_bottom = 19.0 -[node name="RiskFactorLabel" type="Label" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor/HBoxRiskFactor"] +[node name="RiskFactorLabel" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor/HBoxRiskFactor"] margin_right = 145.0 margin_bottom = 19.0 text = "Risk Factor Threshold:" -[node name="RiskSlider" type="HSlider" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor"] +[node name="RiskSlider" type="HSlider" parent="SettingsScroll/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor"] margin_top = 23.0 margin_right = 145.0 margin_bottom = 39.0 @@ -157,17 +169,17 @@ rounded = true tick_count = 10 ticks_on_borders = true -[node name="RootVboxGeneralSettings" type="VBoxContainer" parent="Panel/HBoxContainer"] +[node name="RootVboxGeneralSettings" type="VBoxContainer" parent="SettingsScroll/HBoxContainer"] margin_left = 335.0 margin_right = 439.0 margin_bottom = 19.0 -[node name="GeneralSettingsLabel" type="Label" parent="Panel/HBoxContainer/RootVboxGeneralSettings"] +[node name="GeneralSettingsLabel" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxGeneralSettings"] margin_right = 104.0 margin_bottom = 19.0 text = "General Settings" -[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel"] +[node name="VBoxContainer" type="VBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel"] anchor_left = 0.5 anchor_right = 0.5 margin_left = -77.5 @@ -178,13 +190,13 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Label" type="Label" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer"] +[node name="Label" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer"] margin_right = 155.0 margin_bottom = 19.0 rect_pivot_offset = Vector2( 62, 14 ) text = "Volume:" -[node name="VolumeSlider" type="HSlider" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer"] +[node name="VolumeSlider" type="HSlider" parent="SettingsScroll/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer"] margin_top = 23.0 margin_right = 155.0 margin_bottom = 39.0 @@ -193,49 +205,49 @@ rounded = true tick_count = 10 ticks_on_borders = true -[node name="HBoxClosedCaptions" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer"] +[node name="HBoxClosedCaptions" type="HBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer"] margin_top = 43.0 margin_right = 155.0 margin_bottom = 70.0 -[node name="ClosedCaptionsLabel" type="Label" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxClosedCaptions"] +[node name="ClosedCaptionsLabel" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxClosedCaptions"] margin_top = 4.0 margin_right = 108.0 margin_bottom = 23.0 text = "Closed Captions:" -[node name="ClosedCaptionsCheckBox" type="CheckBox" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxClosedCaptions"] +[node name="ClosedCaptionsCheckBox" type="CheckBox" parent="SettingsScroll/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxClosedCaptions"] margin_left = 112.0 margin_right = 136.0 margin_bottom = 27.0 -[node name="HBoxDevConsole" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer"] +[node name="HBoxDevConsole" type="HBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer"] margin_top = 74.0 margin_right = 155.0 margin_bottom = 101.0 -[node name="DevConsoleLabel" type="Label" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxDevConsole"] +[node name="DevConsoleLabel" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxDevConsole"] margin_top = 4.0 margin_right = 126.0 margin_bottom = 23.0 text = "Developer Console:" -[node name="DevConsoleCheckbox" type="CheckBox" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxDevConsole"] +[node name="DevConsoleCheckbox" type="CheckBox" parent="SettingsScroll/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxDevConsole"] margin_left = 130.0 margin_right = 154.0 margin_bottom = 27.0 -[node name="RootVboxVisualControls2" type="VBoxContainer" parent="Panel/HBoxContainer"] +[node name="RootVboxVisualControls2" type="VBoxContainer" parent="SettingsScroll/HBoxContainer"] margin_left = 499.0 margin_right = 597.0 margin_bottom = 19.0 -[node name="Label2" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls2"] +[node name="Label2" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls2"] margin_right = 98.0 margin_bottom = 19.0 text = "Visual Controls" -[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2"] +[node name="VBoxContainer" type="VBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2"] anchor_left = 0.5 anchor_right = 0.5 margin_left = -77.5 @@ -246,81 +258,51 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="HBoxThemes" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] +[node name="HBoxThemes" type="HBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] margin_right = 155.0 margin_bottom = 19.0 -[node name="ThemesLabel" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxThemes"] +[node name="ThemesLabel" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxThemes"] margin_right = 119.0 margin_bottom = 19.0 text = "Theme Preference:" -[node name="ThemeItemList" type="ItemList" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] +[node name="ThemeItemList" type="ItemList" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] margin_top = 23.0 margin_right = 155.0 margin_bottom = 32.0 auto_height = true -[node name="HBoxVirtualKeyboardEnabled" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] +[node name="HBoxVirtualKeyboardEnabled" type="HBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] margin_top = 36.0 margin_right = 155.0 margin_bottom = 63.0 -[node name="VisualKeyBoardLabel" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxVirtualKeyboardEnabled"] +[node name="VisualKeyBoardLabel" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxVirtualKeyboardEnabled"] margin_top = 4.0 margin_right = 110.0 margin_bottom = 23.0 text = "Virtual Keyboard" -[node name="VisualKeyboardCheckBox" type="CheckBox" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxVirtualKeyboardEnabled"] +[node name="VisualKeyboardCheckBox" type="CheckBox" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxVirtualKeyboardEnabled"] margin_left = 114.0 margin_right = 138.0 margin_bottom = 27.0 -[node name="HBoxKeyboardLayout" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] +[node name="HBoxKeyboardLayout" type="HBoxContainer" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] margin_top = 67.0 margin_right = 155.0 margin_bottom = 86.0 -[node name="LayoutLabel" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxKeyboardLayout"] +[node name="LayoutLabel" type="Label" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxKeyboardLayout"] margin_right = 120.0 margin_bottom = 19.0 text = "Layout Preference:" -[node name="LayoutItemList" type="ItemList" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] +[node name="LayoutItemList" type="ItemList" parent="SettingsScroll/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] margin_top = 90.0 margin_right = 155.0 margin_bottom = 99.0 auto_height = true -[node name="HBoxBottomRow" type="HBoxContainer" parent="Panel"] -anchor_left = 0.500488 -anchor_right = 0.595215 -margin_left = -48.5 -margin_top = 200.0 -margin_right = 48.5 -margin_bottom = 225.0 -alignment = 1 -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="SaveButton" type="Button" parent="Panel/HBoxBottomRow"] -margin_left = 24.0 -margin_right = 121.0 -margin_bottom = 25.0 -text = "Save Settings" - -[node name="But_ChangeScene" type="Button" parent="Panel/HBoxBottomRow"] -margin_left = 125.0 -margin_right = 170.0 -margin_bottom = 25.0 -size_flags_vertical = 3 -text = "Back" -script = ExtResource( 3 ) -__meta__ = { -"_edit_use_anchors_": false -} -next_scene_path = "res://Screens/MenuScreen.tscn" - -[connection signal="button_up" from="Panel/HBoxBottomRow/But_ChangeScene" to="Panel/HBoxBottomRow/But_ChangeScene" method="_on_But_NewGame_button_up"] +[connection signal="button_up" from="HBoxBottomRow/But_ChangeScene" to="HBoxBottomRow/But_ChangeScene" method="_on_But_NewGame_button_up"] diff --git a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/_userFiles/characterFiles/test.csv b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/_userFiles/characterFiles/test.csv new file mode 100644 index 0000000..6d4ca27 --- /dev/null +++ b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/_userFiles/characterFiles/test.csv @@ -0,0 +1 @@ +Testing the Tester \ No newline at end of file diff --git a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/_userFiles/characterFiles/test.csv.import b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/_userFiles/characterFiles/test.csv.import new file mode 100644 index 0000000..5abc861 --- /dev/null +++ b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/_userFiles/characterFiles/test.csv.import @@ -0,0 +1,13 @@ +[remap] + +importer="csv_translation" +type="Translation" +valid=false + +[deps] + +source_file="res://_userFiles/characterFiles/test.csv" +[params] + +compress=true +delimiter=0 diff --git a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/export_presets.cfg b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/export_presets.cfg index 3ff3f55..8fc3776 100644 --- a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/export_presets.cfg +++ b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_web_2023_0806A/export_presets.cfg @@ -5,7 +5,7 @@ platform="HTML5" runnable=true custom_features="" export_filter="all_resources" -include_filter="*.json, *.csv" +include_filter="*.json, *.csv, *.cfg" exclude_filter="" export_path="../../Godot_Outputs/Godot_35_Outputs/Web/Web_Demo_Game_Base_2023_0806/index.html" script_export_mode=1