From 388b56873914bc2e9d275bf722fc7bc21c2dad06 Mon Sep 17 00:00:00 2001 From: Areloch Date: Sat, 5 Oct 2019 01:55:52 -0500 Subject: [PATCH] Standardizes the Level Assets to just use the regular asset description field for it's description Updated existing level asset definitions to comply --- .../game/data/ExampleModule/levels/ExampleLevel.asset.taml | 2 +- Templates/BaseGame/game/data/pbr/levels/PbrMatTest.asset.taml | 2 +- Templates/BaseGame/game/tools/assetBrowser/scripts/newAsset.cs | 3 ++- Templates/Modules/FPSGameplay/levels/EmptyLevel.asset.taml | 2 +- Templates/Modules/FPSGameplay/levels/EmptyTerrain.asset.taml | 2 +- Templates/Modules/FPSGameplay/levels/Outpost.asset.taml | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Templates/BaseGame/game/data/ExampleModule/levels/ExampleLevel.asset.taml b/Templates/BaseGame/game/data/ExampleModule/levels/ExampleLevel.asset.taml index daa6d2045..bde0fd569 100644 --- a/Templates/BaseGame/game/data/ExampleModule/levels/ExampleLevel.asset.taml +++ b/Templates/BaseGame/game/data/ExampleModule/levels/ExampleLevel.asset.taml @@ -4,5 +4,5 @@ AssetName="ExampleLevel" LevelFile="ExampleLevel.mis" LevelName="Example Level" - LevelDescription="An example level asset" + Description="An example level asset" VersionId="1" /> diff --git a/Templates/BaseGame/game/data/pbr/levels/PbrMatTest.asset.taml b/Templates/BaseGame/game/data/pbr/levels/PbrMatTest.asset.taml index de272cf76..68f1a529d 100644 --- a/Templates/BaseGame/game/data/pbr/levels/PbrMatTest.asset.taml +++ b/Templates/BaseGame/game/data/pbr/levels/PbrMatTest.asset.taml @@ -4,5 +4,5 @@ AssetName="PbrMatTestLevel" LevelFile="PbrMatTest.mis" LevelName="PBR Mat Test" - LevelDescription="A scene that demonstrates various PBR materials" + Description="A scene that demonstrates various PBR materials" VersionId="1" /> diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/newAsset.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/newAsset.cs index 1486b420a..c12a4020e 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/newAsset.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/newAsset.cs @@ -114,8 +114,9 @@ function AssetBrowser::setupCreateNewAsset(%this, %assetType, %moduleName, %call else if(%assetType $= "LevelAsset") { NewAssetPropertiesInspector.startGroup("Level"); - NewAssetPropertiesInspector.addField("levelName", "Level Name", "String", "Human-readable name of new level", "", "", %this.newAssetSettings); + NewAssetPropertiesInspector.addField("LevelName", "Level Name", "String", "Human-readable name of new level", "", "", %this.newAssetSettings); NewAssetPropertiesInspector.addField("levelPreviewImage", "Level Preview Image", "Image", "Preview Image for the level", "", "", %this.newAssetSettings); + NewAssetPropertiesInspector.endGroup(); } else if(%assetType $= "ScriptAsset") diff --git a/Templates/Modules/FPSGameplay/levels/EmptyLevel.asset.taml b/Templates/Modules/FPSGameplay/levels/EmptyLevel.asset.taml index 0cc0eeff7..f3592baab 100644 --- a/Templates/Modules/FPSGameplay/levels/EmptyLevel.asset.taml +++ b/Templates/Modules/FPSGameplay/levels/EmptyLevel.asset.taml @@ -4,5 +4,5 @@ AssetName="EmptyLevel" LevelName="EmptyLevel" LevelFile="EmptyLevel.mis" - LevelDescription="An empty room" + Description="An empty room" VersionId="1" /> diff --git a/Templates/Modules/FPSGameplay/levels/EmptyTerrain.asset.taml b/Templates/Modules/FPSGameplay/levels/EmptyTerrain.asset.taml index cc0e68aaa..23b7870fc 100644 --- a/Templates/Modules/FPSGameplay/levels/EmptyTerrain.asset.taml +++ b/Templates/Modules/FPSGameplay/levels/EmptyTerrain.asset.taml @@ -4,5 +4,5 @@ AssetName="EmptyTerrain" LevelName="Empty Terrain" LevelFile="Empty Terrain.mis" - LevelDescription="A Empty level with terrain." + Description="A Empty level with terrain." VersionId="1" /> diff --git a/Templates/Modules/FPSGameplay/levels/Outpost.asset.taml b/Templates/Modules/FPSGameplay/levels/Outpost.asset.taml index 589d1bdae..a422dfb66 100644 --- a/Templates/Modules/FPSGameplay/levels/Outpost.asset.taml +++ b/Templates/Modules/FPSGameplay/levels/Outpost.asset.taml @@ -4,5 +4,5 @@ AssetName="Outpost" LevelName="Outpost" LevelFile="Outpost.mis" - LevelDescription="Outpost level" + Description="Outpost level" VersionId="1" />