TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +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/riverEditor/RiverEditorGui, EditorGuiGroup.asset.taml Normal file
View file

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

4
Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui
View file

@ -90,7 +90,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "World Editor";
hovertime = "1000";
bitmap = "tools/gui/images/lock";
bitmapAsset = "ToolsModule:lock_n_image";
buttonType = "ToggleButton";
groupNum = "-1";
text = "";
@ -114,7 +114,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "World Editor";
hovertime = "1000";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
buttonType = "PushButton";
groupNum = "-1";
text = "";

7
Templates/BaseGame/game/tools/riverEditor/RiverEditorSettingsTab,EditorGuiGroup.asset.taml Normal file
View file

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

7
Templates/BaseGame/game/tools/riverEditor/RiverEditorToolbar, EditorGuiGroup.asset.taml Normal file
View file

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

12
Templates/BaseGame/game/tools/riverEditor/RiverEditorToolbar.gui
View file

@ -52,7 +52,7 @@ $guiContent = new GuiControl(RiverEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Spline";
bitmap = "tools/worldEditor/images/road-river/menubar/show-spline";
bitmapAsset = "ToolsModule:show_spline_n_image";
groupNum = "7";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -76,7 +76,7 @@ $guiContent = new GuiControl(RiverEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Wireframe";
bitmap = "tools/worldEditor/images/road-river/menubar/show-wireframe";
bitmapAsset = "ToolsModule:menubar_show_wireframe_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -99,7 +99,7 @@ $guiContent = new GuiControl(RiverEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show River Texture";
bitmap = "tools/worldEditor/images/road-river/menubar/show-texture";
bitmapAsset = "ToolsModule:show_texture_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -181,7 +181,7 @@ $guiContent = new GuiControl(RiverEditorToolbar, EditorGuiGroup) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/dropslider";
bitmapAsset = "ToolsModule:dropslider_n_image";
};
};
new GuiControl(RiverDefaultDepthTextEditContainer) {
@ -259,7 +259,7 @@ $guiContent = new GuiControl(RiverEditorToolbar, EditorGuiGroup) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/dropslider";
bitmapAsset = "ToolsModule:dropslider_n_image";
};
};
};
@ -320,4 +320,4 @@ new GuiMouseEventCtrl(RiverDefaultDepthSliderCtrlContainer, EditorGuiGroup) {
ticks = "0";
value = "10";
};
};
};

2
Templates/BaseGame/game/tools/riverEditor/main.tscript
View file

@ -76,7 +76,7 @@ function RiverEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "River Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "RiverEditorPlugin", "RiverEditorPalette", expandFilename("tools/worldEditor/images/toolbar/river-editor"), %tooltip );
EditorGui.addToToolsToolbar( "RiverEditorPlugin", "RiverEditorPalette", "ToolsModule:river_editor_n_image", %tooltip );
//connect editor windows
GuiWindowCtrl::attach( RiverEditorOptionsWindow, RiverEditorTreeWindow);