Browse Source

Merge pull request #890 from vvv-yeaf/Misc-HDR-And-Levels

Editor GUI Update
Brian Roberts 3 years ago
parent
commit
1541a8cc68

+ 3 - 3
Templates/BaseGame/game/core/gui/scripts/profiles.tscript

@@ -57,7 +57,7 @@ new GuiControlProfile (GuiDefaultProfile)
    borderColorNA = "75 75 75"; 
    borderColorNA = "75 75 75"; 
 
 
    // font
    // font
-   fontType = "Arial";
+   fontType = "Noto Sans";
    fontSize = 14;
    fontSize = 14;
    fontCharset = ANSI;
    fontCharset = ANSI;
 
 
@@ -97,7 +97,7 @@ new GuiControlProfile (GuiToolTipProfile)
    borderColor   = "87 87 87";
    borderColor   = "87 87 87";
 
 
    // font
    // font
-   fontType = "Arial";
+   fontType = "Noto Sans";
    fontSize = 14;
    fontSize = 14;
    fontColor = "200 200 200";
    fontColor = "200 200 200";
 
 
@@ -218,7 +218,7 @@ if( !isObject( GuiProgressTextProfile ) )
 new GuiControlProfile( GuiProgressTextProfile )
 new GuiControlProfile( GuiProgressTextProfile )
 {
 {
    fontSize = "14";
    fontSize = "14";
-	fontType = "Arial";
+	fontType = "Noto Sans";
    fontColor = "0 0 0";
    fontColor = "0 0 0";
    justify = "center";
    justify = "center";
    category = "Core";   
    category = "Core";   

+ 1 - 1
Templates/BaseGame/game/tools/VPathEditor/GUI/Profiles.tscript

@@ -7,6 +7,6 @@ singleton GuiControlProfile( VPathEditorProfile )
 {
 {
    CanKeyFocus = true;
    CanKeyFocus = true;
    
    
-   FontType  = "Arial Bold";
+   FontType  = "Noto Sans Bold";
    FontColor = "0 0 0";
    FontColor = "0 0 0";
 };
 };

+ 3 - 3
Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript

@@ -15,7 +15,7 @@ singleton GuiControlProfile( VEditorDefaultProfile )
     borderColorHL = "100 100 100";
     borderColorHL = "100 100 100";
     borderColorNA = "240 240 240";
     borderColorNA = "240 240 240";
 
 
-    fontType      = "Arial";
+    fontType      = "Noto Sans";
     fontSize      = 12;
     fontSize      = 12;
     fontCharset   = ANSI;
     fontCharset   = ANSI;
 
 
@@ -56,7 +56,7 @@ singleton GuiControlProfile( VEditorTextProfile : VEditorDefaultProfile )
     border = false;
     border = false;
     opaque = false;
     opaque = false;
     
     
-    fontType = "Arial Bold";
+    fontType = "Noto Sans Bold";
 };
 };
 
 
 singleton GuiControlProfile( VEditorTextEditProfile : VEditorDefaultProfile )
 singleton GuiControlProfile( VEditorTextEditProfile : VEditorDefaultProfile )
@@ -186,7 +186,7 @@ singleton GuiControlProfile( VEditorPropertyRolloutProfile : GuiRolloutProfile )
     hasBitmapArray = true;
     hasBitmapArray = true;
     bitmapAsset = "ToolsModule:PropertyRollout_image";
     bitmapAsset = "ToolsModule:PropertyRollout_image";
 
 
-    fontType      = "Arial";
+    fontType      = "Noto Sans";
     fontSize      = 12;
     fontSize      = 12;
     fontCharset   = ANSI;
     fontCharset   = ANSI;
 
 

BIN
Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_d.png


BIN
Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_h.png


BIN
Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_n.png


BIN
Templates/BaseGame/game/tools/editorClasses/gui/images/rollout.png


BIN
Templates/BaseGame/game/tools/gui/images/scrollBar.png


BIN
Templates/BaseGame/game/tools/gui/images/tab.png


BIN
Templates/BaseGame/game/tools/gui/images/window.png


+ 6 - 3
Templates/BaseGame/game/tools/gui/profiles.ed.tscript

@@ -309,8 +309,10 @@ new GuiControlProfile( ToolsGuiTextEditProfile )
    fillColorHL = EditorSettings.value("Theme/fieldBGHLColor");
    fillColorHL = EditorSettings.value("Theme/fieldBGHLColor");
    fillColorSEL = EditorSettings.value("Theme/fieldBGSELColor");
    fillColorSEL = EditorSettings.value("Theme/fieldBGSELColor");
    
    
+   
    fontColor = EditorSettings.value("Theme/fieldTextColor");
    fontColor = EditorSettings.value("Theme/fieldTextColor");
-   fontColorSEL = EditorSettings.value("Theme/fieldBGSELColor");
+   //fontColorSEL = EditorSettings.value("Theme/fieldBGSELColor");
+   fontColorSEL = EditorSettings.value("Theme/dividerMidColor");
    fontColorHL = EditorSettings.value("Theme/fieldTextSELColor");
    fontColorHL = EditorSettings.value("Theme/fieldTextSELColor");
    fontColorNA = EditorSettings.value("Theme/fieldTextNAColor");
    fontColorNA = EditorSettings.value("Theme/fieldTextNAColor");
    textOffset = "4 2";
    textOffset = "4 2";
@@ -798,6 +800,7 @@ singleton GuiControlProfile( GuiInspectorTextEditRightProfile : GuiInspectorText
    category = "Editor";
    category = "Editor";
 };
 };
 
 
+//Scene Tree GUI Inspector Dropdown menus
 singleton GuiControlProfile( GuiInspectorGroupProfile )
 singleton GuiControlProfile( GuiInspectorGroupProfile )
 {
 {
    fontType    = "Noto Sans";
    fontType    = "Noto Sans";
@@ -843,7 +846,7 @@ singleton GuiControlProfile( GuiInspectorFieldProfile)
    fontColor = EditorSettings.value("Theme/fieldTextColor");
    fontColor = EditorSettings.value("Theme/fieldTextColor");
    fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
    fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
    fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
    fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
-   textOffset = "10 0";
+   textOffset = "15 0";
 
 
    tab = true;
    tab = true;
    canKeyFocus = true;
    canKeyFocus = true;
@@ -1137,7 +1140,7 @@ singleton GuiControlProfile( ToolsGuiMenuBarProfile )
    fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor");
    fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor");
    fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
    fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
    fontColorNA = EditorSettings.value("Theme/fieldTextNAColor");
    fontColorNA = EditorSettings.value("Theme/fieldTextNAColor");
-   border = 0;
+   border = 1;
    borderThickness = 1;
    borderThickness = 1;
    opaque = true;
    opaque = true;
    mouseOverSelected = true;
    mouseOverSelected = true;

+ 1 - 1
Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.tscript

@@ -31,7 +31,7 @@ singleton GuiControlProfile (GuiMatEdSliderProfile)
 singleton GuiControlProfile (GuiMatEdRightJustifyProfile)
 singleton GuiControlProfile (GuiMatEdRightJustifyProfile)
 {
 {
    // font
    // font
-   fontType = "Arial";
+   fontType = "Noto Sans";
    fontSize = 14;
    fontSize = 14;
    fontCharset = ANSI;
    fontCharset = ANSI;
 
 

+ 21 - 19
Templates/BaseGame/game/tools/settings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="UTF-8" standalone ="yes"?>
 <EditorSettings>
 <EditorSettings>
     <Group
     <Group
         name="AssetBrowser">
         name="AssetBrowser">
@@ -39,7 +39,7 @@
         <Group
         <Group
             name="Browser">
             name="Browser">
             <Setting
             <Setting
-				name="doubleClickAction">Edit Asset</Setting>
+                name="doubleClickAction">Edit Asset</Setting>
             <Setting
             <Setting
                 name="previewTileSize">1</Setting>
                 name="previewTileSize">1</Setting>
             <Setting
             <Setting
@@ -318,43 +318,45 @@
     <Group
     <Group
         name="Theme">
         name="Theme">
         <Setting
         <Setting
-            name="dividerDarkColor">17 16 15 255</Setting>
+            name="dividerDarkColor">30 30 30 255</Setting>
         <Setting
         <Setting
-            name="dividerLightColor">96 94 92 255</Setting>
+            name="dividerLightColor">150 150 150 255</Setting>
         <Setting
         <Setting
-            name="dividerMidColor">50 49 48 255</Setting>
+            name="dividerMidColor">150 160 190 100</Setting>
         <Setting
         <Setting
-            name="fieldBGColor">59 58 57 255</Setting>
+            name="fieldBGColor">40 40 40 255</Setting>
         <Setting
         <Setting
-            name="fieldBGHLColor">72 70 68 255</Setting>
+            name="fieldBGHLColor">100 110 120 255</Setting>
         <Setting
         <Setting
-            name="fieldBGSELColor">100 98 96 255</Setting>
+            name="fieldBGSELColor">150 160 170 255</Setting>
         <Setting
         <Setting
-            name="fieldTextColor">178 175 172 255</Setting>
+            name="fieldTextColor">185 185 185 255</Setting>
         <Setting
         <Setting
-            name="fieldTextHLColor">234 232 230 255</Setting>
+            name="fieldTextHLColor">255 255 255 255</Setting>
         <Setting
         <Setting
-            name="fieldTextNAColor">120 120 120 255</Setting>
+            name="fieldTextNAColor">100 100 100 255</Setting>
         <Setting
         <Setting
             name="fieldTextSELColor">255 255 255 255</Setting>
             name="fieldTextSELColor">255 255 255 255</Setting>
         <Setting
         <Setting
-            name="headerColor">50 49 48 255</Setting>
+            name="headerColor">40 40 40 255</Setting>
         <Setting
         <Setting
-            name="headerTextColor">236 234 232 255</Setting>
+            name="headerTextColor">185 185 185 255</Setting>
         <Setting
         <Setting
-            name="tabsColor">37 36 35 255</Setting>
+            name="tabsColor">40 40 40 255</Setting>
         <Setting
         <Setting
-            name="tabsHLColor">50 49 48 255</Setting>
+            name="tabsHLColor">180 180 180 255</Setting>
         <Setting
         <Setting
-            name="tabsSELColor">59 58 57 255</Setting>
+            name="tabsSELColor">100 110 120 255</Setting>
         <Setting
         <Setting
-            name="tooltipBGColor">43 43 43 255</Setting>
+            name="tooltipBGColor">100 110 120 255</Setting>
+        <Setting
+            name="tooltipDivColor">150 150 150 255</Setting>
         <Setting
         <Setting
             name="tooltipDividerColor">72 70 68 255</Setting>
             name="tooltipDividerColor">72 70 68 255</Setting>
         <Setting
         <Setting
             name="tooltipTextColor">255 255 255 255</Setting>
             name="tooltipTextColor">255 255 255 255</Setting>
         <Setting
         <Setting
-            name="windowBackgroundColor">32 31 30 255</Setting>
+            name="windowBackgroundColor">35 35 35 255</Setting>
     </Group>
     </Group>
     <Group
     <Group
         name="WorldEditor">
         name="WorldEditor">
@@ -371,7 +373,7 @@
         <Setting
         <Setting
             name="forceSidebarToSide">1</Setting>
             name="forceSidebarToSide">1</Setting>
         <Setting
         <Setting
-            name="orthoFOV">4.60158</Setting>
+            name="orthoFOV">4.60158014</Setting>
         <Setting
         <Setting
             name="orthoShowGrid">1</Setting>
             name="orthoShowGrid">1</Setting>
         <Setting
         <Setting

+ 19 - 19
Templates/BaseGame/game/tools/worldEditor/scripts/editorPrefs.ed.tscript

@@ -102,8 +102,8 @@ EditorSettings.endGroup();
 EditorSettings.beginGroup( "Docs" );
 EditorSettings.beginGroup( "Docs" );
 EditorSettings.setDefaultValue(  "documentationLocal",      "../../../Documentation/Official Documentation.html"  );
 EditorSettings.setDefaultValue(  "documentationLocal",      "../../../Documentation/Official Documentation.html"  );
 EditorSettings.setDefaultValue(  "documentationReference",  "../../../Documentation/Torque 3D - Script Manual.chm");
 EditorSettings.setDefaultValue(  "documentationReference",  "../../../Documentation/Torque 3D - Script Manual.chm");
-EditorSettings.setDefaultValue(  "documentationURL",        "http://www.garagegames.com/products/torque-3d/documentation/user"           );
-EditorSettings.setDefaultValue(  "forumURL",                "http://www.garagegames.com/products/torque-3d/forums"      );
+EditorSettings.setDefaultValue(  "documentationURL",        "https://docs.torque3d.org/"           );
+EditorSettings.setDefaultValue(  "forumURL",                "https://torque3d.org/"      );
 EditorSettings.endGroup();
 EditorSettings.endGroup();
 
 
 EditorSettings.endGroup(); // WorldEditor
 EditorSettings.endGroup(); // WorldEditor
@@ -178,31 +178,31 @@ EditorSettings.endGroup();
 
 
 //-------------------------------------
 //-------------------------------------
 EditorSettings.beginGroup( "Theme", true );
 EditorSettings.beginGroup( "Theme", true );
-EditorSettings.setDefaultValue(  "headerColor",             "50 49 48 255");
-EditorSettings.setDefaultValue(  "windowBackgroundColor",   "32 31 30 255");
+EditorSettings.setDefaultValue(  "headerColor",             "40 40 40 255");
+EditorSettings.setDefaultValue(  "windowBackgroundColor",   "35 35 35 255");
 
 
-EditorSettings.setDefaultValue(  "tabsColor",               "37 36 35 255" );
-EditorSettings.setDefaultValue(  "tabsHLColor",             "50 49 48 255" );
-EditorSettings.setDefaultValue(  "tabsSELColor",            "59 58 57 255" );
+EditorSettings.setDefaultValue(  "tabsColor",               "40 40 40 255" );
+EditorSettings.setDefaultValue(  "tabsHLColor",             "180 180 180 255" );
+EditorSettings.setDefaultValue(  "tabsSELColor",            "100 110 120 255" );
 
 
-EditorSettings.setDefaultValue(  "dividerDarkColor",        "17 16 15 255");
-EditorSettings.setDefaultValue(  "dividerMidColor",         "50 49 48 255");
-EditorSettings.setDefaultValue(  "dividerLightColor",       "96 94 92 255");
+EditorSettings.setDefaultValue(  "dividerDarkColor",        "30 30 30 255");
+EditorSettings.setDefaultValue(  "dividerMidColor",         "150 160 190 100");
+EditorSettings.setDefaultValue(  "dividerLightColor",       "150 150 150 255");
 
 
-EditorSettings.setDefaultValue(  "headerTextColor",         "236 234 232 255");
+EditorSettings.setDefaultValue(  "headerTextColor",         "185 185 185 255");
 
 
-EditorSettings.setDefaultValue(  "fieldTextColor",          "178 175 172 255");
-EditorSettings.setDefaultValue(  "fieldTextHLColor",        "234 232 230 255");
+EditorSettings.setDefaultValue(  "fieldTextColor",          "185 185 185 255");
+EditorSettings.setDefaultValue(  "fieldTextHLColor",        "255 255 255 255");
 EditorSettings.setDefaultValue(  "fieldTextSELColor",       "255 255 255 255");
 EditorSettings.setDefaultValue(  "fieldTextSELColor",       "255 255 255 255");
-EditorSettings.setDefaultValue(  "fieldTextNAColor",        "120 120 120 255");
+EditorSettings.setDefaultValue(  "fieldTextNAColor",        "100 100 100 255");
 
 
-EditorSettings.setDefaultValue(  "fieldBGColor",            "59 58 57 255");
-EditorSettings.setDefaultValue(  "fieldBGHLColor",          "72 70 68 255");
-EditorSettings.setDefaultValue(  "fieldBGSELColor",         "100 98 96 255");
+EditorSettings.setDefaultValue(  "fieldBGColor",            "40 40 40 255");
+EditorSettings.setDefaultValue(  "fieldBGHLColor",          "100 110 120 255");
+EditorSettings.setDefaultValue(  "fieldBGSELColor",         "150 160 170 255");
 
 
-EditorSettings.setDefaultValue(  "tooltipBGColor",          "43 43 43 255");
+EditorSettings.setDefaultValue(  "tooltipBGColor",          "100 110 120 255");
 EditorSettings.setDefaultValue(  "tooltipTextColor",        "255 255 255 255");
 EditorSettings.setDefaultValue(  "tooltipTextColor",        "255 255 255 255");
-EditorSettings.setDefaultValue(  "tooltipDivColor",         "72 70 68 255");
+EditorSettings.setDefaultValue(  "tooltipDivColor",         "150 150 150 255");
 EditorSettings.endGroup();
 EditorSettings.endGroup();
 //-------------------------------------
 //-------------------------------------