diff --git a/Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript b/Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript index 9284af583..25c7e19f7 100644 --- a/Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript +++ b/Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript @@ -687,7 +687,7 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem ) $pref::PostFX::EnableVignette = false; $pref::Video::AA = 0; - $pref::Video::disableVerticalSync = 0; + $pref::Video::defaultAnisotropy = 0; } else { @@ -713,7 +713,7 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem ) $pref::PostFX::EnableVignette = false; $pref::Video::AA = 0; - $pref::Video::disableVerticalSync = 0; + $pref::Video::defaultAnisotropy = 0; } } else @@ -743,7 +743,7 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem ) $pref::PostFX::EnableVignette = true; $pref::Video::AA = 4; - $pref::Video::disableVerticalSync = 16; + $pref::Video::defaultAnisotropy = 16; } else if ( %videoMem > 400 || %videoMem == 0 ) { @@ -769,7 +769,7 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem ) $pref::PostFX::EnableVignette = true; $pref::Video::AA = 4; - $pref::Video::disableVerticalSync = 4; + $pref::Video::defaultAnisotropy = 4; if ( %videoMem == 0 ) echo("Torque was unable to detect available video memory. Applying 'Medium' quality."); @@ -798,7 +798,7 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem ) $pref::PostFX::EnableVignette = false; $pref::Video::AA = 0; - $pref::Video::disableVerticalSync = 0; + $pref::Video::defaultAnisotropy = 0; } } diff --git a/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript b/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript index 40540c1ab..cc4e6912c 100644 --- a/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript +++ b/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript @@ -308,6 +308,13 @@ function OptionsMenu::refresh(%this) %command = %this.optionsCategories.getValue(%this.currentCategory); eval(%command); } + + //now, because we reconstruct the displayed set, we'll force the mouse(if we're using it as our input) + //to be poked so we can re-track to whatever control, if any, we're over + if($activeControllerType !$= "gamepad") + { + Canvas.setCursorPos(Canvas.getCursorPos()); + } } function OptionsMenu::getOptionVariableValue(%this, %variableName) diff --git a/Templates/BaseGame/game/data/UI/scripts/profiles.tscript b/Templates/BaseGame/game/data/UI/scripts/profiles.tscript index 3aae4df2a..92a7720d1 100644 --- a/Templates/BaseGame/game/data/UI/scripts/profiles.tscript +++ b/Templates/BaseGame/game/data/UI/scripts/profiles.tscript @@ -348,7 +348,7 @@ new GuiControlProfile( GuiPopupMenuItemBorder : GuiButtonProfile ) fixedExtent = false; justify = "center"; canKeyFocus = false; - bitmap = "data/ui/images/button"; + bitmapAsset = "UI:menubutton_image"; category = "Core"; }; diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript index 0c7270d10..5ff4d4cf4 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript @@ -671,10 +671,17 @@ function AssetBrowser::loadDirectories( %this ) if(%this.selectMode) { + //Due to a fluke in how this tracks, it overrides the current addres, so we'll + //store it real fast + %curAdd = AssetBrowser.dirHandler.currentAddress; + + //Disable these for this go AssetBrowser-->filterTree.addSelection(AssetBrowser-->filterTree.collectionsIdx); AssetBrowser-->filterTree.addSelection(AssetBrowser-->filterTree.creatorIdx); - AssetBrowser-->filterTree.hideSelection(); + AssetBrowser-->filterTree.clearSelection(); + + AssetBrowser.dirHandler.currentAddress = %curAdd; } %this.dirHandler.loadFolders("data", %dataItem); @@ -700,49 +707,6 @@ function AssetBrowser::loadDirectories( %this ) %this.dirHandler.loadFolders("tools", %toolsItem); } - //Add Non-Asset Scripted Objects. Datablock, etc based - /*%category = getWord( %breadcrumbPath, 1 ); - %dataGroup = "DataBlockGroup"; - - if(%dataGroup.getCount() != 0) - { - %scriptedItem = AssetBrowser-->filterTree.insertItem(1, "Scripted"); - - for ( %i = 0; %i < %dataGroup.getCount(); %i++ ) - { - %obj = %dataGroup.getObject(%i); - // echo ("Obj: " @ %obj.getName() @ " - " @ %obj.category ); - - //if ( %obj.category $= "" && %obj.category == 0 ) - // continue; - - %dbFilename = %obj.getFileName(); - %dbFilePath = filePath(%dbFilename); - - if(%breadcrumbPath $= %dbFilePath) - { - - //if ( %breadcrumbPath $= "" ) - //{ - %catItem = AssetBrowser-->filterTree.findItemByName(%obj.category); - - if(%catItem == 0) - AssetBrowser-->filterTree.insertItem(%scriptedItem, %obj.category, "scripted"); - /*%ctrl = %this.findIconCtrl( %obj.category ); - if ( %ctrl == -1 ) - { - %this.addFolderIcon( %obj.category ); - }*/ - //} - /*else if ( %breadcrumbPath $= %obj.category ) - { - AssetBrowser-->filterTree.insertItem(%scriptedItem, %obj.getName()); - }*/ - //} - //} - // } - - AssetBrowser-->filterTree.buildVisibleTree(true); //Remove any modules that have no assets if we have that filter on @@ -769,9 +733,6 @@ function AssetBrowser::loadDirectories( %this ) AssetBrowser.newModuleId = ""; } - //%dataItem = AssetBrowser-->filterTree.findItemByName("data"); - //AssetBrowser-->filterTree.expandItem(%dataItem); - AssetBrowser.dirHandler.expandTreeToAddress(AssetBrowser.dirHandler.currentAddress); %selectedItem = AssetBrowser.dirHandler.getFolderTreeItemFromAddress(AssetBrowser.dirHandler.currentAddress); @@ -1476,6 +1437,40 @@ function AssetBrowser::doRebuildAssetArray(%this) %finalAssetCount = 0; + //Add folders + if(EditorSettings.value("Assets/Browser/showFolders", true) == true) + { + %folders = getDirectoryList(%breadcrumbPath); + for(%f=0; %f < getFieldCount(%folders); %f++) + { + %folderName = getField(%folders, %f); + + %searchActive = AssetSearchTerms.count() != 0; + if(%searchActive) + { + if(matchesSearch(%folderName, "Folder", "")) + { + $AssetBrowser::AssetArray.add( %breadcrumbPath, "Folder" TAB %folderName ); + continue; + } + } + else + { + //got it. + if(%folderName $= "shaderCache" || %folderName $= "cache" || %folderName $= ".git") + continue; + + if(!%this.coreModulesFilter && %folderName $= "core" && %breadcrumbPath $= "") + continue; + + if(!%this.toolsModulesFilter && %folderName $= "tools" && %breadcrumbPath $= "") + continue; + + $AssetBrowser::AssetArray.add( %breadcrumbPath, "Folder" TAB %folderName ); + } + } + } + //now, we'll iterate through, and find the assets that are in this module, and this category for( %i=0; %i < %numAssetsFound; %i++) { @@ -1544,40 +1539,6 @@ function AssetBrowser::doRebuildAssetArray(%this) } } } - - //Add folders - if(EditorSettings.value("Assets/Browser/showFolders", true) == true) - { - %folders = getDirectoryList(%breadcrumbPath); - for(%f=0; %f < getFieldCount(%folders); %f++) - { - %folderName = getField(%folders, %f); - - %searchActive = AssetSearchTerms.count() != 0; - if(%searchActive) - { - if(matchesSearch(%folderName, "Folder", "")) - { - $AssetBrowser::AssetArray.add( %breadcrumbPath, "Folder" TAB %folderName ); - continue; - } - } - else - { - //got it. - if(%folderName $= "shaderCache" || %folderName $= "cache" || %folderName $= ".git") - continue; - - if(!%this.coreModulesFilter && %folderName $= "core" && %breadcrumbPath $= "") - continue; - - if(!%this.toolsModulesFilter && %folderName $= "tools" && %breadcrumbPath $= "") - continue; - - $AssetBrowser::AssetArray.add( %breadcrumbPath, "Folder" TAB %folderName ); - } - } - } //Add Non-Asset Scripted Objects. Datablock, etc based %hasDBFilter = true; diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript index 12c6d4e3d..bc7a34cb6 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript @@ -530,7 +530,7 @@ function AssetBrowser::generateMaterialAssetPreviewImage(%this, %previewButton, } } - %previewButton.bitmapAsset = %previewAssetName; + %previewButton.bitmapAsset = "ToolsModule:" @ %previewAssetName; return true; } } diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript index 4195cf1b9..c39710f9c 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript @@ -361,13 +361,9 @@ function AssetBrowser::generateShapeAssetPreviewImage(%this, %previewButton, %fo { return false; //failed to register the preview image for some reason? } - } - else - { - %previewAssetName = "ToolsModule:" @ %previewAssetName; } - %previewButton.bitmapAsset = %previewAssetName; + %previewButton.bitmapAsset = "ToolsModule:" @ %previewAssetName; return true; } else diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrainMaterial.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrainMaterial.tscript index ded898e9f..d9ded4ef3 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrainMaterial.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrainMaterial.tscript @@ -201,7 +201,7 @@ function AssetBrowser::generateTerrainMaterialAssetPreviewImage(%this, %previewB } } - %previewButton.bitmapAsset = %previewAssetName; + %previewButton.bitmapAsset = "ToolsModule:" @ %previewAssetName; return true; } } diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript index 329e2763f..0df04615a 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript @@ -91,38 +91,6 @@ function directoryHandler::navigateTo(%this, %address, %historyNav, %selectionNa //break down the address %folderCount = getTokenCount(%address, "/"); - - /*%rebuiltPath = ""; - for(%f=0; %f < %folderCount; %f++) - { - %folderName = getToken(%address, "/", %f); - - %rebuiltPath = %f == 0 ? %folderName : %rebuiltPath @ "/" @ %folderName; - - %folderNavButton = new GuiButtonCtrl() - { - profile = ToolsGuiButtonProfile; - text = %folderName; - command = "AssetBrowser.navigateTo(\"" @ %rebuiltPath @ "\");"; - extent = "100" SPC AssetBrowser_BreadcrumbBar.extent.y; - }; - - AssetBrowser_BreadcrumbBar.add(%folderNavButton); - - if(%f != %folderCount-1) - { - %folderSpacerButton = new GuiBitmapButtonCtrl() - { - profile = ToolsGuiButtonProfile; - bitmapAsset = "ToolsModule:rightArrowWhite_image"; - bitmapMode = "Centered"; - extent = "25" SPC AssetBrowser_BreadcrumbBar.extent.y; - //command = "AssetBrowser.navigateTo(\"" @ %rebuiltPath @ "\");"; - }; - - AssetBrowser_BreadcrumbBar.add(%folderSpacerButton); - } - }*/ //find our folder tree and action on it tree %folderId = %this.getFolderTreeItemFromAddress(%address); diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript index f7c373ed7..2235ab5a3 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript @@ -81,7 +81,7 @@ function GuiEditCanvas::onCreateMenu(%this) internalName = "FileMenu"; item[0] = "New Gui..." TAB %cmdCtrl SPC "N" TAB %this @ ".create();"; - item[1] = "Open..." TAB %cmdCtrl SPC "O" TAB %this @ ".open();"; + item[1] = "Open GUI File..." TAB %cmdCtrl SPC "O" TAB %this @ ".open();"; item[2] = "Save" TAB %cmdCtrl SPC "S" TAB %this @ ".save( false, true );"; item[3] = "Save As..." TAB %cmdCtrl @ "-Shift S" TAB %this @ ".save( false );"; item[4] = "Save Selected As..." TAB %cmdCtrl @ "-Alt S" TAB %this @ ".save( true );";