Added fallback handling to MaterialAssets if the asset was found but the matDef was not

Added import config handling for prepending Directory to asset name
Added handling for import config of appending a sound suffix
Integrated handling of directory prepend and asset type suffix to rename issue resolution of asset importing
Corrected miswording of warn message for duplicate object names
Correct GUI issues with verve tools
Convert verve tools to utilize assets for their GUI elements
Fix window binding/naming issue depending on window mode for verve
Fix popup menus formatting for verve
WIP fix for material swap in Material editor. Corrects crash, but swap action is unreliable depending on object type
Fix display issue with mission area editor toolbar button image
Fix tooltip display of SFXEmitters in editor tree to correctly show the bound asset
Changed network graph accelerator keybind from just N to Ctrl N to avoid keybind issues when typing
Fixed Create New Emitter button in particle emitter that was showing as no texture

Engine/source/T3D/assets/MaterialAsset.cpp

@@ -319,6 +319,12 @@ U32 MaterialAsset::getAssetByMaterialName(StringTableEntry matName, AssetPtr<Mat
          AssetDatabase.releaseAsset(query.mAssetList[i]); //cleanup if that's not the one we needed
       }
    }
+
+   //Somehow we failed to bind an asset, so just use the fallback and mark the failure
+   matAsset->setAssetId(MaterialAsset::smNoMaterialAssetFallback);
+   (*matAsset)->mLoadedState = AssetErrCode::UsingFallback;
+   return AssetErrCode::UsingFallback;
+
 }
 
 StringTableEntry MaterialAsset::getAssetIdByMaterialName(StringTableEntry matName)

Engine/source/T3D/assets/assetImporter.cpp

@@ -104,7 +104,9 @@ AssetImportConfig::AssetImportConfig() :
    importSounds(true),
    VolumeAdjust(false),
    PitchAdjust(false),
-   SoundsCompressed(false)
+   SoundsCompressed(false),
+   AlwaysAddSoundSuffix(false),
+   AddedSoundSuffix("_sound")
 {
 }
 
@@ -316,6 +318,8 @@ void AssetImportConfig::loadImportConfig(Settings* configSettings, String config
    VolumeAdjust = dAtof(configSettings->value(String(configName + "/Sounds/VolumeAdjust").c_str()));
    PitchAdjust = dAtof(configSettings->value(String(configName + "/Sounds/PitchAdjust").c_str()));
    SoundsCompressed = dAtob(configSettings->value(String(configName + "/Sounds/Compressed").c_str()));
+   AlwaysAddSoundSuffix = dAtob(configSettings->value(String(configName + "/Sounds/AlwaysAddSoundSuffix").c_str()));
+   AddedSoundSuffix = configSettings->value(String(configName + "/Sounds/AddedSoundSuffix").c_str());
 }
 
 void AssetImportConfig::CopyTo(AssetImportConfig* target) const
@@ -406,6 +410,8 @@ void AssetImportConfig::CopyTo(AssetImportConfig* target) const
    target->VolumeAdjust = VolumeAdjust;
    target->PitchAdjust = PitchAdjust;
    target->SoundsCompressed = SoundsCompressed;
+   target->AlwaysAddSoundSuffix = AlwaysAddSoundSuffix;
+   target->AddedSoundSuffix = AddedSoundSuffix;
 }
 
 ConsoleDocClass(AssetImportObject,
@@ -607,6 +613,7 @@ AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Pa
    assetName.replace('*', '_');
    assetName.replace('-', '_');
    assetName.replace('+', '_');
+   assetName.replace('&', '_');
 
    assetImportObj->assetType = assetType;
    assetImportObj->filePath = filePath;
@@ -622,6 +629,14 @@ AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Pa
    assetImportObj->importStatus = AssetImportObject::NotProcessed;
    assetImportObj->generatedAsset = false;
 
+   //If the config is marked to always set the directory prefix, do that now
+   if (activeImportConfig->AddDirectoryPrefixToAssetName)
+   {
+      assetName = getFolderPrefixedName(assetImportObj);
+      assetImportObj->assetName = assetName;
+      assetImportObj->cleanAssetName = assetName;
+   }
+
    if (parentItem != nullptr)
    {
       dSprintf(importLogBuffer, sizeof(importLogBuffer), "Added Child Importing Asset to %s", parentItem->assetName.c_str());
@@ -1976,6 +1991,12 @@ void AssetImporter::processSoundAsset(AssetImportObject* assetItem)
    dSprintf(importLogBuffer, sizeof(importLogBuffer), "Preparing Sound for Import: %s", assetItem->assetName.c_str());
    activityLog.push_back(importLogBuffer);
 
+   if (activeImportConfig->AlwaysAddSoundSuffix)
+   {
+      assetItem->assetName += activeImportConfig->AddedSoundSuffix;
+      assetItem->cleanAssetName = assetItem->assetName;
+   }
+
    assetItem->importStatus = AssetImportObject::Processed;
 }
 
@@ -2165,7 +2186,49 @@ void AssetImporter::resolveAssetItemIssues(AssetImportObject* assetItem)
       {
          //Set trailing number
          String renamedAssetName = assetItem->assetName;
-         renamedAssetName = Sim::getUniqueName(renamedAssetName.c_str());
+         String renamedAssetId = assetItem->moduleName + ":" + renamedAssetName;
+
+         String addedSuffix;
+
+         if (assetItem->assetType == String("ShapeAsset"))
+            addedSuffix = activeImportConfig->AddedShapeSuffix;
+         else if (assetItem->assetType == String("MaterialAsset"))
+            addedSuffix = activeImportConfig->AddedMaterialSuffix;
+         else if (assetItem->assetType == String("ImageAsset"))
+            addedSuffix = activeImportConfig->AddedImageSuffix;
+         else if (assetItem->assetType == String("SoundAsset"))
+            addedSuffix = activeImportConfig->AddedSoundSuffix;
+
+         //do the suffix if it isn't already on it
+         if (!renamedAssetName.endsWith(addedSuffix.c_str()))
+         {
+            renamedAssetName += addedSuffix;
+            renamedAssetId = assetItem->moduleName + ":" + renamedAssetName;
+            assetItem->assetName = renamedAssetName;
+         }
+
+         //if still conflicted
+         //add the directory prefix
+         if (AssetDatabase.isDeclaredAsset(renamedAssetId.c_str()))
+         {
+            renamedAssetName = getFolderPrefixedName(assetItem);
+            renamedAssetId = assetItem->moduleName + ":" + renamedAssetName;
+            assetItem->assetName = renamedAssetName;
+         }
+
+         bool appendedNumber = false;
+         U32 uniqueNumber = 0;
+         while (AssetDatabase.isDeclaredAsset(renamedAssetId.c_str()))
+         {
+            uniqueNumber++;
+            renamedAssetId = assetItem->moduleName + ":" + renamedAssetName + String::ToString(uniqueNumber);
+            appendedNumber = true;
+         }
+
+         if (appendedNumber)
+         {
+            renamedAssetName += String::ToString(uniqueNumber);
+         }
 
          //Log it's renaming
          dSprintf(importLogBuffer, sizeof(importLogBuffer), "Asset %s was renamed due to %s as part of the Import Configuration", assetItem->assetName.c_str(), humanReadableReason.c_str());
@@ -2186,25 +2249,7 @@ void AssetImporter::resolveAssetItemIssues(AssetImportObject* assetItem)
       }
       else if (activeImportConfig->DuplicateAutoResolution == String("FolderPrefix"))
       {
-         String renamedAssetName = assetItem->assetName;
-
-         //Set trailing number
-         S32 dirIndex = assetItem->filePath.getDirectoryCount() - 1;
-         while (dirIndex > -1)
-         {
-            renamedAssetName = assetItem->assetName;
-            String owningFolder = assetItem->filePath.getDirectory(dirIndex);
-
-            renamedAssetName = owningFolder + "_" + renamedAssetName;
-
-            if (AssetDatabase.isDeclaredAsset(renamedAssetName))
-            {
-               dirIndex--;
-               continue;
-            }
-
-            break;
-         }
+         String renamedAssetName = getFolderPrefixedName(assetItem);
 
          //Log it's renaming
          dSprintf(importLogBuffer, sizeof(importLogBuffer), "Asset %s was renamed due to %s as part of the Import Configuration", assetItem->assetName.c_str(), humanReadableReason.c_str());

Engine/source/T3D/assets/assetImporter.h

@@ -409,6 +409,15 @@ public:
    /// </summary>
    bool SoundsCompressed;
 
+   /// When importing an image, this indicates if it should automatically add a standard suffix onto the name
+   /// </summary>
+   bool AlwaysAddSoundSuffix;
+
+   /// <summary>
+   /// If AlwaysAddSoundSuffix is on, this is the suffix to be added
+   /// </summary>
+   String AddedSoundSuffix;
+
 public:
    AssetImportConfig();
    virtual ~AssetImportConfig();
@@ -934,4 +943,27 @@ public:
    //
    void setTargetModuleId(const String& moduleId) { targetModuleId = moduleId; }
    const String& getTargetModuleId() { return targetModuleId; }
+
+   String getFolderPrefixedName(AssetImportObject* assetItem)
+   {
+      String renamedAssetName = assetItem->assetName;
+      S32 dirIndex = assetItem->filePath.getDirectoryCount() - 1;
+      while (dirIndex > -1)
+      {
+         renamedAssetName = assetItem->assetName;
+         String owningFolder = assetItem->filePath.getDirectory(dirIndex);
+
+         renamedAssetName = owningFolder + "_" + renamedAssetName;
+
+         if (AssetDatabase.isDeclaredAsset(renamedAssetName))
+         {
+            dirIndex--;
+            continue;
+         }
+
+         break;
+      }
+
+      return renamedAssetName;
+   }
 };

Engine/source/console/simDictionary.cpp

@@ -53,7 +53,7 @@ void SimNameDictionary::insert(SimObject* obj)
    SimObject* checkForDup = find(obj->getName());
 
    if (checkForDup)
-      Con::warnf("Warning! You have a duplicate datablock name of %s. This can cause problems. You should rename one of them.", obj->getName());
+      Con::warnf("Warning! You have a duplicate object name of %s. This can cause problems. You should rename one of them.", obj->getName());
 
    Mutex::lockMutex(mutex);
 #ifndef USE_NEW_SIMDICTIONARY

Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript

@@ -92,7 +92,7 @@ singleton GuiControlProfile ( VEditorBitmapButtonProfile : VEditorDefaultProfile
     justify = "center";
     
     hasBitmapArray = true;
-    bitmap         = "./Images/Button";
+    bitmapAsset         = "ToolsModule:button_image";
 };
 
 //-----------------------------------------------------------------------------

Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui

@@ -4,15 +4,15 @@ $guiContent = new GuiControl(VerveEditorGui) {
    Enabled = "1";
    isContainer = "1";
    Profile = "VEditorDefaultProfile";
-   HorizSizing = "right";
-   VertSizing = "bottom";
+   HorizSizing = "width";
+   VertSizing = "height";
    Position = "0 0";
    Extent = "1024 768";
    MinExtent = "8 2";
    canSave = "1";
    isDecoy = "0";
    Visible = "1";
-   tooltipprofile = "GuiToolTipProfile";
+   tooltipprofile = "ToolsGuiToolTipProfile";
    hovertime = "1000";
 
    new GuiControl() {
@@ -44,7 +44,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
          canSave = "1";
          isDecoy = "0";
          Visible = "1";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          Margin = "0 0 0 0";
          Padding = "0 0 0 0";
@@ -80,7 +80,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
             canSave = "1";
             isDecoy = "0";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             
             new VEditorButton() {
@@ -96,7 +96,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                  MinExtent = "210 1";
                  canSave = "1";
                  Visible = "1";
-                 tooltipprofile = "GuiToolTipProfile";
+                 tooltipprofile = "ToolsGuiToolTipProfile";
                  hovertime = "1000";
                  text = "";
                  groupNum = "-1";
@@ -122,7 +122,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                canSave = "1";
                isDecoy = "0";
                Visible = "1";
-               tooltipprofile = "GuiToolTipProfile";
+               tooltipprofile = "ToolsGuiToolTipProfile";
                hovertime = "1000";
             };
          };
@@ -140,7 +140,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
          canSave = "1";
          isDecoy = "0";
          Visible = "1";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          Margin = "0 0 0 0";
          Padding = "0 0 0 0";
@@ -176,7 +176,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
             canSave = "1";
             isDecoy = "0";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
 
             new VTimeLineControl(VerveEditorTrackTimeLine) {
@@ -192,7 +192,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                canSave = "1";
                isDecoy = "0";
                Visible = "1";
-               tooltipprofile = "GuiToolTipProfile";
+               tooltipprofile = "ToolsGuiToolTipProfile";
                hovertime = "1000";
                IsController = "0";
                Controller = "VerveEditorController";
@@ -211,7 +211,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                      MinExtent = "8 8";
                      canSave = "1";
                      Visible = "1";
-                     tooltipprofile = "GuiToolTipProfile";
+                     tooltipprofile = "ToolsGuiToolTipProfile";
                      hovertime = "1000";
                      text = "";
                      groupNum = "-1";
@@ -237,7 +237,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                     canSave = "1";
                     isDecoy = "0";
                     Visible = "1";
-                    tooltipprofile = "GuiToolTipProfile";
+                    tooltipprofile = "ToolsGuiToolTipProfile";
                     hovertime = "1000";
                 };
             };
@@ -256,7 +256,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
          canSave = "1";
          isDecoy = "0";
          Visible = "1";
-         tooltipprofile = "GuiDefaultProfile";
+         tooltipprofile = "ToolsGuiDefaultProfile";
          hovertime = "1000";
          Margin = "0 0 0 0";
          Padding = "0 0 0 0";
@@ -283,7 +283,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
             canSave = "1";
             isDecoy = "0";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
 
              new GuiBitmapButtonCtrl(VerveEditorAddGroupButton) {
@@ -300,7 +300,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                 canSave = "1";
                 isDecoy = "0";
                 Visible = "1";
-                tooltipprofile = "GuiToolTipProfile";
+                tooltipprofile = "ToolsGuiToolTipProfile";
                 tooltip = "Add New Group";
                 command = "$ThisControl.DisplayContextMenu();";
                 hovertime = "1000";
@@ -323,7 +323,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                 canSave = "1";
                 isDecoy = "0";
                 Visible = "1";
-                tooltipprofile = "GuiToolTipProfile";
+                tooltipprofile = "ToolsGuiToolTipProfile";
                 tooltip = "Add New Track";
                 command = "$ThisControl.DisplayContextMenu();";
                 hovertime = "1000";
@@ -345,7 +345,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                 canSave = "1";
                 isDecoy = "0";
                 Visible = "1";
-                tooltipprofile = "GuiToolTipProfile";
+                tooltipprofile = "ToolsGuiToolTipProfile";
                 tooltip = "Add New Event";
                 command = "VerveEditor::AddEvent();";
                 hovertime = "1000";
@@ -367,7 +367,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                 canSave = "1";
                 isDecoy = "0";
                 Visible = "1";
-                tooltipprofile = "GuiToolTipProfile";
+                tooltipprofile = "ToolsGuiToolTipProfile";
                 tooltip = "Delete Selected Object(s)";
                 command = "VerveEditor::DeleteSelection();";
                 hovertime = "1000";
@@ -391,7 +391,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
          canSave = "1";
          isDecoy = "0";
          Visible = "1";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          Margin = "0 0 0 0";
          Padding = "0 0 0 0";
@@ -427,7 +427,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
             canSave = "1";
             isDecoy = "0";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
 
             new VTimeLineControl(VerveEditorTimeLine) {
@@ -443,7 +443,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                canSave = "1";
                isDecoy = "0";
                Visible = "1";
-               tooltipprofile = "GuiToolTipProfile";
+               tooltipprofile = "ToolsGuiToolTipProfile";
                hovertime = "1000";
                IsController = "1";
                Controller = "VerveEditorController";
@@ -465,7 +465,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
       canSave = "1";
       isDecoy = "0";
       Visible = "1";
-      tooltipprofile = "GuiToolTipProfile";
+      tooltipprofile = "ToolsGuiToolTipProfile";
       hovertime = "1000";
       Margin = "0 0 0 0";
       Padding = "0 0 0 0";
@@ -496,7 +496,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
         canSave = "1";
         isDecoy = "0";
         Visible = "1";
-        tooltipprofile = "GuiToolTipProfile";
+        tooltipprofile = "ToolsGuiToolTipProfile";
         hovertime = "1000";
      };
    };
@@ -513,7 +513,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
       canSave = "1";
       isDecoy = "0";
       Visible = "1";
-      tooltipprofile = "GuiDefaultProfile";
+      tooltipprofile = "ToolsGuiDefaultProfile";
       hovertime = "1000";
       Margin = "0 0 0 0";
       Padding = "0 0 0 0";
@@ -540,7 +540,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
          canSave = "1";
          isDecoy = "0";
          Visible = "1";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
       };
    };
@@ -557,7 +557,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
       canSave = "1";
       isDecoy = "0";
       Visible = "1";
-      tooltipprofile = "GuiDefaultProfile";
+      tooltipprofile = "ToolsGuiDefaultProfile";
       hovertime = "1000";
       Margin = "0 0 0 0";
       Padding = "0 0 0 0";
@@ -584,7 +584,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
          canSave = "1";
          isDecoy = "0";
          Visible = "1";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
 
          new GuiControl() {
@@ -600,7 +600,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
             canSave = "1";
             isDecoy = "0";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
 
             new GuiBitmapButtonCtrl() {
@@ -616,7 +616,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                canSave = "1";
                isDecoy = "0";
                Visible = "1";
-               tooltipprofile = "GuiToolTipProfile";
+               tooltipprofile = "ToolsGuiToolTipProfile";
                tooltip = "Jump Backwards";
                command = "VerveEditor::Rewind();";
                hovertime = "1000";
@@ -638,7 +638,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                canSave = "1";
                isDecoy = "0";
                Visible = "1";
-               tooltipprofile = "GuiToolTipProfile";
+               tooltipprofile = "ToolsGuiToolTipProfile";
                tooltip = "Step Backwards 1 Frame";
                command = "VerveEditor::StepB();";
                hovertime = "1000";
@@ -660,7 +660,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                canSave = "1";
                isDecoy = "0";
                Visible = "1";
-               tooltipprofile = "GuiToolTipProfile";
+               tooltipprofile = "ToolsGuiToolTipProfile";
                tooltip = "Play / Pause";
                command = "VerveEditor::TogglePlay( $ThisControl );";
                hovertime = "1000";
@@ -682,7 +682,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                canSave = "1";
                isDecoy = "0";
                Visible = "1";
-               tooltipprofile = "GuiToolTipProfile";
+               tooltipprofile = "ToolsGuiToolTipProfile";
                tooltip = "Step Forward 1 Frame";
                command = "VerveEditor::StepF();";
                hovertime = "1000";
@@ -704,7 +704,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
                canSave = "1";
                isDecoy = "0";
                Visible = "1";
-               tooltipprofile = "GuiToolTipProfile";
+               tooltipprofile = "ToolsGuiToolTipProfile";
                tooltip = "Jump Forward";
                command = "VerveEditor::Forward();";
                hovertime = "1000";
@@ -727,7 +727,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
             canSave = "1";
             isDecoy = "0";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             tooltip = "Insert Time (Front)";
             command = "VerveEditor::InsertTimeFront();";
             hovertime = "1000";
@@ -749,7 +749,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
             canSave = "1";
             isDecoy = "0";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             tooltip = "Insert Time (Back)";
             command = "VerveEditor::InsertTimeBack();";
             hovertime = "1000";

Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorGroupBuilder.gui

@@ -1,7 +1,7 @@
 //--- OBJECT WRITE BEGIN ---
 $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
    isContainer = "1";
-   Profile = "GuiDefaultProfile";
+   Profile = "ToolsGuiDefaultProfile";
    HorizSizing = "right";
    VertSizing = "bottom";
    position = "0 0";
@@ -9,7 +9,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
    MinExtent = "8 8";
    canSave = "1";
    Visible = "1";
-   tooltipprofile = "GuiToolTipProfile";
+   tooltipprofile = "ToolsGuiToolTipProfile";
    hovertime = "1000";
    canSaveDynamicFields = "0";
 
@@ -30,7 +30,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
       AnchorLeft = "1";
       AnchorRight = "0";
       isContainer = "1";
-      Profile = "GuiWindowProfile";
+      Profile = "ToolsGuiWindowProfile";
       HorizSizing = "center";
       VertSizing = "center";
       position = "268 181";
@@ -38,7 +38,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
       MinExtent = "256 8";
       canSave = "1";
       Visible = "1";
-      tooltipprofile = "GuiToolTipProfile";
+      tooltipprofile = "ToolsGuiToolTipProfile";
       hovertime = "1000";
       canSaveDynamicFields = "0";
 
@@ -52,7 +52,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
          AnchorLeft = "1";
          AnchorRight = "0";
          isContainer = "0";
-         Profile = "GuiTextProfile";
+         Profile = "ToolsGuiTextProfile";
          HorizSizing = "right";
          VertSizing = "bottom";
          position = "14 30";
@@ -60,7 +60,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
          MinExtent = "8 8";
          canSave = "1";
          Visible = "1";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          canSaveDynamicFields = "0";
       };
@@ -78,7 +78,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
          AnchorLeft = "1";
          AnchorRight = "0";
          isContainer = "0";
-         Profile = "GuiTextEditProfile";
+         Profile = "ToolsGuiTextEditProfile";
          HorizSizing = "width";
          VertSizing = "bottom";
          position = "79 29";
@@ -86,13 +86,13 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
          MinExtent = "8 8";
          canSave = "1";
          Visible = "1";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          canSaveDynamicFields = "0";
       };
       new GuiBitmapBorderCtrl() {
          isContainer = "0";
-         Profile = "GuiGroupBorderProfile";
+         Profile = "ToolsGuiGroupBorderProfile";
          HorizSizing = "width";
          VertSizing = "bottom";
          position = "7 55";
@@ -100,7 +100,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
          MinExtent = "1 1";
          canSave = "1";
          Visible = "1";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          canSaveDynamicFields = "0";
 
@@ -112,7 +112,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
             ChangeChildSizeToFit = "1";
             ChangeChildPosition = "1";
             isContainer = "1";
-            Profile = "GuiTransparentProfile";
+            Profile = "ToolsGuiTransparentProfile";
             HorizSizing = "width";
             VertSizing = "height";
             position = "3 3";
@@ -120,13 +120,13 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
             MinExtent = "8 8";
             canSave = "1";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             canSaveDynamicFields = "0";
 
             new GuiControl() {
                isContainer = "1";
-               Profile = "GuiTransparentProfile";
+               Profile = "ToolsGuiTransparentProfile";
                HorizSizing = "right";
                VertSizing = "bottom";
                position = "0 0";
@@ -134,7 +134,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
                MinExtent = "8 2";
                canSave = "1";
                Visible = "1";
-               tooltipprofile = "GuiToolTipProfile";
+               tooltipprofile = "ToolsGuiToolTipProfile";
                hovertime = "1000";
                canSaveDynamicFields = "0";
 
@@ -148,7 +148,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
                   AnchorLeft = "1";
                   AnchorRight = "0";
                   isContainer = "0";
-                  Profile = "GuiTextProfile";
+                  Profile = "ToolsGuiTextProfile";
                   HorizSizing = "right";
                   VertSizing = "center";
                   position = "4 1";
@@ -156,7 +156,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
                   MinExtent = "8 2";
                   canSave = "1";
                   Visible = "1";
-                  tooltipprofile = "GuiToolTipProfile";
+                  tooltipprofile = "ToolsGuiToolTipProfile";
                   hovertime = "1000";
                   canSaveDynamicFields = "0";
                };
@@ -181,7 +181,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
                   MinExtent = "8 2";
                   canSave = "1";
                   Visible = "1";
-                  tooltipprofile = "GuiToolTipProfile";
+                  tooltipprofile = "ToolsGuiToolTipProfile";
                   hovertime = "1000";
                   internalName = "SceneObjectList";
                   canSaveDynamicFields = "0";
@@ -195,7 +195,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
          buttonType = "PushButton";
          useMouseEvents = "0";
          isContainer = "0";
-         Profile = "GuiButtonProfile";
+         Profile = "ToolsGuiButtonProfile";
          HorizSizing = "left";
          VertSizing = "top";
          position = "66 139";
@@ -204,7 +204,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
          canSave = "1";
          Visible = "1";
          Command = "VerveEditorGroupBuilderGUI._Build( VerveEditorGroupBuilderNameField.getText() );";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          canSaveDynamicFields = "0";
       };
@@ -214,7 +214,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
          buttonType = "PushButton";
          useMouseEvents = "0";
          isContainer = "0";
-         Profile = "GuiButtonProfile";
+         Profile = "ToolsGuiButtonProfile";
          HorizSizing = "left";
          VertSizing = "top";
          position = "174 139";
@@ -223,7 +223,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
          canSave = "1";
          Visible = "1";
          Command = "VerveEditorGroupBuilderGUI.Close();";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          canSaveDynamicFields = "0";
       };
@@ -283,7 +283,7 @@ function VerveEditorGroupBuilderGUI::_Build( %this, %groupLabel )
 {
     if ( %groupLabel $= "" )
     {
-        toolsMessageBox( "Warning", "You must provide a Valid Group Label.", "Ok" );
+        MessageBox( "Warning", "You must provide a Valid Group Label.", "Ok" );
         return;
     }
     
@@ -316,7 +316,7 @@ function VerveEditorGroupBuilderFieldStack::CreateObjectList( %this, %objectType
 {
     %container = new GuiControl()
     {
-        Profile      = "GuiTransparentProfile";
+        Profile      = "ToolsGuiTransparentProfile";
         
         HorizSizing  = "right";
         VertSizing   = "bottom";
@@ -326,7 +326,7 @@ function VerveEditorGroupBuilderFieldStack::CreateObjectList( %this, %objectType
     
     %label = new GuiTextCtrl()
     {
-        Profile      = "GuiTextProfile";
+        Profile      = "ToolsGuiTextProfile";
         
         HorizSizing  = "right";
         VertSizing   = "center";
@@ -392,7 +392,7 @@ function VerveEditorGroupBuilderFieldStack::CreateCheckbox( %this, %internalName
 {
     %container = new GuiControl()
     {
-        Profile      = "GuiTransparentProfile";
+        Profile      = "ToolsGuiTransparentProfile";
         
         HorizSizing  = "right";
         VertSizing   = "bottom";
@@ -402,7 +402,7 @@ function VerveEditorGroupBuilderFieldStack::CreateCheckbox( %this, %internalName
     
     %label = new GuiTextCtrl()
     {
-        Profile      = "GuiTextProfile";
+        Profile      = "ToolsGuiTextProfile";
         
         HorizSizing  = "right";
         VertSizing   = "center";
@@ -415,7 +415,7 @@ function VerveEditorGroupBuilderFieldStack::CreateCheckbox( %this, %internalName
     
     %checkBox = new GuiCheckBoxCtrl()
     {
-        Profile      = "GuiCheckboxProfile";
+        Profile      = "ToolsGuiCheckboxProfile";
         
         HorizSizing  = "left";
         VertSizing   = "center";

Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorImportPathNodes.gui

@@ -1,7 +1,7 @@
 //--- OBJECT WRITE BEGIN ---
 $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
    isContainer = "1";
-   Profile = "GuiDefaultProfile";
+   Profile = "ToolsGuiDefaultProfile";
    HorizSizing = "right";
    VertSizing = "bottom";
    Position = "0 0";
@@ -9,7 +9,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
    MinExtent = "8 8";
    canSave = "1";
    Visible = "1";
-   tooltipprofile = "GuiToolTipProfile";
+   tooltipprofile = "ToolsGuiToolTipProfile";
    hovertime = "1000";
    canSaveDynamicFields = "1";
 
@@ -30,7 +30,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
       AnchorLeft = "1";
       AnchorRight = "0";
       isContainer = "1";
-      Profile = "GuiWindowProfile";
+      Profile = "ToolsGuiWindowProfile";
       HorizSizing = "center";
       VertSizing = "center";
       Position = "268 181";
@@ -38,7 +38,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
       MinExtent = "256 8";
       canSave = "1";
       Visible = "1";
-      tooltipprofile = "GuiToolTipProfile";
+      tooltipprofile = "ToolsGuiToolTipProfile";
       hovertime = "1000";
       canSaveDynamicFields = "0";
 
@@ -52,7 +52,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
          AnchorLeft = "1";
          AnchorRight = "0";
          isContainer = "0";
-         Profile = "GuiTextProfile";
+         Profile = "ToolsGuiTextProfile";
          HorizSizing = "right";
          VertSizing = "bottom";
          Position = "14 30";
@@ -60,7 +60,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
          MinExtent = "8 8";
          canSave = "1";
          Visible = "1";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          canSaveDynamicFields = "0";
       };
@@ -78,7 +78,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
          AnchorLeft = "1";
          AnchorRight = "0";
          isContainer = "0";
-         Profile = "GuiTextEditProfile";
+         Profile = "ToolsGuiTextEditProfile";
          HorizSizing = "width";
          VertSizing = "bottom";
          Position = "79 29";
@@ -86,7 +86,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
          MinExtent = "8 8";
          canSave = "1";
          Visible = "1";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          canSaveDynamicFields = "0";
       };
@@ -96,7 +96,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
          buttonType = "PushButton";
          useMouseEvents = "0";
          isContainer = "0";
-         Profile = "GuiButtonProfile";
+         Profile = "ToolsGuiButtonProfile";
          HorizSizing = "left";
          VertSizing = "top";
          Position = "66 62";
@@ -105,7 +105,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
          canSave = "1";
          Visible = "1";
          Command = "VMotionTrack::_ImportPathNodes( VerveEditorImportPathNodesSpeed.getText() );";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          canSaveDynamicFields = "0";
       };
@@ -115,7 +115,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
          buttonType = "PushButton";
          useMouseEvents = "0";
          isContainer = "0";
-         Profile = "GuiButtonProfile";
+         Profile = "ToolsGuiButtonProfile";
          HorizSizing = "left";
          VertSizing = "top";
          Position = "174 62";
@@ -124,7 +124,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
          canSave = "1";
          Visible = "1";
          Command = "VerveEditorWindow.popDialog( VerveEditorImportPathNodesGUI );";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          canSaveDynamicFields = "0";
       };

Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorPreferences.gui

@@ -2,7 +2,7 @@
 $guiContent = new GuiControl(VerveEditorPreferenceGui) {
    canSaveDynamicFields = "0";
    isContainer = "1";
-   Profile = "GuiDefaultProfile";
+   Profile = "ToolsGuiDefaultProfile";
    HorizSizing = "right";
    VertSizing = "bottom";
    position = "0 0";
@@ -10,13 +10,13 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
    MinExtent = "8 2";
    canSave = "1";
    Visible = "1";
-   tooltipprofile = "GuiToolTipProfile";
+   tooltipprofile = "ToolsGuiToolTipProfile";
    hovertime = "1000";
 
    new GuiWindowCtrl() {
       canSaveDynamicFields = "0";
       isContainer = "1";
-      Profile = "GuiWindowProfile";
+      Profile = "ToolsGuiWindowProfile";
       HorizSizing = "center";
       VertSizing = "center";
       position = "392 253";
@@ -24,7 +24,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
       MinExtent = "8 2";
       canSave = "1";
       Visible = "1";
-      tooltipprofile = "GuiToolTipProfile";
+      tooltipprofile = "ToolsGuiToolTipProfile";
       hovertime = "1000";
       Docking = "None";
       Margin = "4 24 4 4";
@@ -50,7 +50,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
       new GuiControl() {
          canSaveDynamicFields = "0";
          isContainer = "1";
-         Profile = "GuiDefaultProfile";
+         Profile = "ToolsGuiDefaultProfile";
          HorizSizing = "right";
          VertSizing = "bottom";
          position = "10 93";
@@ -58,13 +58,13 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
          MinExtent = "8 2";
          canSave = "1";
          Visible = "1";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
 
          new GuiBitmapBorderCtrl() {
             canSaveDynamicFields = "0";
             isContainer = "0";
-            Profile = "GuiBitmapBorderProfile";
+            Profile = "ToolsGuiBitmapBorderProfile";
             HorizSizing = "width";
             VertSizing = "height";
             position = "0 10";
@@ -72,7 +72,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
             MinExtent = "8 2";
             canSave = "1";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
          };
          new GuiTextEditCtrl() {
@@ -87,7 +87,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
             MinExtent = "8 2";
             canSave = "1";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             Margin = "0 0 0 0";
             Padding = "0 0 0 0";
@@ -101,7 +101,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
          new GuiTextCtrl() {
             canSaveDynamicFields = "0";
             isContainer = "0";
-            Profile = "GuiTextProfile";
+            Profile = "ToolsGuiTextProfile";
             HorizSizing = "right";
             VertSizing = "bottom";
             position = "30 50";
@@ -109,7 +109,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
             MinExtent = "8 2";
             canSave = "1";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             Margin = "0 0 0 0";
             Padding = "0 0 0 0";
@@ -123,7 +123,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
          new GuiCheckBoxCtrl() {
             canSaveDynamicFields = "0";
             isContainer = "0";
-            Profile = "GuiCheckBoxProfile";
+            Profile = "ToolsGuiCheckBoxProfile";
             HorizSizing = "right";
             VertSizing = "bottom";
             position = "6 30";
@@ -132,7 +132,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
             canSave = "1";
             Visible = "1";
             Variable = "$Pref::VerveEditor::Event::SnapToTime";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             text = "   Snap to Time";
             groupNum = "-1";
@@ -143,7 +143,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
          new GuiTextEditCtrl() {
             canSaveDynamicFields = "0";
             isContainer = "0";
-            Profile = "GuiTextEditProfile";
+            Profile = "ToolsGuiTextEditProfile";
             HorizSizing = "right";
             VertSizing = "bottom";
             position = "150 50";
@@ -152,7 +152,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
             canSave = "1";
             Visible = "1";
             Variable = "$Pref::VerveEditor::Event::SnapToTimeThreshold";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             Margin = "0 0 0 0";
             Padding = "0 0 0 0";
@@ -170,7 +170,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
          new GuiCheckBoxCtrl() {
             canSaveDynamicFields = "0";
             isContainer = "0";
-            Profile = "GuiCheckBoxProfile";
+            Profile = "ToolsGuiCheckBoxProfile";
             HorizSizing = "right";
             VertSizing = "bottom";
             position = "6 80";
@@ -179,7 +179,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
             canSave = "1";
             Visible = "1";
             Variable = "$Pref::VerveEditor::Event::SnapToSiblings";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             text = "   Snap to Siblings";
             groupNum = "-1";
@@ -190,7 +190,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
          new GuiTextCtrl() {
             canSaveDynamicFields = "0";
             isContainer = "0";
-            Profile = "GuiTextProfile";
+            Profile = "ToolsGuiTextProfile";
             HorizSizing = "right";
             VertSizing = "bottom";
             position = "30 100";
@@ -198,7 +198,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
             MinExtent = "8 2";
             canSave = "1";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             Margin = "0 0 0 0";
             Padding = "0 0 0 0";
@@ -212,7 +212,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
          new GuiTextEditCtrl() {
             canSaveDynamicFields = "0";
             isContainer = "0";
-            Profile = "GuiTextEditProfile";
+            Profile = "ToolsGuiTextEditProfile";
             HorizSizing = "right";
             VertSizing = "bottom";
             position = "150 100";
@@ -221,7 +221,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
             canSave = "1";
             Visible = "1";
             Variable = "$Pref::VerveEditor::Event::SnapToSiblingThreshold";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             Margin = "0 0 0 0";
             Padding = "0 0 0 0";
@@ -240,7 +240,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
       new GuiControl() {
          canSaveDynamicFields = "0";
          isContainer = "1";
-         Profile = "GuiDefaultProfile";
+         Profile = "ToolsGuiDefaultProfile";
          HorizSizing = "right";
          VertSizing = "bottom";
          position = "10 30";
@@ -248,13 +248,13 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
          MinExtent = "8 2";
          canSave = "1";
          Visible = "1";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
 
          new GuiBitmapBorderCtrl() {
             canSaveDynamicFields = "0";
             isContainer = "0";
-            Profile = "GuiBitmapBorderProfile";
+            Profile = "ToolsGuiBitmapBorderProfile";
             HorizSizing = "width";
             VertSizing = "height";
             position = "0 10";
@@ -262,7 +262,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
             MinExtent = "8 2";
             canSave = "1";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
          };
          new GuiTextEditCtrl() {
@@ -277,7 +277,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
             MinExtent = "8 2";
             canSave = "1";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             Margin = "0 0 0 0";
             Padding = "0 0 0 0";
@@ -291,7 +291,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
          new GuiTextEditCtrl() {
             canSaveDynamicFields = "0";
             isContainer = "0";
-            Profile = "GuiTextEditProfile";
+            Profile = "ToolsGuiTextEditProfile";
             HorizSizing = "right";
             VertSizing = "bottom";
             position = "6 30";
@@ -300,7 +300,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
             canSave = "1";
             Visible = "1";
             Variable = "$Pref::VerveEditor::RecentFileSize";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             Margin = "0 0 0 0";
             Padding = "0 0 0 0";
@@ -318,7 +318,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
          new GuiTextCtrl() {
             canSaveDynamicFields = "0";
             isContainer = "0";
-            Profile = "GuiTextProfile";
+            Profile = "ToolsGuiTextProfile";
             HorizSizing = "right";
             VertSizing = "bottom";
             position = "56 30";
@@ -326,7 +326,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
             MinExtent = "8 2";
             canSave = "1";
             Visible = "1";
-            tooltipprofile = "GuiToolTipProfile";
+            tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             Margin = "0 0 0 0";
             Padding = "0 0 0 0";
@@ -341,7 +341,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
       new GuiButtonCtrl() {
          canSaveDynamicFields = "0";
          isContainer = "0";
-         Profile = "GuiButtonProfile";
+         Profile = "ToolsGuiButtonProfile";
          HorizSizing = "right";
          VertSizing = "bottom";
          position = "151 228";
@@ -350,7 +350,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
          canSave = "1";
          Visible = "1";
          Command = "VerveEditor::CloseEditorPreferences();";
-         tooltipprofile = "GuiToolTipProfile";
+         tooltipprofile = "ToolsGuiToolTipProfile";
          hovertime = "1000";
          text = "OK";
          groupNum = "-1";

Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript

@@ -103,13 +103,13 @@ function VController::DisplayContextMenu( %this, %x, %y )
             
             Item[1] = "" TAB "";
              
-            Item[2] = "Cu&t"     TAB "" TAB "";
-            Item[3] = "&Copy"    TAB "" TAB "";
-            Item[4] = "&Paste"   TAB "" TAB "VerveEditor::Paste();";
+            Item[2] = "Cut"     TAB "" TAB "";
+            Item[3] = "Copy"    TAB "" TAB "";
+            Item[4] = "Paste"   TAB "" TAB "VerveEditor::Paste();";
             
             Item[5] = "" TAB "";
             
-            Item[6] = "&Delete"  TAB "" TAB "";
+            Item[6] = "Delete"  TAB "" TAB "";
             
             PasteIndex = 4;
         };

Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorMenu.tscript

@@ -76,7 +76,7 @@ function VerveEditorWindow::onCreateMenu( %this )
     // Store Menu Bars.
     if ( !isObject( %this.MenuSet ) )
     {
-        %this.MenuSet = new SimSet();
+        %this.MenuSet = new GuiMenuBar();
     }
     
     // CMD Key.
@@ -103,14 +103,14 @@ function VerveEditorWindow::onCreateMenu( %this )
     {
         SuperClass = "VerveWindowMenu";
         
-        Label    = "&File";
+        Label    = "File";
         Position = 0;
         
-        Item[0] = "&New"         TAB %cmdKey @ "+N"       TAB "VerveEditor::NewFile();";
-        Item[1] = "&Open"        TAB %cmdKey @ "+O"       TAB "VerveEditor::LoadFile();";
+        Item[0] = "New"         TAB %cmdKey @ "+N"       TAB "VerveEditor::NewFile();";
+        Item[1] = "Open"        TAB %cmdKey @ "+O"       TAB "VerveEditor::LoadFile();";
         Item[2] = ""             TAB "";
-        Item[3] = "&Save"        TAB %cmdKey @ "+S"       TAB "VerveEditor::SaveFile();";
-        Item[4] = "Save &As"     TAB %cmdKey @ "-Shift+S" TAB "VerveEditor::SaveFile( true );";
+        Item[3] = "Save"        TAB %cmdKey @ "+S"       TAB "VerveEditor::SaveFile();";
+        Item[4] = "Save As"     TAB %cmdKey @ "-Shift+S" TAB "VerveEditor::SaveFile( true );";
         Item[5] = ""             TAB "";
         Item[6] = "Recent Files" TAB %recentSequenceMenu;
     };
@@ -133,34 +133,38 @@ function VerveEditorWindow::onCreateMenu( %this )
         Class      = "VerveWindowEditMenu";
         SuperClass = "VerveWindowMenu";
         
-        Label    = "&Edit";
+        Label    = "Edit";
         Position = 1;
         
-        Item[0]  = "&Undo"            TAB %cmdKey @ "+Z" TAB "VerveEditor::Undo();";
-        Item[1]  = "&Redo"            TAB %cmdKey @ "+Y" TAB "VerveEditor::Redo();";
+        Item[0]  = "Undo"            TAB %cmdKey @ "+Z" TAB "VerveEditor::Undo();";
+        Item[1]  = "Redo"            TAB %cmdKey @ "+Y" TAB "VerveEditor::Redo();";
         Item[2]  = ""                 TAB "";
-        Item[3]  = "Cu&t"             TAB %cmdKey @ "+X" TAB "VerveEditor::CutSelection();"    TAB VerveEditorEditMap;
-        Item[4]  = "&Copy"            TAB %cmdKey @ "+C" TAB "VerveEditor::CopySelection();"   TAB VerveEditorEditMap;
-        Item[5]  = "&Paste"           TAB %cmdKey @ "+V" TAB "VerveEditor::Paste();"           TAB VerveEditorEditMap;
+        Item[3]  = "Cut"             TAB %cmdKey @ "+X" TAB "VerveEditor::CutSelection();"    TAB VerveEditorEditMap;
+        Item[4]  = "Copy"            TAB %cmdKey @ "+C" TAB "VerveEditor::CopySelection();"   TAB VerveEditorEditMap;
+        Item[5]  = "Paste"           TAB %cmdKey @ "+V" TAB "VerveEditor::Paste();"           TAB VerveEditorEditMap;
         
         Item[6]  = ""                 TAB "";
-        Item[7]  = "&Delete"          TAB "Del"          TAB "VerveEditor::DeleteSelection();" TAB VerveEditorEditMap;
+        Item[7]  = "Delete"          TAB "Del"          TAB "VerveEditor::DeleteSelection();" TAB VerveEditorEditMap;
         
         Item[8]  = ""                 TAB "";
-        Item[9]  = "&Clear Selection" TAB "Esc"          TAB "VerveEditor::ClearSelection();";
+        Item[9]  = "Clear Selection" TAB "Esc"          TAB "VerveEditor::ClearSelection();";
         
         Item[10] = ""                 TAB "";
-        Item[11] = "&Preferences"     TAB %cmdKey @ "+P" TAB "VerveEditor::LaunchEditorPreferences();";
+        Item[11] = "Preferences"     TAB %cmdKey @ "+P" TAB "VerveEditor::LaunchEditorPreferences();";
     };
     %this.MenuSet.add( %editMenu );
     
     // Init Popups.
-    %fileMenu.Init();
-    %editMenu.Init();
+    //%fileMenu.Init();
+    //%editMenu.Init();
     
     // Attach.
-    %fileMenu.attachToMenuBar( %this, %fileMenu.Position, %fileMenu.Label );
-    %editMenu.attachToMenuBar( %this, %editMenu.Position, %editMenu.Label );
+    if($Verve::UseSeparateWindow)
+    {
+       %this.setMenuBar(%this.MenuSet);
+       //%fileMenu.attachToMenuBar( %this, %fileMenu.Position, %fileMenu.Label );
+       //%editMenu.attachToMenuBar( %this, %editMenu.Position, %editMenu.Label );
+    }
 }
 
 function VerveEditorWindow::ClearMenu( %this )

Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorWindow.tscript

@@ -50,8 +50,9 @@ function VerveEditorWindow::Open()
     {
        %editorWindow = new guiWindowCtrl(VerveEditorWindow)
        {
+          Profile = "ToolsGuiWindowProfile";
          position = "0 0";
-         extent = "1024 768";
+         extent = "1024 788";
          minExtent = "8 2";
          horizSizing = "right";
          vertSizing = "bottom";
@@ -62,20 +63,23 @@ function VerveEditorWindow::Open()
 
 function VerveEditorWindow::UpdateWindowTitle( %this )
 {
-    %fileName = fileName( $VerveEditor::Controller.FileName );
-    if ( %fileName $= "" )
-    {
-        %fileName = "Untitled.vsf";
-    }
-    
-    if ( VerveEditor::IsDirty() )
-    {
-        // Signify Unsaved Work.
-        %fileName = %fileName @ "*";
-    }
+   %fileName = fileName( $VerveEditor::Controller.FileName );
+   if ( %fileName $= "" )
+   {
+      %fileName = "Untitled.vsf";
+   }
+
+   if ( VerveEditor::IsDirty() )
+   {
+      // Signify Unsaved Work.
+      %fileName = %fileName @ "*";
+   }
     
-    // Set Title.
-    %this.setWindowTitle( %fileName SPC "- Verve"  );
+   // Set Title.
+   if($Verve::UseSeparateWindow)
+      %this.setWindowTitle( %fileName SPC "- Verve"  );
+   else
+      %this.text = %fileName SPC "- Verve";
 }
 
 function VerveEditorWindow::onGainFocus( %this )

Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VGroup.tscript

@@ -188,13 +188,13 @@ function VGroup::DisplayContextMenu( %this, %x, %y )
             
             Item[1] = "" TAB "";
              
-            Item[2] = "Cu&t"     TAB "" TAB "VerveEditor::CutSelection();";
-            Item[3] = "&Copy"    TAB "" TAB "VerveEditor::CopySelection();";
-            Item[4] = "&Paste"   TAB "" TAB "VerveEditor::Paste();";
+            Item[2] = "Cut"     TAB "" TAB "VerveEditor::CutSelection();";
+            Item[3] = "Copy"    TAB "" TAB "VerveEditor::CopySelection();";
+            Item[4] = "Paste"   TAB "" TAB "VerveEditor::Paste();";
             
             Item[5] = "" TAB "";
             
-            Item[6] = "&Delete"  TAB "" TAB "VerveEditor::DeleteSelection();";
+            Item[6] = "Delete"  TAB "" TAB "VerveEditor::DeleteSelection();";
             
             AddIndex   = 0;
             PasteIndex = 4;
@@ -283,7 +283,7 @@ function VerveEditor::CreateGroupControl( %object )
         Class       = "VEditorSelectableGroup";
         Profile     = "VEditorGroupHeaderProfile";
         
-        Bitmap      = "~/VerveEditor/GUI/Images/GroupBackground";
+        bitmapAsset      = "ToolsModule:GroupBackground_image";
         
         HorizSizing = "width";
         VertSizing  = "bottom";
@@ -322,7 +322,7 @@ function VerveEditor::CreateGroupControl( %object )
         Class       = "VEditorSelectableGroup";
         Profile     = "VEditorGroupTrackProfile";
         
-        Bitmap      = "~/VerveEditor/GUI/Images/GroupBackground";
+        bitmapAsset      = "ToolsModule:GroupBackground_image";
         
         HorizSizing = "width";
         VertSizing  = "bottom";

Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Controls.tscript

@@ -33,7 +33,7 @@ function VerveEditorPropertyStack::CreatePropertyRollout( %this, %groupLabel )
     %propertyStack = new GuiStackControl()
     {
         Class       = "VEditorPropertyStack";
-        Profile     = "GuiTransparentProfile";
+        Profile     = "ToolsGuiTransparentProfile";
         
         HorizSizing = "width";
         VertSizing  = "bottom";
@@ -123,7 +123,7 @@ function VerveEditor::CreateField( %targetStack, %fieldName, %fieldType )
     if ( isMethod( "VerveEditor", "Create" @ %fieldType @ "Field" ) )
     {
         // Create the Input Control.
-        %fieldInput = eval( "return VerveEditor::Create" @ %fieldType @ "Field( %fieldContainer, %fieldName );" );
+        %fieldInput = eval( "return VerveEditor::Create" @ %fieldType @ "Field(" @ %fieldContainer @ "," @ %fieldName @ ");" );
     }
     else
     {

Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeData.tscript

@@ -56,7 +56,7 @@ function VerveEditor::CreateDataField( %fieldContainer, %fieldName )
         Position     = %fieldWidth - 24 SPC 0;
         Extent       = "18 18";
         
-        Bitmap       = "tools/VerveEditor/GUI/Images/btn_DeleteSml";
+        bitmapAsset       = "ToolsModule:btn_DeleteSml_image";
         
         Command      = %fieldInput @ ".Remove();";
     };
@@ -274,7 +274,7 @@ function VerveEditor::CreateAddDataField( %targetStack )
         Position     = %fieldWidth - 24 SPC 0;
         Extent       = "18 18";
         
-        Bitmap       = "tools/VerveEditor/GUI/Images/btn_AddSml";
+        bitmapAsset       = "ToolsModule:btn_AddSml_image";
         
         Command      = "VEditorDataPropertyField::Insert(" @ %fieldType @ ".getText(), " @ %fieldName @ ".getText(), " @ %fieldValue @ ".getText() );";
     };

Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Selection.tscript

@@ -114,7 +114,8 @@ function VEditorSelectable::OnRightMouseUp( %this, %position, %modifiers, %click
     VerveEditor::SetSelection( %this );
     
     // Repaint.
-    VerveEditorWindow.Repaint();
+    if($Verve::UseSeparateWindow)
+      VerveEditorWindow.Repaint();
     
     if ( %this.Proxy.isMethod( "DisplayContextMenu" ) )
     {

Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VMotionTrack.tscript

@@ -105,21 +105,21 @@ function VMotionTrack::GetContextMenu( %this )
             Label    = "VTrackContextMenu";
             Position = 0;
             
-            Item[0] = "&Add Event" TAB "" TAB "VEditorSelectableTrack::AddEvent();";
+            Item[0] = "Add Event" TAB "" TAB "VEditorSelectableTrack::AddEvent();";
             
             Item[1] = "" TAB "";
             
-            Item[2] = "&Import Path Nodes" TAB "" TAB "VMotionTrack::ImportPathNodes();";
+            Item[2] = "Import Path Nodes" TAB "" TAB "VMotionTrack::ImportPathNodes();";
             
             Item[3] = "" TAB "";
              
-            Item[4] = "Cu&t"    TAB "" TAB "VerveEditor::CutSelection();";
-            Item[5] = "&Copy"   TAB "" TAB "VerveEditor::CopySelection();";
-            Item[6] = "&Paste"  TAB "" TAB "VEditorSelectableTrack::PasteEvent();";
+            Item[4] = "Cut"    TAB "" TAB "VerveEditor::CutSelection();";
+            Item[5] = "Copy"   TAB "" TAB "VerveEditor::CopySelection();";
+            Item[6] = "Paste"  TAB "" TAB "VEditorSelectableTrack::PasteEvent();";
             
             Item[7] = "" TAB "";
             
-            Item[8] = "&Delete" TAB "" TAB "VerveEditor::DeleteSelection();";
+            Item[8] = "Delete" TAB "" TAB "VerveEditor::DeleteSelection();";
             
             AddIndex   = 0;
             PasteIndex = 4;

Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VTrack.tscript

@@ -175,17 +175,17 @@ function VTrack::GetContextMenu( %this )
             Label    = "VTrackContextMenu";
             Position = 0;
             
-            Item[0] = "&Add Event" TAB "" TAB "VEditorSelectableTrack::AddEvent();";
+            Item[0] = "Add Event" TAB "" TAB "VEditorSelectableTrack::AddEvent();";
             
             Item[1] = "" TAB "";
              
-            Item[2] = "Cu&t"    TAB "" TAB "VerveEditor::CutSelection();";
-            Item[3] = "&Copy"   TAB "" TAB "VerveEditor::CopySelection();";
-            Item[4] = "&Paste"  TAB "" TAB "VEditorSelectableTrack::PasteEvent();";
+            Item[2] = "Cut"    TAB "" TAB "VerveEditor::CutSelection();";
+            Item[3] = "Copy"   TAB "" TAB "VerveEditor::CopySelection();";
+            Item[4] = "Paste"  TAB "" TAB "VEditorSelectableTrack::PasteEvent();";
             
             Item[5] = "" TAB "";
             
-            Item[6] = "&Delete" TAB "" TAB "VerveEditor::DeleteSelection();";
+            Item[6] = "Delete" TAB "" TAB "VerveEditor::DeleteSelection();";
             
             AddIndex   = 0;
             PasteIndex = 4;

Templates/BaseGame/game/tools/VerveEditor/main.tscript

@@ -5,7 +5,7 @@
 
 function InitializeVerveEditor()
 {
-   $Verve::UseSeparateWindow = true;
+   $Verve::UseSeparateWindow = ($pref::Video::deviceMode == 0); //can't do separate window atm if you're in fullscreen or borderless full
    
     // Preferences.
     exec( "./DefaultPrefs." @ $TorqueScriptFileExtension );
@@ -59,7 +59,7 @@ function DestroyVerveEditor()
 
 function ToggleVerveEditor( %value )
 {
-    if ( %value && $Verve::UseSeparateWindow )
+    if ( %value)
     {
         if ( !isObject( VerveEditorWindow ) )
         {
@@ -97,7 +97,6 @@ function VerveEditor::LaunchEditor()
     VerveEditor::ClearHistory();
     
     // Update Window Title.
-    if($Verve::UseSeparateWindow)
       VerveEditorWindow.UpdateWindowTitle();
     
     // Update Selection.

Templates/BaseGame/game/tools/assetBrowser/assetImportConfigs.xml

@@ -1,451 +1,239 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="UTF-8" standalone ="yes"?>
 <AssetImportSettings>
-    <Group
-        name="DefaultImportConfig">
-        <Group
-            name="Animations">
-            <Setting
-                name="animFPS">2</Setting>
-            <Setting
-                name="animTiming">Seconds</Setting>
-            <Setting
-                name="ImportAnimations">1</Setting>
-            <Setting
-                name="SeparateAnimations">1</Setting>
-        </Group>
-        <Group
-            name="Collision">
-            <Setting
-                name="CollisionMeshPrefix">Col</Setting>
-            <Setting
-                name="GenCollisionType">CollisionMesh</Setting>
-            <Setting
-                name="GenerateCollisions">1</Setting>
-            <Setting
-                name="GenerateLOSCollisions">1</Setting>
-            <Setting
-                name="GenLOSCollisionType">CollisionMesh</Setting>
-            <Setting
-                name="LOSCollisionMeshPrefix">LOS</Setting>
-        </Group>
-        <Group
-            name="General">
-            <Setting
-                name="AutomaticallyPromptMissingFiles">0</Setting>
-            <Setting
-                name="DuplicatAutoResolution">AutoPrune</Setting>
-            <Setting
-                name="PreventImportWithErrors">1</Setting>
-            <Setting
-                name="WarningsAsErrors">0</Setting>
-            <Setting
-                name="AddDirectoryPrefixToAssetName">0</Setting>
-        </Group>
-        <Group
-            name="Images">
-            <Setting
-                name="AddedImageSuffix">_image</Setting>
-            <Setting
-                name="AlwaysAddImageSuffix">1</Setting>
-            <Setting
-                name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting>
-            <Setting
-                name="CompositeTypeSuffixes">_COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM</Setting>
-            <Setting
-                name="Compressed">1</Setting>
-            <Setting
-                name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting>
-            <Setting
-                name="GenerateMaterialOnImport">0</Setting>
-            <Setting
-                name="ImageType">N/A</Setting>
-            <Setting
-                name="ImportImages">1</Setting>
-            <Setting
-                name="IsHDR">0</Setting>
-            <Setting
-                name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting>
-            <Setting
-                name="NormalTypeSuffixes">_NORMAL,_NORM</Setting>
-            <Setting
-                name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting>
-            <Setting
-                name="Scaling">1.0</Setting>
-            <Setting
-                name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting>
-            <Setting
-                name="TextureFilteringMode">Bilinear</Setting>
-            <Setting
-                name="UseMips">1</Setting>
-        </Group>
-        <Group
-            name="Materials">
-            <Setting
-                name="AddedMaterialSuffix">_mat</Setting>
-            <Setting
-                name="AlwaysAddMaterialSuffix">0</Setting>
-            <Setting
-                name="CreateComposites">1</Setting>
-            <Setting
-                name="ImportMaterials">1</Setting>
-            <Setting
-                name="PopulateMaterialMaps">1</Setting>
-            <Setting
-                name="UseDiffuseSuffixOnOriginImage">1</Setting>
-            <Setting
-                name="UseExistingMaterials">1</Setting>
-        </Group>
-        <Group
-            name="Meshes">
-            <Setting
-                name="AddedShapeSuffix">_shape</Setting>
-            <Setting
-                name="AdjustCenter">0</Setting>
-            <Setting
-                name="AdjustFloor">0</Setting>
-            <Setting
-                name="AlwaysAddShapeSuffix">0</Setting>
-            <Setting
-                name="calcTangentSpace">0</Setting>
-            <Setting
-                name="CollapseSubmeshes">0</Setting>
-            <Setting
-                name="convertLeftHanded">0</Setting>
-            <Setting
-                name="DoScaleOverride">0</Setting>
-            <Setting
-                name="DoUpAxisOverride">0</Setting>
-            <Setting
-                name="findInstances">0</Setting>
-            <Setting
-                name="flipUVCoords">0</Setting>
-            <Setting
-                name="genUVCoords">0</Setting>
-            <Setting
-                name="IgnoreNodeScale">0</Setting>
-            <Setting
-                name="ImportMesh">1</Setting>
-            <Setting
-                name="invertNormals">0</Setting>
-            <Setting
-                name="JoinIdenticalVerts">0</Setting>
-            <Setting
-                name="limitBoneWeights">0</Setting>
-            <Setting
-                name="LODType">TrailingNumber</Setting>
-            <Setting
-                name="removeRedundantMats">0</Setting>
-            <Setting
-                name="reverseWindingOrder">0</Setting>
-            <Setting
-                name="ScaleOverride">1</Setting>
-            <Setting
-                name="TransformUVs">0</Setting>
-            <Setting
-                name="UpAxisOverride">Z_AXIS</Setting>
-        </Group>
-        <Group
-            name="Sounds">
-            <Setting
-                name="Compressed">0</Setting>
-            <Setting
-                name="PitchAdjust">1.0</Setting>
-            <Setting
-                name="VolumeAdjust">1.0</Setting>
+    <Group name="DefaultImportConfig">
+        <Group name="Animations">
+            <Setting name="animFPS">2</Setting>
+            <Setting name="animTiming">Seconds</Setting>
+            <Setting name="ImportAnimations">1</Setting>
+            <Setting name="SeparateAnimations">1</Setting>
+        </Group>
+        <Group name="Collision">
+            <Setting name="CollisionMeshPrefix">Col</Setting>
+            <Setting name="GenCollisionType">CollisionMesh</Setting>
+            <Setting name="GenerateCollisions">1</Setting>
+            <Setting name="GenerateLOSCollisions">1</Setting>
+            <Setting name="GenLOSCollisionType">CollisionMesh</Setting>
+            <Setting name="LOSCollisionMeshPrefix">LOS</Setting>
+        </Group>
+        <Group name="General">
+            <Setting name="AddDirectoryPrefixToAssetName">0</Setting>
+            <Setting name="AutomaticallyPromptMissingFiles">0</Setting>
+            <Setting name="DuplicatAutoResolution">AutoPrune</Setting>
+            <Setting name="PreventImportWithErrors">1</Setting>
+            <Setting name="WarningsAsErrors">0</Setting>
+        </Group>
+        <Group name="Images">
+            <Setting name="AddedImageSuffix">_image</Setting>
+            <Setting name="AlwaysAddImageSuffix">1</Setting>
+            <Setting name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting>
+            <Setting name="CompositeTypeSuffixes">_COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM</Setting>
+            <Setting name="Compressed">1</Setting>
+            <Setting name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting>
+            <Setting name="GenerateMaterialOnImport">0</Setting>
+            <Setting name="ImageType">N/A</Setting>
+            <Setting name="ImportImages">1</Setting>
+            <Setting name="IsHDR">0</Setting>
+            <Setting name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting>
+            <Setting name="NormalTypeSuffixes">_NORMAL,_NORM</Setting>
+            <Setting name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting>
+            <Setting name="Scaling">1.0</Setting>
+            <Setting name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting>
+            <Setting name="TextureFilteringMode">Bilinear</Setting>
+            <Setting name="UseMips">1</Setting>
+        </Group>
+        <Group name="Materials">
+            <Setting name="AddedMaterialSuffix">_mat</Setting>
+            <Setting name="AlwaysAddMaterialSuffix">0</Setting>
+            <Setting name="CreateComposites">1</Setting>
+            <Setting name="ImportMaterials">1</Setting>
+            <Setting name="PopulateMaterialMaps">1</Setting>
+            <Setting name="UseDiffuseSuffixOnOriginImage">1</Setting>
+            <Setting name="UseExistingMaterials">1</Setting>
+        </Group>
+        <Group name="Meshes">
+            <Setting name="AddedShapeSuffix">_shape</Setting>
+            <Setting name="AdjustCenter">0</Setting>
+            <Setting name="AdjustFloor">0</Setting>
+            <Setting name="AlwaysAddShapeSuffix">0</Setting>
+            <Setting name="calcTangentSpace">0</Setting>
+            <Setting name="CollapseSubmeshes">0</Setting>
+            <Setting name="convertLeftHanded">0</Setting>
+            <Setting name="DoScaleOverride">0</Setting>
+            <Setting name="DoUpAxisOverride">0</Setting>
+            <Setting name="findInstances">0</Setting>
+            <Setting name="flipUVCoords">0</Setting>
+            <Setting name="genUVCoords">0</Setting>
+            <Setting name="IgnoreNodeScale">0</Setting>
+            <Setting name="ImportMesh">1</Setting>
+            <Setting name="invertNormals">0</Setting>
+            <Setting name="JoinIdenticalVerts">0</Setting>
+            <Setting name="limitBoneWeights">0</Setting>
+            <Setting name="LODType">TrailingNumber</Setting>
+            <Setting name="removeRedundantMats">0</Setting>
+            <Setting name="reverseWindingOrder">0</Setting>
+            <Setting name="ScaleOverride">1</Setting>
+            <Setting name="TransformUVs">0</Setting>
+            <Setting name="UpAxisOverride">Z_AXIS</Setting>
+        </Group>
+        <Group name="Sounds">
+            <Setting name="Compressed">0</Setting>
+            <Setting name="PitchAdjust">1.0</Setting>
+            <Setting name="VolumeAdjust">1.0</Setting>
         </Group>
     </Group>
-    <Group
-        name="LegacyProjectImport">
-        <Group
-            name="Animations">
-            <Setting
-                name="animFPS">2</Setting>
-            <Setting
-                name="animTiming">Seconds</Setting>
-            <Setting
-                name="ImportAnimations">1</Setting>
-            <Setting
-                name="SeparateAnimations">1</Setting>
-        </Group>
-        <Group
-            name="Collision">
-            <Setting
-                name="CollisionMeshPrefix">Col</Setting>
-            <Setting
-                name="GenCollisionType">CollisionMesh</Setting>
-            <Setting
-                name="GenerateCollisions">1</Setting>
-            <Setting
-                name="GenerateLOSCollisions">1</Setting>
-            <Setting
-                name="GenLOSCollisionType">CollisionMesh</Setting>
-            <Setting
-                name="LOSCollisionMeshPrefix">LOS</Setting>
-        </Group>
-        <Group
-            name="General">
-            <Setting
-                name="AutomaticallyPromptMissingFiles">0</Setting>
-            <Setting
-                name="DuplicateAutoResolution">FolderPrefix</Setting>
-            <Setting
-                name="PreventImportWithErrors">1</Setting>
-            <Setting
-                name="WarningsAsErrors">0</Setting>
-            <Setting
-                name="AddDirectoryPrefixToAssetName">1</Setting>
-        </Group>
-        <Group
-            name="Images">
-            <Setting
-                name="AddedImageSuffix">_image</Setting>
-            <Setting
-                name="AlwaysAddImageSuffix">1</Setting>
-            <Setting
-                name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting>
-            <Setting
-                name="CompositeTypeSuffixes">_COMP,_COMPOSITE</Setting>
-            <Setting
-                name="Compressed">1</Setting>
-            <Setting
-                name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting>
-            <Setting
-                name="GenerateMaterialOnImport">0</Setting>
-            <Setting
-                name="ImageType">N/A</Setting>
-            <Setting
-                name="ImportImages">1</Setting>
-            <Setting
-                name="IsHDR">0</Setting>
-            <Setting
-                name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting>
-            <Setting
-                name="NormalTypeSuffixes">_NORMAL,_NORM</Setting>
-            <Setting
-                name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting>
-            <Setting
-                name="Scaling">1.0</Setting>
-            <Setting
-                name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting>
-            <Setting
-                name="TextureFilteringMode">Bilinear</Setting>
-            <Setting
-                name="UseMips">1</Setting>
-        </Group>
-        <Group
-            name="Materials">
-            <Setting
-                name="AddedMaterialSuffix">_mat</Setting>
-            <Setting
-                name="AlwaysAddMaterialSuffix">1</Setting>
-            <Setting
-                name="CreateComposites">1</Setting>
-            <Setting
-                name="ImportMaterials">1</Setting>
-            <Setting
-                name="PopulateMaterialMaps">1</Setting>
-            <Setting
-                name="UseDiffuseSuffixOnOriginImage">1</Setting>
-            <Setting
-                name="UseExistingMaterials">1</Setting>
-        </Group>
-        <Group
-            name="Meshes">
-            <Setting
-                name="AddedShapeSuffix">_shape</Setting>
-            <Setting
-                name="AdjustCenter">0</Setting>
-            <Setting
-                name="AdjustFloor">0</Setting>
-            <Setting
-                name="AlwaysAddShapeSuffix">0</Setting>
-            <Setting
-                name="calcTangentSpace">0</Setting>
-            <Setting
-                name="CollapseSubmeshes">0</Setting>
-            <Setting
-                name="convertLeftHanded">0</Setting>
-            <Setting
-                name="DoScaleOverride">0</Setting>
-            <Setting
-                name="DoUpAxisOverride">0</Setting>
-            <Setting
-                name="findInstances">0</Setting>
-            <Setting
-                name="flipUVCoords">0</Setting>
-            <Setting
-                name="genUVCoords">0</Setting>
-            <Setting
-                name="IgnoreNodeScale">0</Setting>
-            <Setting
-                name="ImportMesh">1</Setting>
-            <Setting
-                name="invertNormals">0</Setting>
-            <Setting
-                name="JoinIdenticalVerts">0</Setting>
-            <Setting
-                name="limitBoneWeights">0</Setting>
-            <Setting
-                name="LODType">TrailingNumber</Setting>
-            <Setting
-                name="removeRedundantMats">0</Setting>
-            <Setting
-                name="reverseWindingOrder">0</Setting>
-            <Setting
-                name="ScaleOverride">1</Setting>
-            <Setting
-                name="TransformUVs">0</Setting>
-            <Setting
-                name="UpAxisOverride">Z_AXIS</Setting>
-        </Group>
-        <Group
-            name="Sounds">
-            <Setting
-                name="Compressed">0</Setting>
-            <Setting
-                name="PitchAdjust">1.0</Setting>
-            <Setting
-                name="VolumeAdjust">1.0</Setting>
+    <Group name="LegacyProjectImport">
+        <Group name="Animations">
+            <Setting name="animFPS">2</Setting>
+            <Setting name="animTiming">Seconds</Setting>
+            <Setting name="ImportAnimations">1</Setting>
+            <Setting name="SeparateAnimations">1</Setting>
+        </Group>
+        <Group name="Collision">
+            <Setting name="CollisionMeshPrefix">Col</Setting>
+            <Setting name="GenCollisionType">CollisionMesh</Setting>
+            <Setting name="GenerateCollisions">1</Setting>
+            <Setting name="GenerateLOSCollisions">1</Setting>
+            <Setting name="GenLOSCollisionType">CollisionMesh</Setting>
+            <Setting name="LOSCollisionMeshPrefix">LOS</Setting>
+        </Group>
+        <Group name="General">
+            <Setting name="AddDirectoryPrefixToAssetName">1</Setting>
+            <Setting name="AutomaticallyPromptMissingFiles">0</Setting>
+            <Setting name="DuplicateAutoResolution">FolderPrefix</Setting>
+            <Setting name="PreventImportWithErrors">1</Setting>
+            <Setting name="WarningsAsErrors">0</Setting>
+        </Group>
+        <Group name="Images">
+            <Setting name="AddedImageSuffix">_image</Setting>
+            <Setting name="AlwaysAddImageSuffix">1</Setting>
+            <Setting name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting>
+            <Setting name="CompositeTypeSuffixes">_COMP,_COMPOSITE</Setting>
+            <Setting name="Compressed">1</Setting>
+            <Setting name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting>
+            <Setting name="GenerateMaterialOnImport">0</Setting>
+            <Setting name="ImageType">N/A</Setting>
+            <Setting name="ImportImages">1</Setting>
+            <Setting name="IsHDR">0</Setting>
+            <Setting name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting>
+            <Setting name="NormalTypeSuffixes">_NORMAL,_NORM</Setting>
+            <Setting name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting>
+            <Setting name="Scaling">1.0</Setting>
+            <Setting name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting>
+            <Setting name="TextureFilteringMode">Bilinear</Setting>
+            <Setting name="UseMips">1</Setting>
+        </Group>
+        <Group name="Materials">
+            <Setting name="AddedMaterialSuffix">_mat</Setting>
+            <Setting name="AlwaysAddMaterialSuffix">1</Setting>
+            <Setting name="CreateComposites">1</Setting>
+            <Setting name="ImportMaterials">1</Setting>
+            <Setting name="PopulateMaterialMaps">1</Setting>
+            <Setting name="UseDiffuseSuffixOnOriginImage">1</Setting>
+            <Setting name="UseExistingMaterials">1</Setting>
+        </Group>
+        <Group name="Meshes">
+            <Setting name="AddedShapeSuffix">_shape</Setting>
+            <Setting name="AdjustCenter">0</Setting>
+            <Setting name="AdjustFloor">0</Setting>
+            <Setting name="AlwaysAddShapeSuffix">0</Setting>
+            <Setting name="calcTangentSpace">0</Setting>
+            <Setting name="CollapseSubmeshes">0</Setting>
+            <Setting name="convertLeftHanded">0</Setting>
+            <Setting name="DoScaleOverride">0</Setting>
+            <Setting name="DoUpAxisOverride">0</Setting>
+            <Setting name="findInstances">0</Setting>
+            <Setting name="flipUVCoords">0</Setting>
+            <Setting name="genUVCoords">0</Setting>
+            <Setting name="IgnoreNodeScale">0</Setting>
+            <Setting name="ImportMesh">1</Setting>
+            <Setting name="invertNormals">0</Setting>
+            <Setting name="JoinIdenticalVerts">0</Setting>
+            <Setting name="limitBoneWeights">0</Setting>
+            <Setting name="LODType">TrailingNumber</Setting>
+            <Setting name="removeRedundantMats">0</Setting>
+            <Setting name="reverseWindingOrder">0</Setting>
+            <Setting name="ScaleOverride">1</Setting>
+            <Setting name="TransformUVs">0</Setting>
+            <Setting name="UpAxisOverride">Z_AXIS</Setting>
+        </Group>
+        <Group name="Sounds">
+            <Setting name="Compressed">0</Setting>
+            <Setting name="PitchAdjust">1.0</Setting>
+            <Setting name="VolumeAdjust">1.0</Setting>
         </Group>
     </Group>
-    <Group
-        name="NewTest">
-        <Group
-            name="Animations">
-            <Setting
-                name="animFPS">2</Setting>
-            <Setting
-                name="animTiming">Seconds</Setting>
-            <Setting
-                name="ImportAnimations">1</Setting>
-            <Setting
-                name="SeparateAnimations">1</Setting>
-        </Group>
-        <Group
-            name="Collision">
-            <Setting
-                name="CollisionMeshPrefix">Col</Setting>
-            <Setting
-                name="GenCollisionType">CollisionMesh</Setting>
-            <Setting
-                name="GenerateCollisions">1</Setting>
-            <Setting
-                name="GenerateLOSCollisions">1</Setting>
-            <Setting
-                name="GenLOSCollisionType">CollisionMesh</Setting>
-            <Setting
-                name="LOSCollisionMeshPrefix">LOS</Setting>
-        </Group>
-        <Group
-            name="General">
-            <Setting
-                name="AutomaticallyPromptMissingFiles">0</Setting>
-            <Setting
-                name="DuplicatAutoResolution">AutoPrune</Setting>
-            <Setting
-                name="PreventImportWithErrors">1</Setting>
-            <Setting
-                name="WarningsAsErrors">0</Setting>
-            <Setting
-                name="AddDirectoryPrefixToAssetName">0</Setting>
-        </Group>
-        <Group
-            name="Images">
-            <Setting
-                name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting>
-            <Setting
-                name="Compressed">1</Setting>
-            <Setting
-                name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting>
-            <Setting
-                name="GenerateMaterialOnImport">1</Setting>
-            <Setting
-                name="ImageType">N/A</Setting>
-            <Setting
-                name="IsHDR">0</Setting>
-            <Setting
-                name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting>
-            <Setting
-                name="NormalTypeSuffixes">_NORMAL,_NORM</Setting>
-            <Setting
-                name="PBRTypeSuffixes">_COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM</Setting>
-            <Setting
-                name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting>
-            <Setting
-                name="Scaling">1.0</Setting>
-            <Setting
-                name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting>
-            <Setting
-                name="TextureFilteringMode">Bilinear</Setting>
-            <Setting
-                name="UseMips">1</Setting>
-        </Group>
-        <Group
-            name="Materials">
-            <Setting
-                name="CreateComposites">1</Setting>
-            <Setting
-                name="ImportMaterials">1</Setting>
-            <Setting
-                name="PopulateMaterialMaps">1</Setting>
-            <Setting
-                name="UseDiffuseSuffixOnOriginImage">1</Setting>
-            <Setting
-                name="UseExistingMaterials">1</Setting>
-        </Group>
-        <Group
-            name="Meshes">
-            <Setting
-                name="AdjustCenter">0</Setting>
-            <Setting
-                name="AdjustFloor">0</Setting>
-            <Setting
-                name="calcTangentSpace">0</Setting>
-            <Setting
-                name="CollapseSubmeshes">0</Setting>
-            <Setting
-                name="convertLeftHanded">0</Setting>
-            <Setting
-                name="DoScaleOverride">0</Setting>
-            <Setting
-                name="DoUpAxisOverride">0</Setting>
-            <Setting
-                name="findInstances">0</Setting>
-            <Setting
-                name="flipUVCoords">0</Setting>
-            <Setting
-                name="genUVCoords">0</Setting>
-            <Setting
-                name="IgnoreNodeScale">0</Setting>
-            <Setting
-                name="ImportMesh">1</Setting>
-            <Setting
-                name="invertNormals">0</Setting>
-            <Setting
-                name="JoinIdenticalVerts">0</Setting>
-            <Setting
-                name="limitBoneWeights">0</Setting>
-            <Setting
-                name="LODType">TrailingNumber</Setting>
-            <Setting
-                name="removeRedundantMats">0</Setting>
-            <Setting
-                name="reverseWindingOrder">0</Setting>
-            <Setting
-                name="ScaleOverride">1</Setting>
-            <Setting
-                name="TransformUVs">0</Setting>
-            <Setting
-                name="UpAxisOverride">Z_AXIS</Setting>
-        </Group>
-        <Group
-            name="Sounds">
-            <Setting
-                name="Compressed">0</Setting>
-            <Setting
-                name="PitchAdjust">1.0</Setting>
-            <Setting
-                name="VolumeAdjust">1.0</Setting>
+    <Group name="NewTest">
+        <Group name="Animations">
+            <Setting name="animFPS">2</Setting>
+            <Setting name="animTiming">Seconds</Setting>
+            <Setting name="ImportAnimations">1</Setting>
+            <Setting name="SeparateAnimations">1</Setting>
+        </Group>
+        <Group name="Collision">
+            <Setting name="CollisionMeshPrefix">Col</Setting>
+            <Setting name="GenCollisionType">CollisionMesh</Setting>
+            <Setting name="GenerateCollisions">1</Setting>
+            <Setting name="GenerateLOSCollisions">1</Setting>
+            <Setting name="GenLOSCollisionType">CollisionMesh</Setting>
+            <Setting name="LOSCollisionMeshPrefix">LOS</Setting>
+        </Group>
+        <Group name="General">
+            <Setting name="AddDirectoryPrefixToAssetName">0</Setting>
+            <Setting name="AutomaticallyPromptMissingFiles">0</Setting>
+            <Setting name="DuplicatAutoResolution">AutoPrune</Setting>
+            <Setting name="PreventImportWithErrors">1</Setting>
+            <Setting name="WarningsAsErrors">0</Setting>
+        </Group>
+        <Group name="Images">
+            <Setting name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting>
+            <Setting name="Compressed">1</Setting>
+            <Setting name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting>
+            <Setting name="GenerateMaterialOnImport">1</Setting>
+            <Setting name="ImageType">N/A</Setting>
+            <Setting name="IsHDR">0</Setting>
+            <Setting name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting>
+            <Setting name="NormalTypeSuffixes">_NORMAL,_NORM</Setting>
+            <Setting name="PBRTypeSuffixes">_COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM</Setting>
+            <Setting name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting>
+            <Setting name="Scaling">1.0</Setting>
+            <Setting name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting>
+            <Setting name="TextureFilteringMode">Bilinear</Setting>
+            <Setting name="UseMips">1</Setting>
+        </Group>
+        <Group name="Materials">
+            <Setting name="CreateComposites">1</Setting>
+            <Setting name="ImportMaterials">1</Setting>
+            <Setting name="PopulateMaterialMaps">1</Setting>
+            <Setting name="UseDiffuseSuffixOnOriginImage">1</Setting>
+            <Setting name="UseExistingMaterials">1</Setting>
+        </Group>
+        <Group name="Meshes">
+            <Setting name="AdjustCenter">0</Setting>
+            <Setting name="AdjustFloor">0</Setting>
+            <Setting name="calcTangentSpace">0</Setting>
+            <Setting name="CollapseSubmeshes">0</Setting>
+            <Setting name="convertLeftHanded">0</Setting>
+            <Setting name="DoScaleOverride">0</Setting>
+            <Setting name="DoUpAxisOverride">0</Setting>
+            <Setting name="findInstances">0</Setting>
+            <Setting name="flipUVCoords">0</Setting>
+            <Setting name="genUVCoords">0</Setting>
+            <Setting name="IgnoreNodeScale">0</Setting>
+            <Setting name="ImportMesh">1</Setting>
+            <Setting name="invertNormals">0</Setting>
+            <Setting name="JoinIdenticalVerts">0</Setting>
+            <Setting name="limitBoneWeights">0</Setting>
+            <Setting name="LODType">TrailingNumber</Setting>
+            <Setting name="removeRedundantMats">0</Setting>
+            <Setting name="reverseWindingOrder">0</Setting>
+            <Setting name="ScaleOverride">1</Setting>
+            <Setting name="TransformUVs">0</Setting>
+            <Setting name="UpAxisOverride">Z_AXIS</Setting>
+        </Group>
+        <Group name="Sounds">
+            <Setting name="Compressed">0</Setting>
+            <Setting name="PitchAdjust">1.0</Setting>
+            <Setting name="VolumeAdjust">1.0</Setting>
         </Group>
     </Group>
 </AssetImportSettings>

Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript

@@ -35,6 +35,7 @@ function setupImportConfigSettingsList()
       ImportAssetConfigSettingsList.addNewConfigSetting("General/WarningsAsErrors", "Warnings As Errors", "bool", "", "0", "", "");
       ImportAssetConfigSettingsList.addNewConfigSetting("General/PreventImportWithErrors", "Prevent Import With Errors", "bool", "", "1", "", "");
       ImportAssetConfigSettingsList.addNewConfigSetting("General/AutomaticallyPromptMissingFiles", "Automatically Prompt Missing Files", "bool", "", "0", "", "");
+      ImportAssetConfigSettingsList.addNewConfigSetting("General/AddDirectoryPrefixToAssetName", "Adds the name of the folder to importing asset name", "bool", "", "0", "", "");
    
       ImportAssetConfigSettingsList.addNewConfigSetting("Meshes/ImportMesh", "Import Mesh", "bool", "", "1", "", "ToggleImportMesh");
       ImportAssetConfigSettingsList.addNewConfigSetting("Meshes/AlwaysAddShapeSuffix", "Always Add Shape Suffix", "bool", "", "0", "");
@@ -117,6 +118,8 @@ function setupImportConfigSettingsList()
       ImportAssetConfigSettingsList.addNewConfigSetting("Sounds/VolumeAdjust", "Volume Adjustment", "float", "", "1.0", "");
       ImportAssetConfigSettingsList.addNewConfigSetting("Sounds/PitchAdjust", "Pitch Adjustment", "float", "", "1.0", "");
       ImportAssetConfigSettingsList.addNewConfigSetting("Sounds/Compressed", "Is Compressed", "bool", "", "0", "");
+      ImportAssetConfigSettingsList.addNewConfigSetting("Sounds/AlwaysAddSoundSuffix", "Always Add Sound Suffix", "bool", "", "1", "");
+      ImportAssetConfigSettingsList.addNewConfigSetting("Sounds/AddedSoundSuffix", "Added Sound Suffix", "string", "", "_sound", "");
    }
 }
 
@@ -272,7 +275,7 @@ function ImportAssetConfigEditorWindow::populateConfigList(%this, %configName)
    %this.populateConfigListByGroup("Animations");
    %this.populateConfigListByGroup("Images");
    %this.populateConfigListByGroup("Collision");
-   %this.populateConfigListByGroup("Sound");
+   %this.populateConfigListByGroup("Sounds");
    
    ImportOptionsConfigList.update();
 }
@@ -373,6 +376,8 @@ function ImportAssetConfigEditorWindow::addNewConfig(%this)
    AssetImportSettings.setValue("Sounds/VolumeAdjust", "1.0");
    AssetImportSettings.setValue("Sounds/PitchAdjust", "1.0");
    AssetImportSettings.setValue("Sounds/Compressed", "0");
+   AssetImportSettings.setValue("Sounds/AlwaysAddSoundSuffix", "1");
+   AssetImportSettings.setValue("Sounds/AddedSoundSuffix", "_sound");
    
    AssetImportSettings.endGroup();
    

Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfigEditor.tscript

@@ -38,10 +38,10 @@ function AssetImportConfigList::onSelect( %this, %id, %text )
    %this.populateConfigListByGroup("General");
    %this.populateConfigListByGroup("Meshes");
    %this.populateConfigListByGroup("Materials");
-   %this.populateConfigListByGroup("Animations");
    %this.populateConfigListByGroup("Images");
+   %this.populateConfigListByGroup("Sounds");
+   %this.populateConfigListByGroup("Animations");
    %this.populateConfigListByGroup("Collision");
-   %this.populateConfigListByGroup("Sound");
    
    ImportOptionsConfigList.update();  
 }

Templates/BaseGame/game/tools/gui/images/stencilIcons/larger_image.asset.taml

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

Templates/BaseGame/game/tools/gui/images/stencilIcons/smaller_image.asset.taml

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

Templates/BaseGame/game/tools/gui/profiles.ed.tscript

@@ -163,7 +163,8 @@ new GuiControlProfile (ToolsGuiWindowProfile)
    opaque = false;
    border = 1;
    fillColor = EditorSettings.value("Theme/tabsColor");
-   fillColorHL = EditorSettings.value("Theme/tabsColor");
+   fillColorHL = EditorSettings.value("Theme/tabsHLColor");
+   fillColorSEL = EditorSettings.value("Theme/tabsSELColor");
    fillColorNA = EditorSettings.value("Theme/tabsColor");
    fontColor = EditorSettings.value("Theme/headerTextColor");
    fontColorHL = EditorSettings.value("Theme/headerTextColor");

Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui

@@ -113,7 +113,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
                   HorizSizing = "left";
                   tooltip = "Swap material on the object with existing";
                   bitmapAsset = "ToolsModule:change_material_btn_n_image";
-                  command = "materialSelector.showDialog(\"MaterialEditorGui.showMaterialChangeSaveDialog\");"; 
+                  command = "MaterialEditorGui.swapMaterial();"; 
                };
                
                new GuiTextEditCtrl(){ 

Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript

@@ -465,6 +465,9 @@ function MaterialEditorGui::setActiveMaterial( %this, %material )
    MaterialEditorGui.lastMaterial = %material;
    
    // we create or recreate a material to hold in a pristine state
+   if(isObject(notDirtyMaterial))
+      notDirtyMaterial.delete();
+      
    singleton Material(notDirtyMaterial)
    {
       mapTo = "matEd_mappedMat";
@@ -1949,8 +1952,8 @@ function MaterialEditorGui::showMaterialChangeSaveDialog( %this, %toMaterial )
    
    toolsMessageBoxYesNoCancel("Save Material?", 
       "The material " @ %fromMaterial.getName() @ " has unsaved changes. <br>Do you want to save before changing the material?", 
-      "MaterialEditorGui.saveDialogSave(" @ %toMaterial @ "); MaterialEditorGui.changeMaterial(" @ %fromMaterial @ ", " @ %toMaterial @ ");", 
-      "MaterialEditorGui.saveDialogDontSave(" @ %toMaterial @ "); MaterialEditorGui.changeMaterial(" @ %fromMaterial @ ", " @ %toMaterial @ ");", 
+      "MaterialEditorGui.saveDialogSave(\"" @ %toMaterial @ "\"); MaterialEditorGui.changeMaterial(" @ %fromMaterial @ ", \"" @ %toMaterial @ "\");", 
+      "MaterialEditorGui.saveDialogDontSave(\"" @ %toMaterial @ "\"); MaterialEditorGui.changeMaterial(" @ %fromMaterial @ ", \"" @ %toMaterial @ "\");", 
       "MaterialEditorGui.saveDialogCancel();" );
 }
 
@@ -1986,11 +1989,21 @@ function MaterialEditorGui::saveDialogDontSave( %this, %material )
    
    MaterialEditorGui.setMaterialNotDirty();
    
+   if(AssetDatabase.isDeclaredAsset(%material))
+   {
+      %material = AssetDatabase.acquireAsset(%material).materialDefinitionName;
+   }
+   
    MaterialEditorGui.setActiveMaterial( %material );
 }
 
 function MaterialEditorGui::saveDialogSave( %this, %material )
 {
+   if(AssetDatabase.isDeclaredAsset(%material))
+   {
+      %material = AssetDatabase.acquireAsset(%material).materialDefinitionName;
+   }
+      
    MaterialEditorGui.save();
    MaterialEditorGui.setActiveMaterial( %material );
 }
@@ -2277,16 +2290,34 @@ function MaterialEditorGui::changeMaterial(%this, %fromMaterial, %toMaterial)
    %materialTarget = SubMaterialSelector.text;
    %action.materialTarget = %materialTarget;   
    
+   %toMaterialDefinition = %toMaterial;
+   
+   %isMatAsset = false;
+   if(AssetDatabase.isDeclaredAsset(%toMaterial))
+   {
+      %isMatAsset = true;
+      %assetDef = AssetDatabase.acquireAsset(%toMaterial);
+      %toMaterialDefinition = %assetDef.materialDefinitionName;
+      %filename = %assetDef.getScriptPath();
+   }
+   
    %action.fromMaterial = %fromMaterial;    
    %action.toMaterial = %toMaterial;   
-   %action.toMaterialOldFname = %toMaterial.getFilename();
+   %action.toMaterialOldFname = %toMaterialDefinition.getFilename();
    %action.object =  MaterialEditorGui.currentObject;
 
    if( MaterialEditorGui.currentMeshMode $= "Model" ) // Models
    {
       %action.mode = "model";      
       
-      MaterialEditorGui.currentObject.changeMaterial( %materialTarget, %fromMaterial.getName(), %toMaterial.getName() );
+      if(!%isMatAsset)
+      {
+         MaterialEditorGui.currentObject.changeMaterial( %materialTarget, %fromMaterial.getName(), %toMaterialDefinition.getName() );
+      }
+      else
+      {
+         eval("MaterialEditorGui.currentObject." @ %materialTarget @ " = " @ %toMaterial);
+      }
       
       if( MaterialEditorGui.currentObject.shapeName !$= "" ) 
          %sourcePath = MaterialEditorGui.currentObject.shapeName;
@@ -2296,6 +2327,8 @@ function MaterialEditorGui::changeMaterial(%this, %fromMaterial, %toMaterial)
             %sourcePath = MaterialEditorGui.currentObject.getDatablock().shapeFile;
       }
       
+      if(!%isMatAsset)
+      {
       // Creating "to" path
       %k = 0;
       while( strpos( %sourcePath, "/", %k ) != -1 )
@@ -2308,28 +2341,33 @@ function MaterialEditorGui::changeMaterial(%this, %fromMaterial, %toMaterial)
       
       %action.toMaterialNewFname = %fileName;
       
-      MaterialEditorGui.prepareActiveMaterial( %toMaterial, true );
-      if( !MaterialEditorGui.isMatEditorMaterial( %toMaterial ) )
+         MaterialEditorGui.prepareActiveMaterial( %toMaterialDefinition, true );
+         if( !MaterialEditorGui.isMatEditorMaterial( %toMaterialDefinition ) )
       {
-         matEd_PersistMan.removeObjectFromFile(%toMaterial);
+            matEd_PersistMan.removeObjectFromFile(%toMaterialDefinition);
+         }
       }
       
       matEd_PersistMan.setDirty(%fromMaterial);
-      matEd_PersistMan.setDirty(%toMaterial, %fileName);
+      matEd_PersistMan.setDirty(%toMaterialDefinition, %fileName);
       matEd_PersistMan.saveDirty();
       
       matEd_PersistMan.removeDirty(%fromMaterial);
-      matEd_PersistMan.removeDirty(%toMaterial);
+      matEd_PersistMan.removeDirty(%toMaterialDefinition);
    }
    else // EditorShapes
    {
       %action.mode = "editorShapes";
 
-      MaterialEditorGui.currentObject.setFieldValue(SubMaterialSelector.getText(), %toMaterial.getName());
+      if(!%isMatAsset)
+         MaterialEditorGui.currentObject.setFieldValue(SubMaterialSelector.getText(), %toMaterialDefinition.getName());
+      else
+         MaterialEditorGui.currentObject.setFieldValue(SubMaterialSelector.getText(), %toMaterial);
+         
       if( MaterialEditorGui.currentObject.isMethod("postApply") )
          MaterialEditorGui.currentObject.postApply();
       
-      MaterialEditorGui.prepareActiveMaterial( %toMaterial, true );
+      MaterialEditorGui.prepareActiveMaterial( %toMaterialDefinition, true );
    }
    
    MaterialEditorGui.submitUndo( %action );
@@ -2458,3 +2496,12 @@ function MaterialEditorGui::saveCompositeMap(%this)
     saveCompositeTexture(%aoMap,%roughMap,%metalMap,"",%channelKey, %saveAs);
     %dlg.delete();
 }
+
+function MaterialEditorGui::swapMaterial(%this)
+{
+   AssetBrowser.showDialog("MaterialAsset", %this @ ".doSwapMaterial", "", "", "");
+}
+function MaterialEditorGui::doSwapMaterial(%this, %materialAsset)
+{
+   MaterialEditorGui.showMaterialChangeSaveDialog(%materialAsset);
+}

Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui

@@ -214,7 +214,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) {
                      groupNum = "-1";
                      buttonType = "PushButton";
                      useMouseEvents = "0";
-                     bitmapAsset = "ToolsModule:new_image";
+                     bitmapAsset = "ToolsModule:new_n_image";
                      tooltip = "Create New Emitter";
                   };
                   new GuiBitmapButtonCtrl() {

Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript

@@ -1883,10 +1883,16 @@ function EditorTree::GetTooltipGroundCover( %this, %obj )
 // Tooltip for SFXEmitter
 function EditorTree::GetTooltipSFXEmitter( %this, %obj )
 {
+   %soundName = %obj.soundAsset;
+   if(%soundName $= "")
+   {
    if(%obj.fileName $= "")
-      return "Track: " @ %obj.track;
+         %soundName = "Track: " @ %obj.track;
    else
-      return "File: " @ %obj.fileName;
+         %soundName = "File: " @ %obj.fileName;
+   }
+
+   return "Sound: " @ %soundName;
 }
 
 // Tooltip for ParticleEmitterNode

Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript

@@ -354,7 +354,7 @@ function EditorGui::buildMenus(%this)
 
       barTitle = "Tools";
          
-      item[0] = "Network Graph" TAB "n" TAB "toggleNetGraph();";
+      item[0] = "Network Graph" TAB "ctrl n" TAB "toggleNetGraph();";
       item[1] = "Profiler" TAB "ctrl F2" TAB "showMetrics(true);";
 	  item[2] = "Torque SimView" TAB "" TAB "tree();";
       item[3] = "Make Selected a Mesh" TAB "" TAB "AssetBrowser.setupCreateNewAsset(\"ShapeAsset\", AssetBrowser.selectedModule, \"makeSelectedAMesh\");";