diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorPalette.gui b/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorPalette.gui index 94f8102dc..051bad2c5 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorPalette.gui +++ b/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorPalette.gui @@ -3,7 +3,7 @@ // Copyright (C) - Violent Tulip //----------------------------------------------------------------------------- -%paletteId = new GuiControl(VPathEditorPalette) { +$paletteId = new GuiControl(VPathEditorPalette) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript index b3bd39d5c..3fd8b8046 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript @@ -59,6 +59,7 @@ function VControllerPropertyList::InspectObject( %this, %object ) } %dataFieldCount = %object.getDataFieldCount(); + %dataFieldList = ""; for ( %i = 0; %i < %dataFieldCount; %i++ ) { // Add To List. diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VDirectorGroup.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VDirectorGroup.tscript index 9360f22d0..c47103b8f 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VDirectorGroup.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VDirectorGroup.tscript @@ -22,7 +22,7 @@ function VDirectorGroup::PopulateBuildStack( %this, %stack ) function VDirectorGroup::ResolveBuildStack( %this, %stack ) { - Parent::ResolveBuildStack( %this, %stack, %groupObject ); + Parent::ResolveBuildStack( %this, %stack ); // Find the Track Toggle. %directorTrackCheckBox = %stack.findObjectByInternalName( "DirectorTrackToggle", true ); diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSceneObjectGroup.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSceneObjectGroup.tscript index 7483ea209..209c329fc 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSceneObjectGroup.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSceneObjectGroup.tscript @@ -62,7 +62,7 @@ function VSceneObjectGroup::PopulateBuildStack( %this, %stack ) function VSceneObjectGroup::ResolveBuildStack( %this, %stack ) { - Parent::ResolveBuildStack( %this, %stack, %groupObject ); + Parent::ResolveBuildStack( %this, %stack ); // Fetch the Controller. %controller = %this.getRoot(); diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSpawnSphereGroup.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSpawnSphereGroup.tscript index cd2913ad9..de8280d60 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSpawnSphereGroup.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSpawnSphereGroup.tscript @@ -31,7 +31,7 @@ function VSceneObjectGroup::PopulateBuildStack( %this, %stack ) function VSceneObjectGroup::ResolveBuildStack( %this, %stack ) { - VGroup::ResolveBuildStack( %this, %stack, %groupObject ); + VGroup::ResolveBuildStack( %this, %stack ); // Fetch the Controller. %controller = %this.getRoot(); diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript index 3831adf2e..8596d4b0f 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript @@ -242,6 +242,8 @@ function AssetBrowser::selectAsset( %this, %asset ) //eval("materialEd_previewMaterial." @ %propertyField @ " = " @ %value @ ";"); if( AssetBrowser.returnType $= "name" ) { + // TODO! + %name = ""; eval( "" @ AssetBrowser.selectCallback @ "(" @ %name @ ");"); } else @@ -663,6 +665,7 @@ function AssetBrowser::loadDirectories( %this ) //Remove any modules that have no assets if we have that filter on if(%this.onlyShowModulesWithAssets) { + %modulesList = ModuleDatabase.findModules(); for(%i=0; %i < getWordCount(%modulesList); %i++) { %moduleName = getWord(%modulesList, %i).ModuleId; @@ -905,6 +908,8 @@ function AssetBrowser::addCreatorClass(%this, %class, %name, %buildfunc) if ( %name $= "" ) %name = %class; + // TODO + %group = ""; if ( %this.currentCreatorGroup !$= "" && %group $= "" ) %group = %this.currentCreatorGroup; @@ -1048,6 +1053,13 @@ function AssetBrowser::toggleTagFilterPopup(%this) //now, add the asset's category %assetType = AssetDatabase.getAssetCategory(%assetId); + // TODO? + %text = ""; + %var = ""; + %cmd = ""; + %textLength = strlen(%text); + // end todo + %checkBox = new GuiCheckBoxCtrl() { canSaveDynamicFields = "0"; @@ -1108,6 +1120,9 @@ function AssetBrowser::reImportAsset(%this) //if(%assetType $= "ImageAsset") // %filters = ""; + //TODO + %currentFile = ""; + %dlg = new OpenFileDialog() { Filters = "(All Files (*.*)|*.*|"; @@ -1412,10 +1427,13 @@ function AssetBrowser::doRebuildAssetArray(%this) AssetBrowser-->assetList.deleteAllObjects(); AssetPreviewArray.empty(); + // uhh?? I just added global schenanagins here to make this work + %assetArray = $AssetBrowser::AssetArray; if(isObject(%assetArray)) %assetArray.delete(); %assetArray = new ArrayObject(); + $AssetBrowser::AssetArray = %assetArray; //First, Query for our assets %assetQuery = new AssetQuery(); diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.tscript index 152a4c78c..50ab94c6b 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.tscript @@ -277,6 +277,9 @@ function AssetBrowser::onDropFolder(%this, %filePath) //First, we wanna scan to see if we have modules to contend with. If we do, we'll just plunk them in wholesale //and not process their contents. + // TODO + %fileExt = ""; + //If not modules, it's likely an art pack or other mixed files, so we'll import them as normal if( (%fileExt $= ".png") || (%fileExt $= ".jpg") || (%fileExt $= ".bmp") || (%fileExt $= ".dds") ) %this.importAssetListArray.add("ImageAsset", %filePath); diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript index 97bd9b8db..6b52e7199 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript @@ -142,6 +142,7 @@ function ImportAssetOptionsWindow::editImportSettings(%this, %assetItem) %filePath = %assetItem.filePath; %assetName = %assetItem.assetName; %assetConfigObj = %assetItem.importConfig; + %optionsObj = %assetItem.optionsObj; // TODO IS THIS RIGHT ImportOptionsList.startGroup("Asset"); ImportOptionsList.addField("AssetName", "Asset Name", "string", "", "NewAsset", "", %assetItem); @@ -405,6 +406,7 @@ function ImportAssetConfigEditorWindow::editConfig(%this) function ImportAssetConfigEditorWindow::deleteConfig(%this) { + %configList = ImportAssetConfigSettingsList; for(%i=0; %i < %configList.count(); %i++) { diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/component.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/component.tscript index 8d0b6eaee..c34eef551 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/component.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/component.tscript @@ -110,7 +110,7 @@ function AssetBrowser::renameComponentAsset(%this, %assetDef, %newAssetId, %orig %line = %file.readLine(); %line = trim( %line ); - %editedFileContents = %editedFileContents @ strreplace(%line, %originalAssetName, %newName) @ "\n"; + %editedFileContents = %editedFileContents @ strreplace(%line, %originalName, %newName) @ "\n"; } %file.close(); diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cpp.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cpp.tscript index 4ae71361b..9d00caa05 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cpp.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cpp.tscript @@ -37,6 +37,8 @@ function AssetBrowser::createCpp(%this) TamlWrite(%asset, %tamlpath);*/ + %tamlpath = %assetPath @ %assetName @ ".asset.taml"; + %moduleDef = ModuleDatabase.findModule(%moduleName, 1); AssetDatabase.addDeclaredAsset(%moduleDef, %tamlpath); diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.tscript index d57f1594c..9a8f05783 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.tscript @@ -137,7 +137,7 @@ function AssetBrowser::buildLevelAssetPreview(%this, %assetDef, %previewData) %previewData.assetPath = %assetDef.getLevelPath(); %previewData.doubleClickCommand = "schedule( 1, 0, \"EditorOpenMission\", "@%assetDef@");"; - %levelPreviewImage = %assetDesc.PreviewImage; + %levelPreviewImage = %assetDef.PreviewImage; if(isFile(%levelPreviewImage)) %previewData.previewImage = %levelPreviewImage; diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.tscript index c7a226d49..0ddd29944 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.tscript @@ -49,8 +49,7 @@ function AssetBrowser::importScriptAsset(%this, %assetId) function AssetBrowser::onScriptAssetEditorDropped(%this, %assetDef, %position) { - if(!isObject(%dropTarget)) - return; + } //Renames the asset diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/stateMachine.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/stateMachine.tscript index d55b926df..1e444bcf1 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/stateMachine.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/stateMachine.tscript @@ -86,6 +86,9 @@ function AssetBrowser::editStateMachineAsset(%this, %assetDef) function AssetBrowser::duplicateStateMachineAsset(%this, %assetDef) { + // TODO: + %targetModule = ""; + //Check if we have a target module, if not we need to select one if(%targetModule $= "") { diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript index f40904ea8..10c75951f 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript @@ -325,7 +325,7 @@ function directoryHandler::copyFolder(%this, %fromFolder, %toFolder) if(!%success) error("copyProjectFolder() - failed to copy file: " @ %file); - %file = findNextFileMultiExpr( %fullPath @ "/*.*" ); + %file = findNextFileMultiExpr( %fromFolder @ "/*.*" ); } //do sub directories diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript index 82385f25f..09117e16a 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript @@ -143,6 +143,10 @@ function AssetBrowser::performRenameAsset(%this, %originalAssetName, %newName) //Update the selection to immediately jump to the new asset AssetBrowser-->filterTree.clearSelection(); %ModuleItem = AssetBrowser-->filterTree.findItemByName(%moduleName); + + // TODO is this correct? + %assetType = %ModuleItem.getClassName(); + %assetTypeId = AssetBrowser-->filterTree.findChildItemByName(%ModuleItem, %assetType); AssetBrowser-->filterTree.selectItem(%assetTypeId); @@ -236,9 +240,9 @@ function moveAssetFile(%assetDef, %destinationPath) %assetPath = makeFullPath(AssetDatabase.getAssetFilePath(%assetDef.getAssetId())); %assetFilename = fileName(%assetPath); - %newAssetPath = %destination @ "/" @ %assetFilename; + %newAssetPath = %destinationPath @ "/" @ %assetFilename; - %copiedSuccess = pathCopy(%assetPath, %destination @ "/" @ %assetFilename); + %copiedSuccess = pathCopy(%assetPath, %destinationPath @ "/" @ %assetFilename); if(!%copiedSuccess) return ""; diff --git a/Templates/BaseGame/game/tools/componentEditor/interface/materialFieldType.tscript b/Templates/BaseGame/game/tools/componentEditor/interface/materialFieldType.tscript index aff83f5de..d2139d399 100644 --- a/Templates/BaseGame/game/tools/componentEditor/interface/materialFieldType.tscript +++ b/Templates/BaseGame/game/tools/componentEditor/interface/materialFieldType.tscript @@ -9,6 +9,13 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, % if(%currentMaterial $= "" || %currentMaterial == 0) %currentMaterial = %fieldDefaultVal; + // TODO? + %matName = ""; + %component = ""; + %material = ""; + %accessor = ""; + %precision = ""; + %container = new GuiControl() { canSaveDynamicFields = "0"; Profile = "EditorContainerProfile"; @@ -20,7 +27,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, % canSave = "0"; Visible = "1"; hovertime = "100"; - tooltip = %tooltip; + tooltip = "";// %tooltip; tooltipProfile = "EditorToolTipProfile"; }; @@ -35,7 +42,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, % canSave = "0"; Visible = "1"; hovertime = "100"; - tooltip = %tooltip; + tooltip = ""; //%tooltip; tooltipProfile = "EditorToolTipProfile"; text = %fieldName; maxLength = "1024"; @@ -57,7 +64,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, % text = %currentMaterial; }; }; - + %previewButton = new GuiBitmapButtonCtrl(){ internalName = %matName; HorizSizing = "right"; @@ -121,7 +128,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, % canSave = "0"; Visible = "1"; hovertime = "100"; - tooltip = %tooltip; + tooltip = ""; //%tooltip; tooltipProfile = "EditorToolTipProfile"; text = "Mapped to:" SPC %material.mapTo; maxLength = "1024"; @@ -140,7 +147,7 @@ function GuiInspectorGroup::buildMaterialField(%this, %fieldName, %fieldLabel, % canSave = "0"; Visible = "1"; hovertime = "100"; - tooltip = %tooltip; + tooltip = "";// %tooltip; tooltipProfile = "EditorToolTipProfile"; maxLength = "1024"; historySize = "0"; diff --git a/Templates/BaseGame/game/tools/componentEditor/interface/stateMachineField.tscript b/Templates/BaseGame/game/tools/componentEditor/interface/stateMachineField.tscript index 796c2486b..80c5723ed 100644 --- a/Templates/BaseGame/game/tools/componentEditor/interface/stateMachineField.tscript +++ b/Templates/BaseGame/game/tools/componentEditor/interface/stateMachineField.tscript @@ -201,7 +201,7 @@ function stateMachineFieldList::onSelect(%this) %index = %this.getParent().fieldID; %oldValue = %this.behavior.stateMachine.getValue(%index); - %this.behavior.stateMachine.setValue(%fieldType SPC %oldValue.y); + %this.behavior.stateMachine.setValue(%this.fieldType SPC %oldValue.y); %this.getParent().add(%fieldCtrl); } diff --git a/Templates/BaseGame/game/tools/componentEditor/interface/typeMaskFieldType.tscript b/Templates/BaseGame/game/tools/componentEditor/interface/typeMaskFieldType.tscript index 83cb55a6f..3b7710ad7 100644 --- a/Templates/BaseGame/game/tools/componentEditor/interface/typeMaskFieldType.tscript +++ b/Templates/BaseGame/game/tools/componentEditor/interface/typeMaskFieldType.tscript @@ -13,7 +13,7 @@ function GuiInspectorComponentGroup::buildTypeMaskField(%this, %component, %fiel canSave = "0"; Visible = "1"; hovertime = "100"; - tooltip = %tooltip; + tooltip = "";//%tooltip; tooltipProfile = "EditorToolTipProfile"; }; @@ -28,7 +28,7 @@ function GuiInspectorComponentGroup::buildTypeMaskField(%this, %component, %fiel canSave = "0"; Visible = "1"; hovertime = "100"; - tooltip = %tooltip; + tooltip = "";//%tooltip; tooltipProfile = "EditorToolTipProfile"; text = %fieldName; maxLength = "1024"; diff --git a/Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript b/Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript index c136bb4bf..b9b7d2850 100644 --- a/Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript @@ -159,6 +159,9 @@ function QuickEditComponentList::onHotTrackItem( %this, %itemID ) { %name = getField(%componentObj.getComponentField(%i), 0); + // TODO: + %description = ""; + SuperTooltipDlg.addParam(%name, %description @ "\n"); } %position = %this.getGlobalPosition(); diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui index 8fbc97464..99d9b1852 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContnt = new GuiControl(ConvexEditorOptions) +$guiContnt = new GuiControl(ConvexEditorOptions) { position = "0 0"; extent = "800 600"; diff --git a/Templates/BaseGame/game/tools/datablockEditor/datablockEditorUndo.tscript b/Templates/BaseGame/game/tools/datablockEditor/datablockEditorUndo.tscript index f9a8d30b4..d3630c9e8 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/datablockEditorUndo.tscript +++ b/Templates/BaseGame/game/tools/datablockEditor/datablockEditorUndo.tscript @@ -79,7 +79,7 @@ function ActionCreateDatablock::redo( %this ) %this.editor.selectDatablock( %db ); %this.editor.flagInspectorAsDirty( true ); - UnlistedDatablocks.remove( %id ); + UnlistedDatablocks.remove( %db ); } //--------------------------------------------------------------------------------------------- @@ -99,7 +99,7 @@ function ActionCreateDatablock::undo( %this ) %this.dbName = %db.name; %db.name = ""; - UnlistedDatablocks.add( %this.db ); + UnlistedDatablocks.add( %db ); } //============================================================================================= @@ -155,5 +155,5 @@ function ActionDeleteDatablock::undo( %this ) // Remove from unlisted. - UnlistedDatablocks.remove( %id ); + UnlistedDatablocks.remove( %db ); } diff --git a/Templates/BaseGame/game/tools/debugger/scripts/debugger.ed.tscript b/Templates/BaseGame/game/tools/debugger/scripts/debugger.ed.tscript index 408de29eb..0c17b8ccb 100644 --- a/Templates/BaseGame/game/tools/debugger/scripts/debugger.ed.tscript +++ b/Templates/BaseGame/game/tools/debugger/scripts/debugger.ed.tscript @@ -430,7 +430,7 @@ function DbgRemoveBreakPoint(%file, %line) function DbgDeleteSelectedBreak() { %selectedBreak = DebuggerBreakPoints.getSelectedId(); - %rowNum = DebuggerBreakPoints.getRowNumById(%selectedWatch); + %rowNum = DebuggerBreakPoints.getRowNumById(%selectedBreak); if (%rowNum >= 0) { %breakText = DebuggerBreakPoints.getRowText(%rowNum); %breakLine = getField(%breakText, 0); diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui index 816bb0cc2..46291615a 100644 --- a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui +++ b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui @@ -472,8 +472,6 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { Margin = "0 0 0 -3"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -552,8 +550,6 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { Margin = "0 0 0 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -716,8 +712,6 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { Margin = "0 0 0 -3"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -796,8 +790,6 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { Margin = "0 0 0 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiInspector(DecalInspector) { StackingType = "Vertical"; diff --git a/Templates/BaseGame/game/tools/forestEditor/brushes.tscript b/Templates/BaseGame/game/tools/forestEditor/brushes.tscript index 2146c2e34..8b2735ccf 100644 --- a/Templates/BaseGame/game/tools/forestEditor/brushes.tscript +++ b/Templates/BaseGame/game/tools/forestEditor/brushes.tscript @@ -20,6 +20,6 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -%forestBrushesGroup = new SimGroup( ForestBrushGroup ) +$forestBrushesGroup = new SimGroup( ForestBrushGroup ) { }; \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript index 55842264c..a1604b005 100644 --- a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript @@ -233,7 +233,7 @@ function GuiInspectorVariableGroup::buildOptionsSettingField(%this, %fieldName, canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; - tooltip = %tooltip; + tooltip = "";//%tooltip; text = %fieldDefaultVal; hovertime = "1000"; ownerObject = %ownerObj; @@ -492,7 +492,8 @@ function ESettingsWindow::getAssetManagementSettings(%this) function ESettingsWindow::getAssetEditingSettings(%this) { ImportAssetWindow::reloadImportOptionConfigs(); - + %formattedConfigList = ""; + for(%i=0; %i < ImportAssetWindow.importConfigsList.Count(); %i++) { %configName = ImportAssetWindow.importConfigsList.getKey(%i); diff --git a/Templates/BaseGame/game/tools/gui/fieldTypes/assetDependencies.tscript b/Templates/BaseGame/game/tools/gui/fieldTypes/assetDependencies.tscript index 3aaf4f73a..b0f8e5a45 100644 --- a/Templates/BaseGame/game/tools/gui/fieldTypes/assetDependencies.tscript +++ b/Templates/BaseGame/game/tools/gui/fieldTypes/assetDependencies.tscript @@ -34,7 +34,7 @@ function GuiInspectorVariableGroup::buildAssetDependenciesField(%this, %fieldNam canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; - tooltip = %tooltip; + tooltip = "";// %tooltip; text = %fieldDefaultVal; hovertime = "1000"; ownerObject = %ownerObj; diff --git a/Templates/BaseGame/game/tools/gui/fieldTypes/buttonField.tscript b/Templates/BaseGame/game/tools/gui/fieldTypes/buttonField.tscript index c0a2392a2..e2f680d05 100644 --- a/Templates/BaseGame/game/tools/gui/fieldTypes/buttonField.tscript +++ b/Templates/BaseGame/game/tools/gui/fieldTypes/buttonField.tscript @@ -33,7 +33,7 @@ function GuiInspectorVariableGroup::buildButtonField(%this, %fieldName, %fieldLa canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; - tooltip = %tooltip; + tooltip = "";// %tooltip; text = %fieldName; hovertime = "1000"; command = %fieldDataVals; diff --git a/Templates/BaseGame/game/tools/gui/fieldTypes/listField.tscript b/Templates/BaseGame/game/tools/gui/fieldTypes/listField.tscript index d636641af..c26f3638d 100644 --- a/Templates/BaseGame/game/tools/gui/fieldTypes/listField.tscript +++ b/Templates/BaseGame/game/tools/gui/fieldTypes/listField.tscript @@ -22,7 +22,7 @@ function GuiInspectorVariableGroup::buildListField(%this, %fieldName, %fieldLabe canSave = "0"; Visible = "1"; hovertime = "100"; - tooltip = %tooltip; + tooltip = ""; ///%tooltip; tooltipProfile = "EditorToolTipProfile"; }; @@ -37,7 +37,7 @@ function GuiInspectorVariableGroup::buildListField(%this, %fieldName, %fieldLabe canSave = "0"; Visible = "1"; hovertime = "100"; - tooltip = %tooltip; + tooltip = ""; //%tooltip; tooltipProfile = "EditorToolTipProfile"; text = %fieldLabel; maxLength = "1024"; @@ -66,7 +66,7 @@ function GuiInspectorVariableGroup::buildListField(%this, %fieldName, %fieldLabe canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; - tooltip = %tooltip; + tooltip = ""; //%tooltip; text = %fieldDefaultVal; hovertime = "1000"; ownerObject = %ownerObj; diff --git a/Templates/BaseGame/game/tools/gui/fieldTypes/range.tscript b/Templates/BaseGame/game/tools/gui/fieldTypes/range.tscript index 35e55bfe7..efa78ca46 100644 --- a/Templates/BaseGame/game/tools/gui/fieldTypes/range.tscript +++ b/Templates/BaseGame/game/tools/gui/fieldTypes/range.tscript @@ -76,7 +76,7 @@ function GuiInspectorVariableGroup::buildRangeField(%this, %fieldName, %fieldLab Visible = "1"; Command = "$thisControl.onDragComplete();"; tooltipprofile = "GuiToolTipProfile"; - tooltip = %tooltip; + tooltip = ""; //%tooltip; hovertime = "1000"; canSaveDynamicFields = "0"; ownerObject = %ownerObj; diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript index 433f103ae..e2a16756d 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript @@ -69,6 +69,8 @@ function GuiEditor::createNewProfile( %this, %name, %copySource ) function GuiEditor::getProfileCategory( %this, %profile ) { + // TODO + %name = ""; if( %this.isDefaultProfile( %name ) ) return "Default"; else if( %profile.category !$= "" ) diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorUndo.ed.tscript b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorUndo.ed.tscript index fad91557e..f28a26109 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorUndo.ed.tscript +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorUndo.ed.tscript @@ -364,6 +364,10 @@ function GenericUndoAction::learn(%this, %object) %oldFieldNames = %this.fieldNames[%object]; %numNewFields = getWordCount(%newFieldNames); %numOldFields = getWordCount(%oldFieldNames); + + %newNullFields = ""; + %oldNullFields = ""; + // compare the old field list to the new field list. // if a field is on the old list that isn't on the new list, // add it to the newNullFields list. diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui index 93a1f190f..068ca15ee 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui +++ b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui @@ -233,8 +233,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -543,9 +541,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -1923,8 +1918,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -2623,8 +2616,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Margin = "-1 0 0 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -3100,8 +3091,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Margin = "-1 0 0 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -3373,8 +3362,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Margin = "-1 0 0 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -4191,8 +4178,6 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript index bcb2b2c29..84b345299 100644 --- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript @@ -1496,7 +1496,8 @@ function MaterialEditorGui::updateAnimationFlags(%this) { MaterialEditorGui.setMaterialDirty(); %single = true; - + %flags = ""; + if(MaterialEditorPropertiesWindow-->RotationAnimation.getValue() == true) { if(%single == true) diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript index 3fcfd528f..0c8533875 100644 --- a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript +++ b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript @@ -136,7 +136,7 @@ function MeshRoadEditorGui::editNodeDetails( %this ) function MeshRoadEditorGui::onBrowseClicked( %this ) { - //%filename = RETextureFileCtrl.getText(); + %filename = RETextureFileCtrl.getText(); %dlg = new OpenFileDialog() { diff --git a/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui b/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui index 9cd6f594c..6b7ab94a5 100644 --- a/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui +++ b/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui @@ -271,8 +271,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -584,8 +582,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -826,9 +822,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; - + new GuiStackControl() { StackingType = "Vertical"; HorizStacking = "Left to Right"; @@ -1272,8 +1266,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -1359,7 +1351,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - Command = "%particleId = PEE_EmitterParticle2-->PopUpMenu.findText( \"None\" ); PEE_EmitterParticle2-->PopUpMenu.setSelected( %particleId );PE_EmitterEditor.updateParticlesFields();"; + Command = "$_particleId = PEE_EmitterParticle2-->PopUpMenu.findText( \"None\" ); PEE_EmitterParticle2-->PopUpMenu.setSelected( $_particleId );PE_EmitterEditor.updateParticlesFields();"; hovertime = "1000"; tooltip = "Clear Particle 2 from Emitter"; text = ""; @@ -1407,7 +1399,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - Command = "%particleId = PEE_EmitterParticle3-->PopUpMenu.findText( \"None\" ); PEE_EmitterParticle3-->PopUpMenu.setSelected( %particleId );PE_EmitterEditor.updateParticlesFields();"; + Command = "$_particleId = PEE_EmitterParticle3-->PopUpMenu.findText( \"None\" ); PEE_EmitterParticle3-->PopUpMenu.setSelected( $_particleId );PE_EmitterEditor.updateParticlesFields();"; hovertime = "1000"; tooltip = "Clear Particle 3 from Emitter"; text = ""; @@ -1455,7 +1447,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { MinExtent = "8 2"; canSave = "1"; Visible = "1"; - Command = "%particleId = PEE_EmitterParticle4-->PopUpMenu.findText( \"None\" ); PEE_EmitterParticle4-->PopUpMenu.setSelected( %particleId );PE_EmitterEditor.updateParticlesFields();"; + Command = "$_particleId = PEE_EmitterParticle4-->PopUpMenu.findText( \"None\" ); PEE_EmitterParticle4-->PopUpMenu.setSelected( $_particleId );PE_EmitterEditor.updateParticlesFields();"; hovertime = "1000"; tooltip = "Clear Particle 4 from Emitter"; text = ""; @@ -1479,8 +1471,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -1933,8 +1923,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -2233,8 +2221,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -2518,8 +2504,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -2720,8 +2704,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; @@ -2865,8 +2847,6 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { Margin = "4 4 4 0"; DragSizable = false; container = true; - parentRollout = %this.rollout; - object = %behavior; new GuiStackControl() { StackingType = "Vertical"; diff --git a/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript b/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript index acaad89b8..115da9d5c 100644 --- a/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript +++ b/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript @@ -138,7 +138,7 @@ function RoadEditorGui::editNodeDetails( %this ) function RoadEditorGui::onBrowseClicked( %this ) { - //%filename = RETextureFileCtrl.getText(); + %filename = RETextureFileCtrl.getText(); %dlg = new OpenFileDialog() { diff --git a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript index 6959226c0..9067b5bcd 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript @@ -1439,6 +1439,8 @@ function ShapeEdPropWindow::update_onSequenceBlendChanged( %this, %seqName, %ble %proxyName = ShapeEditor.getProxyName( %seqName ); if ( ShapeEditor.shape.getSequenceIndex( %proxyName ) != -1 ) { + //TODO + %oldBlend = false; if ( %blend && %oldBlend ) ShapeEditor.shape.setSequenceBlend( %proxyName, false, %oldBlendSeq, %oldBlendFrame ); ShapeEditor.shape.setSequenceBlend( %proxyName, %blend, %blendSeq, %blendFrame ); @@ -2217,7 +2219,7 @@ function ShapeEdTriggerList::updateItem( %this, %oldFrame, %oldState, %frame, %s if ( %frame != %oldFrame ) { %pos = ShapeEdAnimWindow.getTimelineBitmapPos( ShapeEdAnimWindow-->seqIn.getText() + %frame, 2 ); - eval( "%ctrl = ShapeEdAnimWindow-->trigger" @ %updatedId @ ";" ); + %ctrl = eval( "return ShapeEdAnimWindow-->trigger" @ %updatedId @ ";" ); %ctrl.position = %pos SPC "0"; } } diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ConvexEditorPalette.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ConvexEditorPalette.ed.gui index e32cdfb4a..9453ae0e9 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ConvexEditorPalette.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ConvexEditorPalette.ed.gui @@ -1,4 +1,4 @@ -%paletteId = new GuiControl(ConvexEditorPalette, EditorGuiGroup) { +$paletteId = new GuiControl(ConvexEditorPalette, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/DecalEditorPalette.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/DecalEditorPalette.ed.gui index 1e4053c8e..863eb1e68 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/DecalEditorPalette.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/DecalEditorPalette.ed.gui @@ -1,4 +1,4 @@ -%paletteId = new GuiControl(DecalEditorPalette,EditorGuiGroup) { +$paletteId = new GuiControl(DecalEditorPalette,EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ForestEditorPalette.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ForestEditorPalette.ed.gui index a1cc96ef5..4e5976fb3 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ForestEditorPalette.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ForestEditorPalette.ed.gui @@ -1,4 +1,4 @@ -%paletteId = new GuiControl(ForestEditorPalette,EditorGuiGroup) { +$paletteId = new GuiControl(ForestEditorPalette,EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/MeshRoadEditorPalette.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/MeshRoadEditorPalette.ed.gui index b005ac958..63a1e7acb 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/MeshRoadEditorPalette.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/MeshRoadEditorPalette.ed.gui @@ -1,4 +1,4 @@ -%paletteId = new GuiControl(MeshRoadEditorPalette,EditorGuiGroup) { +$paletteId = new GuiControl(MeshRoadEditorPalette,EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/NavEditorPalette.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/NavEditorPalette.ed.gui index a18e3f4ba..c275e30f1 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/NavEditorPalette.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/NavEditorPalette.ed.gui @@ -1,4 +1,4 @@ -%paletteId = new GuiControl(NavEditorPalette,EditorGuiGroup) { +$paletteId = new GuiControl(NavEditorPalette,EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/RiverEditorPalette.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/RiverEditorPalette.ed.gui index 5fea48b1b..1b86bc1bd 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/RiverEditorPalette.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/RiverEditorPalette.ed.gui @@ -1,4 +1,4 @@ -%paletteId = new GuiControl(RiverEditorPalette,EditorGuiGroup) { +$paletteId = new GuiControl(RiverEditorPalette,EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/RoadEditorPalette.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/RoadEditorPalette.ed.gui index 712ea774f..787f93050 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/RoadEditorPalette.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/RoadEditorPalette.ed.gui @@ -1,4 +1,4 @@ -%paletteId = new GuiControl(RoadEditorPalette,EditorGuiGroup) { +$paletteId = new GuiControl(RoadEditorPalette,EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ShapeEditorPalette.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ShapeEditorPalette.ed.gui index e8dfaf0e9..6c93bfa63 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ShapeEditorPalette.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/ShapeEditorPalette.ed.gui @@ -1,4 +1,4 @@ -%paletteId = new GuiControl(ShapeEditorPalette,EditorGuiGroup) { +$paletteId = new GuiControl(ShapeEditorPalette,EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/TerrainEditPalette.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/TerrainEditPalette.ed.gui index 0ab8f2b1e..1b9e241a4 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/TerrainEditPalette.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/TerrainEditPalette.ed.gui @@ -1,4 +1,4 @@ -%paletteId = new GuiControl(TerrainEditorPalette,EditorGuiGroup) { +$paletteId = new GuiControl(TerrainEditorPalette,EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/TerrainPainterPalette.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/TerrainPainterPalette.ed.gui index 091f7a1c0..9e48b7fd2 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/TerrainPainterPalette.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/TerrainPainterPalette.ed.gui @@ -1,4 +1,4 @@ -%paletteId = new GuiControl(TerrainPainterPalette,EditorGuiGroup) { +$paletteId = new GuiControl(TerrainPainterPalette,EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/WorldEditorPalette.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/WorldEditorPalette.ed.gui index 421b52fe4..9c0b9ef6a 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/WorldEditorPalette.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/WorldEditorPalette.ed.gui @@ -1,4 +1,4 @@ -%paletteId = new GuiControl(WorldEditorInspectorPalette, EditorGuiGroup) { +$paletteId = new GuiControl(WorldEditorInspectorPalette, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/init.tscript b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/init.tscript index 637739745..86bc5b551 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/init.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/init.tscript @@ -30,6 +30,9 @@ function EWToolsPaletteWindow::loadToolsPalettes() exec( %file ); %paletteGroup = 0; + // TODO + %paletteId = 0; + %i = %paletteId.getCount(); for( ; %i != 0; %i--) { @@ -49,6 +52,9 @@ function EWToolsPaletteWindow::loadToolsPalettes() exec( %file ); %paletteGroup = 0; + // TODO + %paletteId = 0; + %i = %paletteId.getCount(); for( ; %i != 0; %i--) { diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainExportGui.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainExportGui.gui index fd62d885a..0953e8620 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainExportGui.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainExportGui.gui @@ -288,6 +288,9 @@ function TerrainExportGui::selectFolder( %this ) function TerrainExportGui::doOpenDialog( %this, %filter, %callback ) { + // TODO + %currentFile = ""; + %dlg = new OpenFolderDialog() { Title = "Select Export Folder"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui index 9055f4fdc..d1bfe1ded 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui @@ -508,6 +508,8 @@ function TerrainImportGui::acceptSettings( %this ) AssetBrowser.newAssetSettings.opacityList = %this-->OpacityLayerTextList; + %opacityList = %this-->OpacityLayerTextList; + for( %i = 0; %i < %opacityList.rowCount(); %i++ ) { %itemText = %opacityList.getRowTextById( %i ); @@ -535,6 +537,9 @@ function TerrainImportGui::cancel( %this ) function TerrainImportGui::doOpenDialog( %this, %filter, %callback ) { + // TODO + %currentFile = ""; + %dlg = new OpenFileDialog() { Filters = %filter; diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript index 1f5dc01f3..e1f73155c 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript @@ -399,7 +399,7 @@ function EditorGui::addToToolsToolbar( %this, %pluginName, %internalName, %bitma Visible = "1"; Command = "EditorGui.setEditor(" @ %pluginName @ ");"; tooltipprofile = "ToolsGuiToolTipProfile"; - ToolTip = %tooltip; + ToolTip = "";// %tooltip; hovertime = "750"; bitmap = %bitmap; buttonType = "RadioButton"; diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/ManageSFXParametersWindow.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/ManageSFXParametersWindow.ed.tscript index f788c7edb..e005c4c3e 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/ManageSFXParametersWindow.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/ManageSFXParametersWindow.ed.tscript @@ -137,8 +137,7 @@ function EManageSFXParameters::onVisible( %this, %value ) if( %value ) { // Schedule an update. - - %this.schedule( %SFX_PARAMETERS_UPDATE_INTERVAL, "update" ); + %this.schedule( $SFX_PARAMETERS_UPDATE_INTERVAL, "update" ); } } @@ -770,7 +769,7 @@ function EManageSFXParameters::addParameter( %this, %parameter ) // Set the fields to reflect the parameter's current settings. - %ctrl-->valueField.setValue( %paramter.value ); + %ctrl-->valueField.setValue( %parameter.value ); %ctrl-->rangeMinField.setText( %parameter.range.x ); %ctrl-->rangeMaxField.setText( %parameter.range.y ); %ctrl-->defaultField.setValue( %parameter.defaultValue ); diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.tscript index 3fb4b1652..8a874e613 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.tscript @@ -871,6 +871,7 @@ function EditorToolsMenu::onSelectItem(%this, %id) { %toolName = getField( %this.item[%id], 2 ); + %paletteName = ""; EditorGui.setEditor(%toolName, %paletteName ); %this.checkRadioItem(0, %this.getItemCount(), %id);