diff --git a/Engine/source/T3D/assets/assetImporter.cpp b/Engine/source/T3D/assets/assetImporter.cpp index 497a7215b..bc55d6a53 100644 --- a/Engine/source/T3D/assets/assetImporter.cpp +++ b/Engine/source/T3D/assets/assetImporter.cpp @@ -1285,6 +1285,10 @@ void AssetImportConfig::loadSISFile(Torque::Path filePath) return; } } + else + { + return; + } String headerLine = (const char*)fileObj->readLine(); if (headerLine.substr(0, 4).compare("SISV", 0U, String::NoCase) != 0) diff --git a/Templates/BaseGame/game/data/ExampleModule/scripts/ExampleGamemodeScript.cs b/Templates/BaseGame/game/data/ExampleModule/scripts/ExampleGamemodeScript.cs index d24a5b715..6326877ce 100644 --- a/Templates/BaseGame/game/data/ExampleModule/scripts/ExampleGamemodeScript.cs +++ b/Templates/BaseGame/game/data/ExampleModule/scripts/ExampleGamemodeScript.cs @@ -43,7 +43,7 @@ function ExampleGameMode::onMissionStart(%this) // Start the game timer if (%this.duration) - %this.gameSchedule = schedule(%this.duration * 1000, "onGameDurationEnd"); + %this.gameSchedule = schedule(%this.duration * 1000, 0, "onGameDurationEnd"); %this.running = true; } diff --git a/Templates/BaseGame/game/data/ui/scripts/menuInputButtons.cs b/Templates/BaseGame/game/data/ui/scripts/menuInputButtons.cs index a3e6320c8..758ce61c4 100644 --- a/Templates/BaseGame/game/data/ui/scripts/menuInputButtons.cs +++ b/Templates/BaseGame/game/data/ui/scripts/menuInputButtons.cs @@ -117,8 +117,6 @@ function MenuInputButton::refresh(%this) %path = %path @ "Options"; else if(%this.gamepadButton $= "btn_back") %path = %path @ "Share"; - else - continue; } else if($activeControllerName $= "Nintendo Switch Pro Controller") { @@ -144,8 +142,6 @@ function MenuInputButton::refresh(%this) %path = %path @ "Plus"; else if(%this.gamepadButton $= "btn_back") %path = %path @ "Minus"; - else - continue; } else if($activeControllerName !$= "") { @@ -171,8 +167,6 @@ function MenuInputButton::refresh(%this) %path = %path @ "Menu"; else if(%this.gamepadButton $= "btn_back") %path = %path @ "Windows"; - else - continue; } } } diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.cs index 8fb28db56..a081edb08 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.cs @@ -63,7 +63,7 @@ function AssetBrowser::onWake(%this) AssetBrowser-->previewSlider.setValue(EditorSettings.value("Assets/Browser/previewTileSize", "1.0")); - AssetBrowser-->filterAssetsButton.setEnabled(true); + AssetBrowser-->filterAssetsButton.setActive(true); } function contentTreeTabBook::onTabSelected(%this, %tabText, %tabIndex) @@ -279,11 +279,11 @@ function AssetBrowser::showDialog( %this, %AssetTypeFilter, %selectCallback, %ta //visibility filter if(%AssetTypeFilter !$= "") { - AssetBrowser-->filterAssetsButton.setEnabled(false); + AssetBrowser-->filterAssetsButton.setActive(false); } else { - AssetBrowser-->filterAssetsButton.setEnabled(true); + AssetBrowser-->filterAssetsButton.setActive(true); } if(%selectCallback $= "") diff --git a/Templates/BaseGame/game/tools/settings.xml b/Templates/BaseGame/game/tools/settings.xml index 0239f2466..599a3198e 100644 --- a/Templates/BaseGame/game/tools/settings.xml +++ b/Templates/BaseGame/game/tools/settings.xml @@ -1,222 +1,21 @@ - - 0 0 1 - 255 255 255 255 - 5 - 0 255 0 255 - 255 0 0 255 - 10 - - - tools/RPGDialogEditor/gui - 1024 768 - - 1 - 1 - 1 - 1 - 2 - 1 - 8 - 0 - - - Categorized - - - 0 - 0 - 0 - - - ../../../Documentation/Official Documentation.html - http://www.garagegames.com/products/torque-3d/documentation/user - ../../../Documentation/Torque 3D - Script Manual.chm - - - 1 - 1 - - - 0 - - - - FPSGameplay:EmptyLevel - Blank Level - 0 - AssetWork_Debug.exe - FPSGameplay:EmptyLevel,pbr:PbrMatTestLevel,FPSGameplay:EmptyTerrain,TTR:DasBootLevel - 50 - WorldEditorInspectorPlugin - Modern - 40 - screenCenter - 6 - 1 - 1 - - 48 48 48 255 - 215 215 215 255 - 50 50 50 255 - 255 255 255 255 - 180 180 180 255 - - - 100 - 0 - 0.01 - 1 - 0 - 0 - 1 - 2 - 0 - - - 1 - 1 - 1 - 1 - 1 - - - tools/worldEditor/images/SelectHandle - tools/worldEditor/images/LockedHandle - tools/worldEditor/images/DefaultHandle - - - 1 - 8 - 20 - 0 - 255 - - - 0 0 255 255 - 255 255 0 255 - 100 100 100 255 - 0 255 0 255 - 255 255 0 255 - 255 255 255 255 - 255 0 0 255 - - - 102 102 102 100 - 1 - 51 51 51 100 - 255 255 255 100 - 1 - - - ../../../Documentation/Official Documentation.html - ../../../Documentation/Torque 3D - Script Manual.chm - http://www.garagegames.com/products/torque-3d/forums - http://www.garagegames.com/products/torque-3d/documentation/user - - - Classic - - - - 1 - 255 255 255 255 - 45 - 0 - 0 0 0 100 - 1 - 1 - 0 - 135 - 1 - 0.1 - 1 - 180 180 180 255 - 40 40 - 1 - - - 0.8 - 0.8 - 0 - 100 - 1 - 15 - 0 - - 500 - 1 - 0 - 1 1 1 - 255 255 255 20 - 0 - 1 - - Small - - 0 0 1 - 10 - 255 0 0 255 - DefaultRoadMaterialOther - 0 255 0 255 - DefaultRoadMaterialTop - - - lowerHeight - - 1 - ellipse - 1 - 40 40 - 40 40 - - - 0 - 100 - 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 - 1 - 90 - 50 - 10 - 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 - 1 - 0.1 - - - <AssetType>/ - <AssetType>/ - 1 TestConfig - <AssetType>/<AssetName>/ + 1 <AssetType>/<SpecialAssetTag>/ + <AssetType>/ + <AssetType>/OtherFolder/ + <AssetType>/<AssetName>/ <AssetType>/ <AssetType>/<SpecialAssetTag>/ + <AssetType>/ <AssetType>/ - <AssetType>/OtherFolder/ <AssetType>/ - - data/FPSGameplay/levels - - - 5 - - - 25 - - - 25 - - - 25 - - - TestConfig 1 @@ -224,42 +23,246 @@ small - - 1 - DefaultPlayerData - AIPlayer - - - 255 255 255 255 - DefaultDecalRoadMaterial - 0 255 0 255 - 10 - - - 96 94 92 255 - 100 98 96 255 - 234 232 230 255 - 59 58 57 255 - 50 49 48 255 - 50 49 48 255 - 32 31 30 255 - 17 16 15 255 - 59 58 57 255 - 50 49 48 255 - 120 120 120 255 - 43 43 43 255 - 72 70 68 255 - 178 175 172 255 - 72 70 68 255 - 37 36 35 255 - 236 234 232 255 - 255 255 255 255 - 255 255 255 255 - - - 1 + + 100 + 0.8 + 0.8 + 1 + 0 + 15 + 0 + + 1 + 255 255 255 20 + 1 1 1 + 500 + 0 + 0 + 0 + Grid_512_Orange + + 1 + + + tools/RPGDialogEditor/gui + 1024 768 + + 0 + 0 + 0 + + + ../../../Documentation/Official Documentation.html + ../../../Documentation/Torque 3D - Script Manual.chm + http://www.garagegames.com/products/torque-3d/documentation/user + + + Categorized + + + 1 + 1 + + + 0 + + + 2 + 0 + 8 + 1 + 1 + 1 + 1 + 1 + + + + data/FPSGameplay/levels + + + 25 + + + 25 + + + 25 + + + 25 + + + 5 + + + + + 0 0 1 + 10 + 255 0 0 255 + 0 255 0 255 + DefaultRoadMaterialOther + DefaultRoadMaterialTop + + + 1 + AIPlayer + DefaultPlayerData + + + 5 + 0 0 1 + 10 + 255 255 255 255 + 255 0 0 255 + 0 255 0 255 + + + 10 + 255 255 255 255 + DefaultDecalRoadMaterial + 0 255 0 255 + + + 1 + 0 0 0 100 + 40 40 + 0.1 + 1 + 0 + 1 + 0 + 1 + 1 + 1 + 180 180 180 255 + 45 + 135 + 255 255 255 255 + + + lowerHeight + + 10 + 1 + 1 + 100 + 90 + 0 + 0.1 + 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 + 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 + 50 + + + 1 + 40 40 + 1 + ellipse + 40 40 + + + + 17 16 15 255 + 96 94 92 255 + 50 49 48 255 + 59 58 57 255 + 72 70 68 255 + 100 98 96 255 + 178 175 172 255 + 234 232 230 255 + 120 120 120 255 + 255 255 255 255 + 50 49 48 255 + 236 234 232 255 + 37 36 35 255 + 50 49 48 255 + 59 58 57 255 + 43 43 43 255 + 72 70 68 255 + 255 255 255 255 + 32 31 30 255 + + + WorldEditorInspectorPlugin + 6 + screenCenter + Modern + 0 + 1 + FPSGameplay:EmptyLevel + 50 + 1 + FPSGameplay:EmptyLevel,FPSGameplay:EmptyTerrain,pbr:PbrMatTestLevel,TTR:DasBootLevel + Blank Level + AssetWork_Debug.exe + 40 + + 255 255 0 255 + 255 255 255 255 + 0 255 0 255 + 0 0 255 255 + 255 0 0 255 + 100 100 100 255 + 255 255 0 255 + + + ../../../Documentation/Official Documentation.html + ../../../Documentation/Torque 3D - Script Manual.chm + http://www.garagegames.com/products/torque-3d/documentation/user + http://www.garagegames.com/products/torque-3d/forums + + + 102 102 102 100 + 51 51 51 100 + 255 255 255 100 + 1 + 0 + + + tools/worldEditor/images/DefaultHandle + tools/worldEditor/images/LockedHandle + tools/worldEditor/images/SelectHandle + + + Classic + + + 1 + 0 + 20 + 255 + 8 + + + 1 + 1 + 1 + 1 + 1 + + + 50 50 50 255 + 48 48 48 255 + 180 180 180 255 + 215 215 215 255 + 255 255 255 255 + + + 0 + 100 + 1 + 1 + 0.01 + 0 + 0 + 2 + 0 + + diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.cs index 6abfee59e..3f13b4f3b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.cs @@ -443,6 +443,9 @@ function EditorOpenMission(%levelAsset) error("Selected Level Asset doesn't have a valid levelFile path!"); return; } + + //We cool, so dereference the def because we don't need it the rest of the way + AssetDatabase.releaseAsset(%levelAssetId); } // close the current editor, it will get cleaned up by MissionCleanup @@ -457,11 +460,11 @@ function EditorOpenMission(%levelAsset) if( !$missionRunning ) { activatePackage( "BootEditor" ); - StartGame( %filename ); + StartGame( %levelAssetId ); } else { - loadMission( %filename, true ) ; + loadMission( %levelAssetId, true ) ; pushInstantGroup(); diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs index 31c128062..5a088a38d 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs @@ -119,11 +119,14 @@ function EditorGui::buildMenus(%this) profile = "ToolsGuiMenuBarProfile"; }; - %recentLevelsMenu = new PopupMenu(RecentLevelsPopupMenu) + if(!isObject(RecentLevelsPopupMenu)) { - superClass = "MenuBuilder"; - class = "EditorFileMenu"; - }; + %recentLevelsMenu = new PopupMenu(RecentLevelsPopupMenu) + { + superClass = "MenuBuilder"; + class = "EditorFileMenu"; + }; + } // File Menu %fileMenu = new PopupMenu()