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

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

8
Templates/BaseGame/game/tools/missionAreaEditor/images/DefaultHandle_image.asset.taml Normal file
View file

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

8
Templates/BaseGame/game/tools/missionAreaEditor/images/mission_area_d_image.asset.taml Normal file
View file

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

8
Templates/BaseGame/game/tools/missionAreaEditor/images/mission_area_h_image.asset.taml Normal file
View file

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

8
Templates/BaseGame/game/tools/missionAreaEditor/images/mission_area_n_image.asset.taml Normal file
View file

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

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

@ -57,7 +57,7 @@ function MissionAreaEditorPlugin::onWorldEditorStartup( %this )
// Add ourselves to the ToolsToolbar
%tooltip = "Mission Area Editor (" @ %accel @ ")";
EditorGui.addToToolsToolbar( "MissionAreaEditorPlugin", "MissionAreaEditorPalette", expandFilename("tools/missionAreaEditor/images/mission-area"), %tooltip );
EditorGui.addToToolsToolbar( "MissionAreaEditorPlugin", "MissionAreaEditorPalette", "ToolsModule:mission_area_n_image", %tooltip );
//connect editor windows
GuiWindowCtrl::attach( MissionAreaEditorPropertiesWindow, MissionAreaEditorTerrainWindow);

2
Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui
View file

@ -104,7 +104,7 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup)
squareBitmap = "1";
enableEditing = "0";
renderCamera = "1";
handleBitmap = "tools/missionAreaEditor/images/DefaultHandle.png";
handleBitmapAsset = "ToolsModule:DefaultHandle_image";
};
};
};