TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-25 14:25:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #808 from Areloch/MiscFixes20220605

Browse source 
Misc Fixes 2022/06/05
This commit is contained in:
Brian Roberts 2022-06-05 16:28:05 -05:00 • committed by GitHub
commit 82119ea2df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Templates/BaseGame/game/data/UI/scripts/menuNavigation.tscript
View file

@ -75,7 +75,8 @@ function UINavigation::pushPage(%this, %newPage, %callback)
} }
//don't re-add pages //don't re-add pages
if(%this.pageStack.getIndexFromKey(%newPage) != -1) if(%this.pageStack.getPageCount() != 0 &&
%this.pageStack.getIndexFromKey(%newPage) != -1)
return; return;
%canChange = true; %canChange = true;

4
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript
View file

@ -5,9 +5,9 @@ function AssetBrowser::setupCreateNewTerrainAsset(%this)
NewAssetPropertiesInspector.addField("genWithNoise", "Generate Terrain With Noise", "bool", "Is this script used on the server?", "0", "2", %this.newAssetSettings); NewAssetPropertiesInspector.addField("genWithNoise", "Generate Terrain With Noise", "bool", "Is this script used on the server?", "0", "2", %this.newAssetSettings);
NewAssetPropertiesInspector.endGroup(); NewAssetPropertiesInspector.endGroup();
NewAssetPropertiesInspector.startGroup("Terrain - Import"); /*NewAssetPropertiesInspector.startGroup("Terrain - Import");
NewAssetPropertiesInspector.addField("importDetails", "Import Heightmap", "button", "Import an existing heightmap", "", "Canvas.pushDialog( TerrainImportGui );", %this.newAssetSettings); NewAssetPropertiesInspector.addField("importDetails", "Import Heightmap", "button", "Import an existing heightmap", "", "Canvas.pushDialog( TerrainImportGui );", %this.newAssetSettings);
NewAssetPropertiesInspector.endGroup(); NewAssetPropertiesInspector.endGroup();*/
} }
function AssetBrowser::createTerrainAsset(%this) function AssetBrowser::createTerrainAsset(%this)

8
Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript
View file

@ -153,6 +153,14 @@ function TerrainMaterialDlg::dialogApply( %this )
{ {
// Move all new materials we have created to the root group. // Move all new materials we have created to the root group.
if(%this-->diffuseMapAssetId.text $= "None" ||
%this-->detailMapAssetId.text $= "None")
{
toolsMessageBoxOK("Invalid Terrain Material",
"Terrain Materials require Diffuse and Detail textures to display and blend correctly.");
return;
}
%newCount = TerrainMaterialDlgNewGroup.getCount(); %newCount = TerrainMaterialDlgNewGroup.getCount();
for( %i = 0; %i < %newCount; %i ++ ) for( %i = 0; %i < %newCount; %i ++ )
RootGroup.add( TerrainMaterialDlgNewGroup.getObject( %i ) ); RootGroup.add( TerrainMaterialDlgNewGroup.getObject( %i ) );