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/navEditor/CreateNewNavMeshDlg.asset.taml Normal file
View file

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

7
Templates/BaseGame/game/tools/navEditor/ENavEditorSettingsPage.asset.taml Normal file
View file

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

7
Templates/BaseGame/game/tools/navEditor/NavEditorConsoleDlg.asset.taml Normal file
View file

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

7
Templates/BaseGame/game/tools/navEditor/NavEditorGui, EditorGuiGroup.asset.taml Normal file
View file

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

7
Templates/BaseGame/game/tools/navEditor/NavEditorToolbar,EditorGuiGroup.asset.taml Normal file
View file

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

8
Templates/BaseGame/game/tools/navEditor/images/nav_cover_d_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="nav_cover_d_image"
imageFile="@assetFile=nav-cover_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/navEditor/images/nav_cover_h_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="nav_cover_h_image"
imageFile="@assetFile=nav-cover_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/navEditor/images/nav_cover_n_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="nav_cover_n_image"
imageFile="@assetFile=nav-cover_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/navEditor/images/nav_editor_d_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="nav_editor_d_image"
imageFile="@assetFile=nav-editor_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/navEditor/images/nav_editor_h_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="nav_editor_h_image"
imageFile="@assetFile=nav-editor_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/navEditor/images/nav_editor_n_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="nav_editor_n_image"
imageFile="@assetFile=nav-editor_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/navEditor/images/nav_link_d_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="nav_link_d_image"
imageFile="@assetFile=nav-link_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/navEditor/images/nav_link_h_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="nav_link_h_image"
imageFile="@assetFile=nav-link_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

8
Templates/BaseGame/game/tools/navEditor/images/nav_link_n_image.asset.taml Normal file
View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="nav_link_n_image"
imageFile="@assetFile=nav-link_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

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

@ -83,7 +83,7 @@ function NavEditorPlugin::onWorldEditorStartup(%this)
// Add ourselves to the ToolsToolbar.
%tooltip = "Navigation Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar("NavEditorPlugin", "NavEditorPalette", expandFilename("tools/navEditor/images/nav-editor"), %tooltip);
EditorGui.addToToolsToolbar("NavEditorPlugin", "NavEditorPalette", "ToolsModule:nav_editor_n_image", %tooltip);
GuiWindowCtrl::attach(NavEditorOptionsWindow, NavEditorTreeWindow);