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

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# Conflicts:
#	Templates/BaseGame/game/data/ui/guis/loadingGui.gui
#	Templates/BaseGame/game/data/ui/guis/mainMenu.gui
#	Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
#	Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
#	Templates/BaseGame/game/tools/forestEditor/brushes.tscript
This commit is contained in:
Jeff Hutchinson 2021-08-13 20:14:39 -04:00
commit 717c7acca9
2266 changed files with 48780 additions and 26034 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Templates/BaseGame/game/tools/guiEditor/gui/EditorChooseGUI, EditorGuiGroup.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="EditorChooseGUI, EditorGuiGroup"
scriptFile="@assetFile=EditorChooseGUI.ed.gui"
GUIFile="@assetFile=EditorChooseGUI.ed.gui"
VersionId="1" />

2
Templates/BaseGame/game/tools/guiEditor/gui/EditorChooseGUI.ed.gui
View file

@ -13,7 +13,7 @@ $guiContent = new GuiChunkedBitmapCtrl(EditorChooseGUI, EditorGuiGroup) {
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
bitmap = "art/gui/background";
bitmap = "data/ui/images/background.png";
useVariable = "0";
tile = "0";

7
Templates/BaseGame/game/tools/guiEditor/gui/GuiEditorGui, EditorGuiGroup.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="GuiEditorGui, EditorGuiGroup"
scriptFile="@assetFile=guiEditor.ed.gui"
GUIFile="@assetFile=guiEditor.ed.gui"
VersionId="1" />

7
Templates/BaseGame/game/tools/guiEditor/gui/GuiEditorNewGuiDialog,EditorGuiGroup.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="GuiEditorNewGuiDialog,EditorGuiGroup"
scriptFile="@assetFile=guiEditorNewGuiDialog.ed.gui"
GUIFile="@assetFile=guiEditorNewGuiDialog.ed.gui"
VersionId="1" />

7
Templates/BaseGame/game/tools/guiEditor/gui/GuiEditorPrefsDlg, EditorGuiGroup.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="GuiEditorPrefsDlg, EditorGuiGroup"
scriptFile="@assetFile=guiEditorPrefsDlg.ed.gui"
GUIFile="@assetFile=guiEditorPrefsDlg.ed.gui"
VersionId="1" />

7
Templates/BaseGame/game/tools/guiEditor/gui/GuiEditorSelectDlgContainer,EditorGuiGroup.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="GuiEditorSelectDlgContainer,EditorGuiGroup"
scriptFile="@assetFile=guiEditorSelectDlg.ed.gui"
GUIFile="@assetFile=guiEditorSelectDlg.ed.gui"
VersionId="1" />

8
Templates/BaseGame/game/tools/guiEditor/gui/gridTiny2_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="gridTiny2_image"
imageFile="@assetFile=gridTiny2.PNG"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

87
Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui
View file

@ -71,7 +71,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl(GHWorldEditor) {
bitmap = "tools/worldEditor/images/toolbar/world";
bitmapAsset = "ToolsModule:world_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "0";
@ -93,7 +93,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(GHGuiEditor) {
bitmap = "tools/worldEditor/images/toolbar/gui";
bitmapAsset = "ToolsModule:gui_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "0";
@ -114,7 +114,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/worldEditor/images/toolbar/playbutton";
bitmapAsset = "ToolsModule:playbutton_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "0";
@ -135,14 +135,37 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
hovertime = "1000";
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
internalName = AssetBrowserBtn;
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "98 3";
Extent = "29 27";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "AssetBrowser.ShowDialog();";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Asset Browser";
hovertime = "750";
bitmapAsset = "ToolsModule:menuGrid_image";
bitmapMode = "Stretched";
buttonType = "PushButton";
groupNum = "0";
useMouseEvents = "0";
};
new GuiBitmapCtrl() {
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
wrap = "0";
isContainer = "0";
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";
vertSizing = "bottom";
position = "98 3";
position = "130 3";
extent = "2 26";
minExtent = "1 1";
canSave = "1";
@ -157,7 +180,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "width";
vertSizing = "bottom";
position = "99 0";
position = "131 0";
extent = "723 32";
minExtent = "8 2";
canSave = "1";
@ -219,7 +242,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapCtrl() {
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
wrap = "0";
isContainer = "0";
profile = "ToolsGuiDefaultProfile";
@ -249,7 +272,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl(GuiEditorSnapCheckBox) {
bitmap = "tools/gui/images/GUI-editor/snap-grid";
bitmapAsset = "ToolsModule:snap_grid_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -270,7 +293,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(GuiEditorEdgeSnapping_btn) {
bitmap = "tools/gui/images/GUI-editor/edgesnap";
bitmapAsset = "ToolsModule:edgesnap_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -292,7 +315,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl(GuiEditorCenterSnapping_btn) {
bitmap = "tools/gui/images/GUI-editor/centersnap";
bitmapAsset = "ToolsModule:centersnap_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -315,7 +338,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
};
};
new GuiBitmapCtrl() {
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
wrap = "0";
isContainer = "0";
profile = "ToolsGuiDefaultProfile";
@ -345,7 +368,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/align-left";
bitmapAsset = "ToolsModule:align_left_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -367,7 +390,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/vertical-center";
bitmapAsset = "ToolsModule:vertical_center_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -389,7 +412,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/align-right";
bitmapAsset = "ToolsModule:align_right_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -426,7 +449,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/align-top";
bitmapAsset = "ToolsModule:align_top_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -448,7 +471,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/horizontal-center";
bitmapAsset = "ToolsModule:horizontal_center_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -470,7 +493,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/align-bottom";
bitmapAsset = "ToolsModule:align_bottom_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -493,7 +516,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
};
};
new GuiBitmapCtrl() {
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
wrap = "0";
isContainer = "0";
profile = "ToolsGuiDefaultProfile";
@ -509,7 +532,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapCtrl() {
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
wrap = "0";
isContainer = "0";
profile = "ToolsGuiDefaultProfile";
@ -539,7 +562,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/send-to-back";
bitmapAsset = "ToolsModule:send_to_back_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -561,7 +584,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/bring-to-front";
bitmapAsset = "ToolsModule:bring_to_front_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -598,7 +621,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/distribute-horizontal";
bitmapAsset = "ToolsModule:distribute_horizontal_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -620,7 +643,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/GUI-editor/distribute-vertical";
bitmapAsset = "ToolsModule:distribute_vertical_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
groupNum = "-1";
@ -720,7 +743,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/guiEditor/gui/gridTiny2";
bitmapAsset = "ToolsModule:gridTiny2_image";
wrap = "1";
};
new GuiControl(GuiEditorContent) {
@ -863,7 +886,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1176,7 +1199,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1299,7 +1322,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1319,7 +1342,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/save-as";
bitmapAsset = "ToolsModule:save_as_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1416,7 +1439,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1435,7 +1458,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1454,7 +1477,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1473,7 +1496,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";

12
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript
View file

@ -862,11 +862,11 @@ function GuiEditorTabBook::onTabSelected( %this, %text, %index )
%sidebar-->button3.setVisible( true );
%sidebar-->button4.setVisible( true );
%sidebar-->button4.setBitmap( "tools/gui/images/delete" );
%sidebar-->button4.setBitmap( "ToolsModule:iconDelete_image" );
%sidebar-->button4.command = "GuiEditor.deleteSelection();";
%sidebar-->button4.tooltip = "Delete Selected Control(s)";
%sidebar-->button3.setBitmap( "tools/gui/images/visible" );
%sidebar-->button3.setBitmap( "ToolsModule:visible_n_image" );
%sidebar-->button3.command = "GuiEditor.toggleHideSelection();";
%sidebar-->button3.tooltip = "Hide Selected Control(s)";
@ -877,19 +877,19 @@ function GuiEditorTabBook::onTabSelected( %this, %text, %index )
%sidebar-->button3.setVisible( true );
%sidebar-->button4.setVisible( true );
%sidebar-->button4.setBitmap( "tools/gui/images/delete" );
%sidebar-->button4.setBitmap( "ToolsModule:iconDelete_image" );
%sidebar-->button4.command = "GuiEditor.showDeleteProfileDialog( GuiEditorProfilesTree.getSelectedProfile() );";
%sidebar-->button4.tooltip = "Delete Selected Profile";
%sidebar-->button3.setBitmap( "tools/gui/images/new" );
%sidebar-->button3.setBitmap( "ToolsModule:new_n_image" );
%sidebar-->button3.command = "GuiEditor.createNewProfile( \"Unnamed\" );";
%sidebar-->button3.tooltip = "Create New Profile with Default Values";
%sidebar-->button2.setBitmap( "tools/gui/images/copy-btn" );
%sidebar-->button2.setBitmap( "ToolsModule:copy_btn_n_image" );
%sidebar-->button2.command = "GuiEditor.createNewProfile( GuiEditorProfilesTree.getSelectedProfile().getName(), GuiEditorProfilesTree.getSelectedProfile() );";
%sidebar-->button2.tooltip = "Create New Profile by Copying the Selected Profile";
%sidebar-->button1.setBitmap( "tools/gui/images/reset-icon" );
%sidebar-->button1.setBitmap( "ToolsModule:reset_icon_n_image" );
%sidebar-->button1.command = "GuiEditor.revertProfile( GuiEditorProfilesTree.getSelectedProfile() );";
%sidebar-->button1.tooltip = "Revert Changes to the Selected Profile";