TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 09:04:38 +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/roadEditor/RoadEditorGui.asset.taml Normal file
View file

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

4
Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui
View file

@ -91,7 +91,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "World Editor";
hovertime = "1000";
bitmap = "tools/gui/images/lock";
bitmapAsset = "ToolsModule:lock_n_image";
buttonType = "ToggleButton";
groupNum = "-1";
text = "";
@ -115,7 +115,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) {
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/roadEditor/RoadEditorSettingsTab,EditorGuiGroup.asset.taml Normal file
View file

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

7
Templates/BaseGame/game/tools/roadEditor/RoadEditorToolbar.asset.taml Normal file
View file

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

10
Templates/BaseGame/game/tools/roadEditor/RoadEditorToolbar.gui
View file

@ -52,7 +52,7 @@ $guiContent = new GuiControl(RoadEditorToolbar) {
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";
@ -75,7 +75,7 @@ $guiContent = new GuiControl(RoadEditorToolbar) {
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";
@ -98,7 +98,7 @@ $guiContent = new GuiControl(RoadEditorToolbar) {
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
toolTip = "Show Road Texture";
bitmap = "tools/worldEditor/images/road-river/menubar/show-texture";
bitmapAsset = "ToolsModule:show_texture_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -180,7 +180,7 @@ $guiContent = new GuiControl(RoadEditorToolbar) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/dropslider";
bitmapAsset = "ToolsModule:dropslider_n_image";
};
};
/*new GuiTextEditSliderCtrl(RoadEditorDefaultWidthSlider) {
@ -270,4 +270,4 @@ new GuiMouseEventCtrl(RoadDefaultWidthSliderCtrlContainer, EditorGuiGroup) {
ticks = "0";
value = "10";
};
};
};

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

@ -75,7 +75,7 @@ function RoadEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "Road Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "RoadEditorPlugin", "RoadEditorPalette", expandFilename("tools/worldEditor/images/toolbar/road-path-editor"), %tooltip );
EditorGui.addToToolsToolbar( "RoadEditorPlugin", "RoadEditorPalette", "ToolsModule:road_path_editor_n_image", %tooltip );
//connect editor windows
GuiWindowCtrl::attach( RoadEditorOptionsWindow, RoadEditorTreeWindow);