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/meshRoadEditor/MeshRoadEditorGui,EditorGuiGroup.asset.taml Normal file
View file

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

7
Templates/BaseGame/game/tools/meshRoadEditor/MeshRoadEditorSettingsTab,EditorGuiGroup.asset.taml Normal file
View file

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

7
Templates/BaseGame/game/tools/meshRoadEditor/MeshRoadEditorToolbar,EditorGuiGroup.asset.taml Normal file
View file

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

4
Templates/BaseGame/game/tools/meshRoadEditor/main.tscript
View file

@ -76,7 +76,7 @@ function MeshRoadEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "Mesh Road Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "MeshRoadEditorPlugin", "MeshRoadEditorPalette", expandFilename("tools/worldEditor/images/toolbar/mesh-road-editor"), %tooltip );
EditorGui.addToToolsToolbar( "MeshRoadEditorPlugin", "MeshRoadEditorPalette", "ToolsModule:mesh_road_editor_n_image", %tooltip );
//connect editor windows
GuiWindowCtrl::attach( MeshRoadEditorOptionsWindow, MeshRoadEditorTreeWindow);
@ -223,4 +223,4 @@ function MeshRoadEditorPlugin::writeSettings( %this )
EditorSettings.setValue( "SideMaterialName", MeshRoadEditorGui.sideMaterialName );
EditorSettings.endGroup();
}
}

14
Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorToolbar.gui
View file

@ -52,7 +52,7 @@ $guiContent = new GuiControl(MeshRoadEditorToolbar,EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Spline (Z)";
bitmap = "tools/worldEditor/images/road-river/menubar/show-spline";
bitmapAsset = "ToolsModule:show_spline_n_image";
groupNum = "7";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -75,7 +75,7 @@ $guiContent = new GuiControl(MeshRoadEditorToolbar,EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Wireframe (X)";
bitmap = "tools/worldEditor/images/road-river/menubar/show-wireframe";
bitmapAsset = "ToolsModule:menubar_show_wireframe_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -98,7 +98,7 @@ $guiContent = new GuiControl(MeshRoadEditorToolbar,EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Road Texture (V)";
bitmap = "tools/worldEditor/images/road-river/menubar/show-texture";
bitmapAsset = "ToolsModule:show_texture_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -121,7 +121,7 @@ $guiContent = new GuiControl(MeshRoadEditorToolbar,EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Road Profile (P)";
bitmap = "tools/worldEditor/images/road-river/menubar/show-profile";
bitmapAsset = "ToolsModule:show_profile_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -203,7 +203,7 @@ $guiContent = new GuiControl(MeshRoadEditorToolbar,EditorGuiGroup) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/dropslider";
bitmapAsset = "ToolsModule:dropslider_n_image";
};
};
new GuiControl(MeshRoadDefaultDepthTextEditContainer) {
@ -281,7 +281,7 @@ $guiContent = new GuiControl(MeshRoadEditorToolbar,EditorGuiGroup) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/dropslider";
bitmapAsset = "ToolsModule:dropslider_n_image";
};
};
};
@ -342,4 +342,4 @@ new GuiMouseEventCtrl(MeshRoadDefaultDepthSliderCtrlContainer, EditorGuiGroup) {
ticks = "0";
value = "10";
};
};
};