TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into SubScenes_Gamemode_PR

Browse source
This commit is contained in:
JeffR 2024-09-28 22:11:39 -05:00
commit 20a01d9f02
71 changed files with 353 additions and 509 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui
View file

@ -15,7 +15,7 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) {
canSaveDynamicFields = "1";
new GuiWindowCollapseCtrl(ESettingsWindow) {
text = ":: Editor Settings";
text = ":: Editor Settings";
resizeWidth = "0";
resizeHeight = "0";
canMove = "1";

66
Templates/BaseGame/game/tools/gui/colorPicker.ed.gui
View file

@ -19,7 +19,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
canSaveDynamicFields = "0";
new GuiWindowCtrl(GuiPickerDlg) {
text = "Color Picker";
text = ":: Color Picker";
resizeWidth = "0";
resizeHeight = "0";
canMove = "1";
@ -45,8 +45,8 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
canSaveDynamicFields = "0";
new GuiBitmapBorderCtrl(){ // color blend
position = "3 24";
extent = "255 258";
position = "3 25";
extent = "260 260";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -67,8 +67,8 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
selectorGap = "1";
displayMode = "BlendColor";
actionOnMove = "1";
position = "1 0";
extent = "255 258";
position = "1 1";
extent = "255 255";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -86,8 +86,8 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
};
};
new GuiBitmapBorderCtrl(){ // Hue
position = "263 23";
extent = "25 261";
position = "265 25";
extent = "25 260";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -109,7 +109,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
displayMode = "VertColor";
actionOnMove = "1";
position = "1 1";
extent = "21 257";
extent = "20 255";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -128,9 +128,9 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
};
new GuiTextCtrl() {
text = "New";
position = "306 22";
position = "305 22";
extent = "26 14";
profile = "GuiDefaultProfile";
profile = "ToolsGuiTextProfile";
};
new GuiBitmapBorderCtrl(){ // new old color
position = "292 37";
@ -162,9 +162,9 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
};
new GuiTextCtrl() {
text = "Old";
position = "310 138";
position = "307 137";
extent = "26 14";
profile = "GuiDefaultProfile";
profile = "ToolsGuiTextProfile";
};
new GuiBitmapBorderCtrl(){ // Color Text Fields
position = "291 165";
@ -185,7 +185,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
new GuiControl() { // rgb
position = "4 0";
extent = "52 75";
extent = "52 80";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -209,7 +209,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "5 6";
position = "1 6";
extent = "8 18";
minExtent = "8 2";
horizSizing = "right";
@ -228,12 +228,12 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
};
new GuiTextEditCtrl(Channel_R_Val) { // Red Channal
text = "0";
maxLength = "4";
maxLength = "6";
position = "14 6";
extent = "34 18";
extent = "34 28";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly";
profile = "ToolsGuiTextEditProfile";
class = "ColorPickerRGBClass";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Red Channel color value.";
@ -247,7 +247,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "4 29";
position = "0 29";
extent = "8 18";
minExtent = "8 2";
horizSizing = "right";
@ -266,12 +266,12 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
};
new GuiTextEditCtrl(Channel_G_Val) { // Green Channal
text = "0";
maxLength = "4";
maxLength = "6";
position = "14 29";
extent = "34 18";
extent = "34 28";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly";
profile = "ToolsGuiTextEditProfile";
class = "ColorPickerRGBClass";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Green Channel color value.";
@ -285,7 +285,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "5 52";
position = "1 52";
extent = "8 18";
minExtent = "8 2";
horizSizing = "right";
@ -304,12 +304,12 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
};
new GuiTextEditCtrl(Channel_B_Val) { // Blue Channal
text = "0";
maxLength = "4";
maxLength = "6";
position = "14 52";
extent = "34 18";
extent = "34 28";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly";
profile = "ToolsGuiTextEditProfile";
class = "ColorPickerRGBClass";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Blue Channel color value.";
@ -341,7 +341,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "5 6";
position = "1 6";
extent = "8 18";
minExtent = "8 2";
horizSizing = "right";
@ -365,7 +365,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
extent = "34 18";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly";
profile = "ToolsGuiTextEditProfile";
class = "ColorPickerHSBClass";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Hue Channel color value.";
@ -404,7 +404,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "4 29";
position = "0 29";
extent = "8 18";
minExtent = "8 2";
horizSizing = "right";
@ -428,7 +428,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
extent = "34 18";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly";
profile = "ToolsGuiTextEditProfile";
class = "ColorPickerHSBClass";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Saturation Channel color value.";
@ -467,12 +467,12 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "5 52";
position = "1 52";
extent = "8 18";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiTextProfile";
profile = "ToolsGuiTextProfile";
visible = "1";
active = "1";
Clickable = "1";
@ -491,7 +491,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
extent = "34 18";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly";
profile = "ToolsGuiTextEditProfile";
class = "ColorPickerHSBClass";
tooltipProfile = "GuiToolTipProfile";
tooltip = "Brightness Channel color value. Aka value or lightness.";
@ -668,7 +668,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) {
extent = "34 18";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiTextEditProfileNumbersOnly";
profile = "ToolsGuiTextEditProfile";
altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); updateColorPickerAlpha( $ThisControl.getValue() );";
internalName = "TextEdit";
};

2
Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
View file

@ -108,7 +108,7 @@ function ESettingsWindow::toggleEditorSettings(%this)
ESettingsWindowList.sort(0);
%this.mode = "Editor";
ESettingsWindow.text = ":: Editor Settings";
ESettingsWindow.text = ":: Editor Settings";
ESettingsWindowList.setSelectedById( 1 );
}

2
Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui
View file

@ -11,7 +11,7 @@ $guiContent = new GuiWindowCollapseCtrl() {
minSize = "50 50";
closeCommand = "$ThisControl.onClose();";
edgeSnap = "1";
text = ":: Object Inspector";
text = ":: Object Inspector";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";

2
Templates/BaseGame/game/tools/gui/postFxEditor.gui
View file

@ -15,7 +15,7 @@ $guiContent = new GuiControl(postFXEditor) {
canSaveDynamicFields = "1";
new GuiWindowCtrl(PostFXEditorWindow) {
text = ":: PostFX Editor - EditorTemplateLevel";
text = ":: PostFX Editor - EditorTemplateLevel";
resizeWidth = "1";
resizeHeight = "1";
canMove = "1";

21
Templates/BaseGame/game/tools/gui/profiles.ed.tscript
View file

@ -37,7 +37,7 @@ $Gui::fontTypeMono = "Arial";
$GUI::fontSize[12] = 12;
$GUI::fontSize[14] = 14;
$GUI::fontSize[16] = 16;
$GUI::fontSize[18] = 18;
$GUI::fontSize[18] = 17;
$GUI::fontSize[24] = 24;
$GUI::fontSize[36] = 36;
@ -195,8 +195,8 @@ new GuiControlProfile (ToolsGuiWindowProfile)
hasBitmapArray = true;
justify = "left";
category = "Tools";
fontType = $Gui::fontTypeMedium;
fontSize = $GUI::fontSize[18];
fontType = $Gui::fontTypeBold;
fontSize = $GUI::fontSize[16];
};
if( !isObject( ToolsGuiPaneProfile ) )
@ -211,7 +211,7 @@ new GuiControlProfile (ToolsGuiPaneProfile)
borderColor = EditorSettings.value("Theme/windowBackgroundColor");
category = "Tools";
fontType = $Gui::fontTypeMedium;
fontSize = $GUI::fontSize[18];
fontSize = $GUI::fontSize[16];
};
if( !isObject( ToolsGuiToolbarWindowProfile ) )
@ -943,6 +943,14 @@ singleton GuiControlProfile( GuiBackFillProfile )
category = "Editor";
};
singleton GuiControlProfile( GuiDarkFillProfile )
{
opaque = true;
fillColor = "25 25 25";
border = false;
category = "Editor";
};
singleton GuiControlProfile(GuiShaderEditorProfile : ToolsGuiDefaultProfile)
{
opaque = true;
@ -1561,6 +1569,11 @@ new GuiControlProfile(ToolsGuiConsoleLargeProfile : ToolsGuiConsoleProfile)
{
fontSize = $GUI::fontSize[16];
};
if(!isObject(ToolsGuiConsoleXLProfile))
new GuiControlProfile(ToolsGuiConsoleXLProfile : ToolsGuiConsoleProfile)
{
fontSize = $GUI::fontSize[18];
};
if(!isObject(ToolsGuiConsoleTextProfile))
new GuiControlProfile(ToolsGuiConsoleTextProfile)
{