diff --git a/Engine/source/console/console.cpp b/Engine/source/console/console.cpp
index 0f761301a..5d7ab3f69 100644
--- a/Engine/source/console/console.cpp
+++ b/Engine/source/console/console.cpp
@@ -307,6 +307,9 @@ bool alwaysUseDebugOutput = true;
bool useTimestamp = false;
bool useRealTimestamp = false;
+static U32 initTime = Platform::getRealMilliseconds();
+U32 startTime = initTime;
+
ConsoleFunctionGroupBegin( Clipboard, "Miscellaneous functions to control the clipboard and clear the console.");
DefineEngineFunction( cls, void, (), , "()"
@@ -327,7 +330,7 @@ DefineEngineFunction( getClipboard, const char*, (), , "()"
};
DefineEngineFunction( setClipboard, bool, (const char* text), , "(string text)"
- "@brief Set the system clipboard.\n\n"
+ "@brief Set the system clipboard.\n\n"
"@internal")
{
return Platform::setClipboard(text);
@@ -335,6 +338,20 @@ DefineEngineFunction( setClipboard, bool, (const char* text), , "(string text)"
ConsoleFunctionGroupEnd( Clipboard );
+DefineEngineFunction( resetTimeStamp, void, (), , "()"
+ "@brief Reset the timestamp to 0 ms.\n\n"
+ "@ingroup Console")
+{
+ startTime = Platform::getRealMilliseconds();
+};
+
+DefineEngineFunction( getInitTime, int, (), , "()"
+ "@brief Get the initialization time in miliseconds.\n\n"
+ "@internal")
+{
+ return initTime;
+};
+
void postConsoleInput( RawData data );
@@ -644,7 +661,7 @@ static void _printf(ConsoleLogEntry::Level level, ConsoleLogEntry::Type type, co
{
if (!active)
return;
- Con::active = false;
+ Con::active = false;
char buffer[8192] = {};
U32 offset = 0;
@@ -664,16 +681,15 @@ static void _printf(ConsoleLogEntry::Level level, ConsoleLogEntry::Type type, co
if (useTimestamp)
{
- static U32 startTime = Platform::getRealMilliseconds();
U32 curTime = Platform::getRealMilliseconds() - startTime;
offset += dSprintf(buffer + offset, sizeof(buffer) - offset, "[+%4d.%03d]", U32(curTime * 0.001), curTime % 1000);
}
- if (useTimestamp || useRealTimestamp) {
+ if (useTimestamp || useRealTimestamp)
+ {
offset += dSprintf(buffer + offset, sizeof(buffer) - offset, " ");
}
-
dVsprintf(buffer + offset, sizeof(buffer) - offset, fmt, argptr);
for(S32 i = 0; i < gConsumers.size(); i++)
@@ -2652,3 +2668,5 @@ void ConsoleStackFrameSaver::restore()
gCallStack.popFrame();
}
}
+
+//------------------------------------------------------------------------------
diff --git a/Engine/source/core/color.cpp b/Engine/source/core/color.cpp
index 1fea8cfec..22fb6ca56 100644
--- a/Engine/source/core/color.cpp
+++ b/Engine/source/core/color.cpp
@@ -38,6 +38,8 @@ const ColorI ColorI::BLACK( 0, 0, 0 );
const ColorI ColorI::RED( 255, 0, 0 );
const ColorI ColorI::GREEN( 0, 255, 0 );
const ColorI ColorI::BLUE( 0, 0, 255 );
+const ColorI ColorI::DARK(24, 24, 24);
+const ColorI ColorI::LIGHT(120, 120, 120);
#include "console/console.h"
#include "console/consoleTypes.h"
diff --git a/Engine/source/core/color.h b/Engine/source/core/color.h
index b954b5de8..d6753406f 100644
--- a/Engine/source/core/color.h
+++ b/Engine/source/core/color.h
@@ -196,6 +196,8 @@ public:
static const ColorI RED;
static const ColorI GREEN;
static const ColorI BLUE;
+ static const ColorI LIGHT;
+ static const ColorI DARK;
};
//-----------------------------------------------------------------------------
diff --git a/Templates/BaseGame/game/core/gui/images/button.png b/Templates/BaseGame/game/core/gui/images/button.png
index 1c7361e25..949e89fbb 100644
Binary files a/Templates/BaseGame/game/core/gui/images/button.png and b/Templates/BaseGame/game/core/gui/images/button.png differ
diff --git a/Templates/BaseGame/game/core/gui/images/checkbox.png b/Templates/BaseGame/game/core/gui/images/checkbox.png
index 46e0ac959..b6d40733f 100644
Binary files a/Templates/BaseGame/game/core/gui/images/checkbox.png and b/Templates/BaseGame/game/core/gui/images/checkbox.png differ
diff --git a/Templates/BaseGame/game/core/gui/images/group-border.png b/Templates/BaseGame/game/core/gui/images/group-border.png
index 61234ae1f..59703d159 100644
Binary files a/Templates/BaseGame/game/core/gui/images/group-border.png and b/Templates/BaseGame/game/core/gui/images/group-border.png differ
diff --git a/Templates/BaseGame/game/core/gui/images/inactive-overlay.png b/Templates/BaseGame/game/core/gui/images/inactive-overlay.png
index feab83209..c5f1dbc90 100644
Binary files a/Templates/BaseGame/game/core/gui/images/inactive-overlay.png and b/Templates/BaseGame/game/core/gui/images/inactive-overlay.png differ
diff --git a/Templates/BaseGame/game/core/gui/images/scrollBar.png b/Templates/BaseGame/game/core/gui/images/scrollBar.png
index b5d0a95c5..2a8a4dabc 100644
Binary files a/Templates/BaseGame/game/core/gui/images/scrollBar.png and b/Templates/BaseGame/game/core/gui/images/scrollBar.png differ
diff --git a/Templates/BaseGame/game/core/gui/images/slider-w-box.png b/Templates/BaseGame/game/core/gui/images/slider-w-box.png
new file mode 100644
index 000000000..d11873a8e
Binary files /dev/null and b/Templates/BaseGame/game/core/gui/images/slider-w-box.png differ
diff --git a/Templates/BaseGame/game/core/gui/images/slider.png b/Templates/BaseGame/game/core/gui/images/slider.png
index 92fee1e9c..410c58388 100644
Binary files a/Templates/BaseGame/game/core/gui/images/slider.png and b/Templates/BaseGame/game/core/gui/images/slider.png differ
diff --git a/Templates/BaseGame/game/core/gui/images/textEdit.png b/Templates/BaseGame/game/core/gui/images/textEdit.png
index 5a65fac3c..6d6962de7 100644
Binary files a/Templates/BaseGame/game/core/gui/images/textEdit.png and b/Templates/BaseGame/game/core/gui/images/textEdit.png differ
diff --git a/Templates/BaseGame/game/core/gui/images/window.png b/Templates/BaseGame/game/core/gui/images/window.png
index 0f71a0a19..893285db5 100644
Binary files a/Templates/BaseGame/game/core/gui/images/window.png and b/Templates/BaseGame/game/core/gui/images/window.png differ
diff --git a/Templates/BaseGame/game/core/gui/scripts/profiles.tscript b/Templates/BaseGame/game/core/gui/scripts/profiles.tscript
index a434c8909..199d943eb 100644
--- a/Templates/BaseGame/game/core/gui/scripts/profiles.tscript
+++ b/Templates/BaseGame/game/core/gui/scripts/profiles.tscript
@@ -165,6 +165,7 @@ new GuiControlProfile(GuiMenuScrollProfile)
bitmapAsset = "Core_GUI:scrollBar_image";
hasBitmapArray = true;
category = "Core";
+ fontSize = 15;
};
if(!isObject(GuiOverlayProfile))
diff --git a/Templates/BaseGame/game/core/postFX/images/inactive-overlay.png b/Templates/BaseGame/game/core/postFX/images/inactive-overlay.png
index feab83209..c5f1dbc90 100644
Binary files a/Templates/BaseGame/game/core/postFX/images/inactive-overlay.png and b/Templates/BaseGame/game/core/postFX/images/inactive-overlay.png differ
diff --git a/Templates/BaseGame/game/data/UI/guis/loadingGui.gui b/Templates/BaseGame/game/data/UI/guis/loadingGui.gui
index f232a2af9..4ab8c400c 100644
--- a/Templates/BaseGame/game/data/UI/guis/loadingGui.gui
+++ b/Templates/BaseGame/game/data/UI/guis/loadingGui.gui
@@ -20,7 +20,7 @@ $guiContent = new GuiChunkedBitmapCtrl(LoadingGui) {
new GuiControl() {
position = "263 301";
- extent = "497 166";
+ extent = "360 360";
minExtent = "8 8";
horizSizing = "center";
vertSizing = "center";
@@ -36,11 +36,11 @@ $guiContent = new GuiChunkedBitmapCtrl(LoadingGui) {
canSaveDynamicFields = "0";
new GuiBitmapCtrl() {
- bitmapAsset = "UI:panel_image";
+ bitmapAsset = "UI:backgrounddark_image";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
- extent = "497 166";
+ extent = "360 360";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@@ -57,11 +57,11 @@ $guiContent = new GuiChunkedBitmapCtrl(LoadingGui) {
bitmapAsset = "UI:Torque_3D_logo_alt_image";
color = "255 255 255 255";
wrap = "0";
- position = "27 6";
- extent = "443 139";
+ position = "0 0";
+ extent = "360 360";
minExtent = "8 2";
horizSizing = "center";
- vertSizing = "bottom";
+ vertSizing = "center";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
@@ -79,11 +79,11 @@ $guiContent = new GuiChunkedBitmapCtrl(LoadingGui) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
- position = "17 126";
- extent = "464 24";
+ position = "30 320";
+ extent = "300 24";
minExtent = "8 2";
- horizSizing = "center";
- vertSizing = "bottom";
+ horizSizing = "width";
+ vertSizing = "top";
profile = "GuiProgressBitmapProfile";
visible = "1";
active = "1";
@@ -102,11 +102,11 @@ $guiContent = new GuiChunkedBitmapCtrl(LoadingGui) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
- position = "28 144";
- extent = "440 20";
+ position = "0 340";
+ extent = "360 20";
minExtent = "8 8";
horizSizing = "center";
- vertSizing = "bottom";
+ vertSizing = "top";
profile = "GuiMenuTextProfile";
visible = "1";
active = "1";
diff --git a/Templates/BaseGame/game/data/UI/guis/mainMenu.gui b/Templates/BaseGame/game/data/UI/guis/mainMenu.gui
index ab1fbb714..69ceaf317 100644
--- a/Templates/BaseGame/game/data/UI/guis/mainMenu.gui
+++ b/Templates/BaseGame/game/data/UI/guis/mainMenu.gui
@@ -10,11 +10,30 @@ $guiContent = new GuiChunkedBitmapCtrl(MainMenuGui) {
isContainer = "1";
superClass = "UINavigation";
canSaveDynamicFields = "0";
+
+ new GuiBitmapCtrl(SideBackgroundImage) {
+ bitmapAsset = "UI:menu_side_background_image";
+ color = "255 255 255 255";
+ wrap = "0";
+ position = "0 0";
+ extent = "900 600";
+ minExtent = "8 2";
+ horizSizing = "right";
+ vertSizing = "top";
+ profile = "GuiDefaultProfile";
+ visible = "1";
+ active = "1";
+ tooltipProfile = "GuiToolTipProfile";
+ hovertime = "1000";
+ isContainer = "0";
+ canSave = "1";
+ canSaveDynamicFields = "0";
+ };
new GuiBitmapCtrl(MainMenuAppLogo) {
- BitmapAsset = "UI:Torque_3D_logo_alt_image";
+ BitmapAsset = "UI:Torque_3D_logo_image";
position = "550 30";
- extent = "443 139";
+ extent = "360 100";
horizSizing = "left";
profile = "GuiDefaultProfile";
tooltipProfile = "GuiToolTipProfile";
diff --git a/Templates/BaseGame/game/data/UI/guis/startupGui.tscript b/Templates/BaseGame/game/data/UI/guis/startupGui.tscript
index e0490723e..ccb37dec5 100644
--- a/Templates/BaseGame/game/data/UI/guis/startupGui.tscript
+++ b/Templates/BaseGame/game/data/UI/guis/startupGui.tscript
@@ -34,8 +34,8 @@ function loadStartup()
// be in consecutive numerical order
StartupGui.bitmap[0] = "UI:backgrounddark_image";
StartupGui.logo[0] = "UI:Torque_3D_logo_alt_image";
- StartupGui.logoPos[0] = "178 251";
- StartupGui.logoExtent[0] = "443 139";
+ StartupGui.logoPos[0] = "220 120";
+ StartupGui.logoExtent[0] = "360 360";
// Call the next() function to set our firt
// splash screen
diff --git a/Templates/BaseGame/game/data/UI/images/Torque_3D_logo.png b/Templates/BaseGame/game/data/UI/images/Torque_3D_logo.png
index e31d42a68..b3d8f1124 100644
Binary files a/Templates/BaseGame/game/data/UI/images/Torque_3D_logo.png and b/Templates/BaseGame/game/data/UI/images/Torque_3D_logo.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/Torque_3D_logo_alt.png b/Templates/BaseGame/game/data/UI/images/Torque_3D_logo_alt.png
index 3836f1e7f..4aea2dde4 100644
Binary files a/Templates/BaseGame/game/data/UI/images/Torque_3D_logo_alt.png and b/Templates/BaseGame/game/data/UI/images/Torque_3D_logo_alt.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/backgrounddark.png b/Templates/BaseGame/game/data/UI/images/backgrounddark.png
index 13b4bda55..2eb1fa0ea 100644
Binary files a/Templates/BaseGame/game/data/UI/images/backgrounddark.png and b/Templates/BaseGame/game/data/UI/images/backgrounddark.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/buttontab.png b/Templates/BaseGame/game/data/UI/images/buttontab.png
index 047b88645..aef0872c3 100644
Binary files a/Templates/BaseGame/game/data/UI/images/buttontab.png and b/Templates/BaseGame/game/data/UI/images/buttontab.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/chatHudBorderArray.png b/Templates/BaseGame/game/data/UI/images/chatHudBorderArray.png
index 1aebdb2d8..371e087ef 100644
Binary files a/Templates/BaseGame/game/data/UI/images/chatHudBorderArray.png and b/Templates/BaseGame/game/data/UI/images/chatHudBorderArray.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/clearbtn_d.png b/Templates/BaseGame/game/data/UI/images/clear_btn_d.png
similarity index 100%
rename from Templates/BaseGame/game/data/UI/images/clearbtn_d.png
rename to Templates/BaseGame/game/data/UI/images/clear_btn_d.png
diff --git a/Templates/BaseGame/game/data/UI/images/clear_btn_d_image.asset.taml b/Templates/BaseGame/game/data/UI/images/clear_btn_d_image.asset.taml
index a35213c68..13416295e 100644
--- a/Templates/BaseGame/game/data/UI/images/clear_btn_d_image.asset.taml
+++ b/Templates/BaseGame/game/data/UI/images/clear_btn_d_image.asset.taml
@@ -1,8 +1,3 @@
+ AssetName="clearbtn_d_image"
+ imageFile="@assetFile=clear_btn_d.png"/>
diff --git a/Templates/BaseGame/game/data/UI/images/clearbtn_h.png b/Templates/BaseGame/game/data/UI/images/clear_btn_h.png
similarity index 100%
rename from Templates/BaseGame/game/data/UI/images/clearbtn_h.png
rename to Templates/BaseGame/game/data/UI/images/clear_btn_h.png
diff --git a/Templates/BaseGame/game/data/UI/images/clear_btn_h_image.asset.taml b/Templates/BaseGame/game/data/UI/images/clear_btn_h_image.asset.taml
index 49b78e8a2..76b1477ac 100644
--- a/Templates/BaseGame/game/data/UI/images/clear_btn_h_image.asset.taml
+++ b/Templates/BaseGame/game/data/UI/images/clear_btn_h_image.asset.taml
@@ -1,8 +1,3 @@
+ AssetName="clearbtn_h_image"
+ imageFile="@assetFile=clear_btn_h.png"/>
diff --git a/Templates/BaseGame/game/data/UI/images/clearbtn_n.png b/Templates/BaseGame/game/data/UI/images/clear_btn_n.png
similarity index 100%
rename from Templates/BaseGame/game/data/UI/images/clearbtn_n.png
rename to Templates/BaseGame/game/data/UI/images/clear_btn_n.png
diff --git a/Templates/BaseGame/game/data/UI/images/clear_btn_n_image.asset.taml b/Templates/BaseGame/game/data/UI/images/clear_btn_n_image.asset.taml
index c6868777f..0eac821fa 100644
--- a/Templates/BaseGame/game/data/UI/images/clear_btn_n_image.asset.taml
+++ b/Templates/BaseGame/game/data/UI/images/clear_btn_n_image.asset.taml
@@ -1,8 +1,3 @@
+ AssetName="clearbtn_n_image"
+ imageFile="@assetFile=clear_btn_n.png"/>
diff --git a/Templates/BaseGame/game/data/UI/images/clearbtn_d_image.asset.taml b/Templates/BaseGame/game/data/UI/images/clearbtn_d_image.asset.taml
deleted file mode 100644
index ef78852ae..000000000
--- a/Templates/BaseGame/game/data/UI/images/clearbtn_d_image.asset.taml
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/Templates/BaseGame/game/data/UI/images/clearbtn_h_image.asset.taml b/Templates/BaseGame/game/data/UI/images/clearbtn_h_image.asset.taml
deleted file mode 100644
index 882f3eb59..000000000
--- a/Templates/BaseGame/game/data/UI/images/clearbtn_h_image.asset.taml
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/Templates/BaseGame/game/data/UI/images/clearbtn_n_image.asset.taml b/Templates/BaseGame/game/data/UI/images/clearbtn_n_image.asset.taml
deleted file mode 100644
index 343f47f6a..000000000
--- a/Templates/BaseGame/game/data/UI/images/clearbtn_n_image.asset.taml
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/Templates/BaseGame/game/data/UI/images/dropDown.png b/Templates/BaseGame/game/data/UI/images/dropDown.png
index 9b7414acc..305fe7225 100644
Binary files a/Templates/BaseGame/game/data/UI/images/dropDown.png and b/Templates/BaseGame/game/data/UI/images/dropDown.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/group_border.png b/Templates/BaseGame/game/data/UI/images/group_border.png
index 61234ae1f..59703d159 100644
Binary files a/Templates/BaseGame/game/data/UI/images/group_border.png and b/Templates/BaseGame/game/data/UI/images/group_border.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/inactive-overlay.png b/Templates/BaseGame/game/data/UI/images/inactive-overlay.png
new file mode 100644
index 000000000..c5f1dbc90
Binary files /dev/null and b/Templates/BaseGame/game/data/UI/images/inactive-overlay.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/menuSlider.png b/Templates/BaseGame/game/data/UI/images/menuSlider.png
index 92fee1e9c..4e4f42313 100644
Binary files a/Templates/BaseGame/game/data/UI/images/menuSlider.png and b/Templates/BaseGame/game/data/UI/images/menuSlider.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/menu_side_background.png b/Templates/BaseGame/game/data/UI/images/menu_side_background.png
new file mode 100644
index 000000000..98b7f6c8c
Binary files /dev/null and b/Templates/BaseGame/game/data/UI/images/menu_side_background.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/menu_side_background_image.asset.taml b/Templates/BaseGame/game/data/UI/images/menu_side_background_image.asset.taml
new file mode 100644
index 000000000..4435ca8ef
--- /dev/null
+++ b/Templates/BaseGame/game/data/UI/images/menu_side_background_image.asset.taml
@@ -0,0 +1,8 @@
+
diff --git a/Templates/BaseGame/game/data/UI/images/menu_side_image.asset.taml b/Templates/BaseGame/game/data/UI/images/menu_side_image.asset.taml
new file mode 100644
index 000000000..b40ec16ee
--- /dev/null
+++ b/Templates/BaseGame/game/data/UI/images/menu_side_image.asset.taml
@@ -0,0 +1,8 @@
+
diff --git a/Templates/BaseGame/game/data/UI/images/nextbutton_d.png b/Templates/BaseGame/game/data/UI/images/nextbutton_d.png
index 76c3ec0ff..6c9f20ae4 100644
Binary files a/Templates/BaseGame/game/data/UI/images/nextbutton_d.png and b/Templates/BaseGame/game/data/UI/images/nextbutton_d.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/nextbutton_h.png b/Templates/BaseGame/game/data/UI/images/nextbutton_h.png
index f52f5fb42..195a46a3b 100644
Binary files a/Templates/BaseGame/game/data/UI/images/nextbutton_h.png and b/Templates/BaseGame/game/data/UI/images/nextbutton_h.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/nextbutton_n.png b/Templates/BaseGame/game/data/UI/images/nextbutton_n.png
index 203133732..9aaab4d86 100644
Binary files a/Templates/BaseGame/game/data/UI/images/nextbutton_n.png and b/Templates/BaseGame/game/data/UI/images/nextbutton_n.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/numericslider.png b/Templates/BaseGame/game/data/UI/images/numericslider.png
index 6a97d60c8..bc0ebc238 100644
Binary files a/Templates/BaseGame/game/data/UI/images/numericslider.png and b/Templates/BaseGame/game/data/UI/images/numericslider.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/optionsMenuSliderBitmapArray.png b/Templates/BaseGame/game/data/UI/images/optionsMenuSliderBitmapArray.png
index bd41c15b7..e7ddded0c 100644
Binary files a/Templates/BaseGame/game/data/UI/images/optionsMenuSliderBitmapArray.png and b/Templates/BaseGame/game/data/UI/images/optionsMenuSliderBitmapArray.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/previousbutton_d.png b/Templates/BaseGame/game/data/UI/images/previousbutton_d.png
index 688b30345..c1b20655e 100644
Binary files a/Templates/BaseGame/game/data/UI/images/previousbutton_d.png and b/Templates/BaseGame/game/data/UI/images/previousbutton_d.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/previousbutton_h.png b/Templates/BaseGame/game/data/UI/images/previousbutton_h.png
index 26cf0e8c6..233f545aa 100644
Binary files a/Templates/BaseGame/game/data/UI/images/previousbutton_h.png and b/Templates/BaseGame/game/data/UI/images/previousbutton_h.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/previousbutton_n.png b/Templates/BaseGame/game/data/UI/images/previousbutton_n.png
index c0b9f4662..e1a0c3ca0 100644
Binary files a/Templates/BaseGame/game/data/UI/images/previousbutton_n.png and b/Templates/BaseGame/game/data/UI/images/previousbutton_n.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/radioButton.png b/Templates/BaseGame/game/data/UI/images/radioButton.png
index d5ecc9853..bc55e2875 100644
Binary files a/Templates/BaseGame/game/data/UI/images/radioButton.png and b/Templates/BaseGame/game/data/UI/images/radioButton.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/scrollBar.png b/Templates/BaseGame/game/data/UI/images/scrollBar.png
index 4bd81576b..2a8a4dabc 100644
Binary files a/Templates/BaseGame/game/data/UI/images/scrollBar.png and b/Templates/BaseGame/game/data/UI/images/scrollBar.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/separatorh.png b/Templates/BaseGame/game/data/UI/images/separatorh.png
index 339c0fbe0..059e8e454 100644
Binary files a/Templates/BaseGame/game/data/UI/images/separatorh.png and b/Templates/BaseGame/game/data/UI/images/separatorh.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/separatorv.png b/Templates/BaseGame/game/data/UI/images/separatorv.png
index 6a0f87361..e33420316 100644
Binary files a/Templates/BaseGame/game/data/UI/images/separatorv.png and b/Templates/BaseGame/game/data/UI/images/separatorv.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/sliderwbox.png b/Templates/BaseGame/game/data/UI/images/sliderwbox.png
index d9ef04961..18eb15aac 100644
Binary files a/Templates/BaseGame/game/data/UI/images/sliderwbox.png and b/Templates/BaseGame/game/data/UI/images/sliderwbox.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/tab.png b/Templates/BaseGame/game/data/UI/images/tab.png
index ecd81daf7..34b1b08c7 100644
Binary files a/Templates/BaseGame/game/data/UI/images/tab.png and b/Templates/BaseGame/game/data/UI/images/tab.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/tab_border.png b/Templates/BaseGame/game/data/UI/images/tab_border.png
index 6703924d4..3261e6d8b 100644
Binary files a/Templates/BaseGame/game/data/UI/images/tab_border.png and b/Templates/BaseGame/game/data/UI/images/tab_border.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/textEdit.png b/Templates/BaseGame/game/data/UI/images/textEdit.png
index 5a65fac3c..6d6962de7 100644
Binary files a/Templates/BaseGame/game/data/UI/images/textEdit.png and b/Templates/BaseGame/game/data/UI/images/textEdit.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/textEditFrame.png b/Templates/BaseGame/game/data/UI/images/textEditFrame.png
new file mode 100644
index 000000000..6d6962de7
Binary files /dev/null and b/Templates/BaseGame/game/data/UI/images/textEditFrame.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/textEditSliderBox.png b/Templates/BaseGame/game/data/UI/images/textEditSliderBox.png
index 57a0c49d3..6d6962de7 100644
Binary files a/Templates/BaseGame/game/data/UI/images/textEditSliderBox.png and b/Templates/BaseGame/game/data/UI/images/textEditSliderBox.png differ
diff --git a/Templates/BaseGame/game/data/UI/images/window.png b/Templates/BaseGame/game/data/UI/images/window.png
index d9e8006e4..893285db5 100644
Binary files a/Templates/BaseGame/game/data/UI/images/window.png and b/Templates/BaseGame/game/data/UI/images/window.png differ
diff --git a/Templates/BaseGame/game/data/UI/scripts/profiles.tscript b/Templates/BaseGame/game/data/UI/scripts/profiles.tscript
index b79b81a59..16d2caa45 100644
--- a/Templates/BaseGame/game/data/UI/scripts/profiles.tscript
+++ b/Templates/BaseGame/game/data/UI/scripts/profiles.tscript
@@ -95,11 +95,11 @@ new GuiControlProfile( GuiMenuButtonProfile )
fontColorNA = $TextDisabledColor;
fontColorSEL = $TextMediumEmphasisColor;
fillColor = "40 40 40";
- fillColorHL = "56 56 56";
+ fillColorHL = "49 34 37";
fillColorNA = "40 40 40";
borderColor = "87 87 87";
borderColorNA = "0 0 0";
- borderColorHL = "255 255 255";
+ borderColorHL = "194 64 64";
fixedExtent = false;
justify = "center";
canKeyFocus = false;
@@ -366,16 +366,17 @@ new GuiControlProfile( GuiPopUpMenuDefault : GuiDefaultProfile )
border = 0;
borderThickness = 0;
fixedExtent = true;
- bitmapAsset = "UI:scrollBar_image";
hasBitmapArray = true;
+
+ fillColor = EditorSettings.value("Theme/fieldBGColor");//"255 255 255";//100
+ fillColorHL = EditorSettings.value("Theme/fieldBGHLColor");//"91 101 116";
+ fillColorSEL = EditorSettings.value("Theme/fieldBGSELColor");//"91 101 116";
+ fontColor = EditorSettings.value("Theme/fieldTextColor");//"215 215 215";
+ fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");//"215 215 215";
+ fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor");//"215 215 215";
+ fontColorNA = EditorSettings.value("Theme/fieldTextColor");//"215 215 215";
+ borderColor = EditorSettings.value("Theme/dividerDarkColor");
profileForChildren = GuiPopupMenuItemBorder;
- fillColor = "242 241 240 ";//"255 255 255";//100
- fillColorHL = "228 228 235 ";//"204 203 202";
- fillColorSEL = "98 100 137 ";//"204 203 202";
- // font color is black
- fontColorHL = "0 0 0 ";//"0 0 0";
- fontColorSEL = "255 255 255";//"0 0 0";
- borderColor = "100 100 100";
category = "Core";
};
@@ -552,4 +553,5 @@ singleton GuiControlProfile(SliderBitmapGUIProfile)
bitmapAsset = "UI:optionsMenuSliderBitmapArray_image";
hasBitmapArray = true;
opaque = false;
+ borderColor = "0 0 0 255";
};