From 6f7fdca87d10e9a5b6dcebcd2ce597a4377d7dc2 Mon Sep 17 00:00:00 2001 From: Jeff Hutchinson Date: Tue, 4 May 2021 21:18:15 -0400 Subject: [PATCH] lotsa fixes. --- Engine/source/T3D/gameBase/gameConnection.cpp | 31 ++++++----------- Engine/source/console/console.h | 2 +- Engine/source/console/simEvents.cpp | 2 +- .../scripts/server/levelInfo.tscript | 1 + .../scripts/server/levelLoad.tscript | 3 ++ .../game/core/console/guis/console.gui | 2 +- .../game/core/console/scripts/console.tscript | 2 +- .../core/postFX/scripts/postFxManager.tscript | 2 +- .../scripts/gameObjectManagement.tscript | 4 +-- .../utility/scripts/helperFunctions.tscript | 4 ++- .../core/utility/scripts/parseArgs.tscript | 34 +++++++++---------- .../game/core/utility/scripts/scene.tscript | 3 -- .../data/ExampleModule/GUIs/ExampleGUI.gui | 2 +- Templates/BaseGame/game/data/defaults.tscript | 2 +- .../game/data/gameUI/GUIs/playGui.gui | 2 +- .../game/data/ui/guis/IODropdownDlg.ed.gui | 2 +- .../game/data/ui/guis/RecordingsDlg.gui | 2 +- .../game/data/ui/guis/chooseLevelDlg.gui | 2 +- .../game/data/ui/guis/guiMusicPlayer.gui | 2 +- .../game/data/ui/guis/joinServerMenu.gui | 2 +- .../BaseGame/game/data/ui/guis/loadingGui.gui | 2 +- .../BaseGame/game/data/ui/guis/mainMenu.gui | 2 +- .../game/data/ui/guis/messageBoxDlg.gui | 2 +- .../game/data/ui/guis/netGraphGui.gui | 2 +- .../BaseGame/game/data/ui/guis/optionsDlg.gui | 2 +- .../game/data/ui/guis/optionsMenu.gui | 2 +- .../game/data/ui/guis/optionsMenu.tscript | 17 +++------- .../BaseGame/game/data/ui/guis/pauseMenu.gui | 2 +- .../BaseGame/game/data/ui/guis/profiler.gui | 2 +- .../game/data/ui/guis/profiler.tscript | 2 +- .../game/data/ui/guis/remapConfirmDlg.gui | 2 +- .../BaseGame/game/data/ui/guis/remapDlg.gui | 2 +- .../BaseGame/game/data/ui/guis/startupGui.gui | 2 +- Templates/BaseGame/game/main.tscript.in | 5 ++- .../MainEditor/guis/MainEditorWindow.gui | 2 +- .../VPathEditor/GUI/VPathEditorToolbar.gui | 2 +- .../tools/VerveEditor/GUI/VerveEditor.gui | 2 +- .../GUI/VerveEditorGroupBuilder.gui | 2 +- .../GUI/VerveEditorImportPathNodes.gui | 2 +- .../GUI/VerveEditorPreferences.gui | 2 +- .../guis/AssetImportConfigEditor.gui | 2 +- .../assetBrowser/guis/GameObjectCreator.gui | 2 +- .../assetBrowser/guis/addModuleWindow.gui | 2 +- .../assetBrowser/guis/addPackageWindow.gui | 2 +- .../tools/assetBrowser/guis/assetBrowser.gui | 2 +- .../tools/assetBrowser/guis/assetImport.gui | 2 +- .../assetBrowser/guis/assetImportLog.gui | 2 +- .../tools/assetBrowser/guis/assetNameEdit.gui | 2 +- .../guis/assetPreviewButtonsTemplate.gui | 2 +- .../guis/createNewCollectionSet.gui | 2 +- .../tools/assetBrowser/guis/editAsset.gui | 2 +- .../tools/assetBrowser/guis/editModule.gui | 2 +- .../assetBrowser/guis/looseFileAudit.gui | 2 +- .../game/tools/assetBrowser/guis/newAsset.gui | 2 +- .../assetBrowser/guis/newComponentAsset.gui | 2 +- .../tools/assetBrowser/guis/newFolder.gui | 2 +- .../tools/assetBrowser/guis/selectModule.gui | 2 +- .../tools/assetBrowser/guis/selectPackage.gui | 2 +- .../tools/assetBrowser/guis/selectPath.gui | 2 +- .../templateFiles/guiFile.gui.template | 2 +- .../componentEditor/gui/TypeMaskFieldGui.gui | 2 +- .../gui/superToolTipDlg.ed.gui | 2 +- .../tools/convexEditor/convexEditorGui.gui | 2 +- .../convexEditorSettingsTab.ed.gui | 2 +- .../convexEditor/convexEditorToolbar.ed.gui | 2 +- .../DatablockEditorCreatePrompt.ed.gui | 2 +- .../DatablockEditorInspectorWindow.ed.gui | 2 +- .../DatablockEditorTreeWindow.ed.gui | 2 +- .../debugger/gui/breakConditionDlg.ed.gui | 2 +- .../game/tools/debugger/gui/connectDlg.ed.gui | 2 +- .../game/tools/debugger/gui/debugger.ed.gui | 2 +- .../tools/debugger/gui/editWatchDlg.ed.gui | 2 +- .../game/tools/debugger/gui/findDlg.ed.gui | 2 +- .../game/tools/debugger/gui/watchDlg.ed.gui | 2 +- .../game/tools/decalEditor/decalEditorGui.gui | 2 +- .../forestEditor/forestEditToolbar.ed.gui | 2 +- .../tools/forestEditor/forestEditorGui.gui | 2 +- .../game/tools/gui/EditorLoadingGui.gui | 2 +- .../tools/gui/EditorSettingsWindow.ed.gui | 2 +- .../game/tools/gui/GuiEaseEditDlg.ed.gui | 2 +- .../game/tools/gui/assimpImport.ed.gui | 2 +- .../game/tools/gui/colladaImport.ed.gui | 6 ++-- .../game/tools/gui/colorPicker.ed.gui | 2 +- .../BaseGame/game/tools/gui/cubemapEditor.gui | 2 +- .../game/tools/gui/fileDialogBase.ed.tscript | 3 +- .../game/tools/gui/guiObjectInspector.ed.gui | 2 +- .../tools/gui/guiObjectInspector.ed.tscript | 6 ++-- .../game/tools/gui/materialSelector.ed.gui | 4 ++- .../gui/messageBoxes/IODropdownDlg.ed.gui | 2 +- .../gui/messageBoxes/messageBoxOK.ed.gui | 2 +- .../gui/messageBoxes/messageBoxOKBuy.ed.gui | 2 +- .../messageBoxes/messageBoxOKCancel.ed.gui | 2 +- .../messageBoxOKCancelDetailsDlg.ed.gui | 2 +- .../gui/messageBoxes/messageBoxYesNo.ed.gui | 2 +- .../messageBoxes/messageBoxYesNoCancel.ed.gui | 2 +- .../gui/messageBoxes/messagePopup.ed.gui | 2 +- .../BaseGame/game/tools/gui/postFxEditor.gui | 2 +- .../BaseGame/game/tools/gui/profilerGraph.gui | 2 +- .../tools/gui/renderTargetVisualizer.ed.gui | 2 +- .../game/tools/gui/saveChangesMBDlg.ed.gui | 2 +- .../game/tools/gui/scriptEditorDlg.ed.gui | 2 +- .../BaseGame/game/tools/gui/simViewDlg.ed.gui | 2 +- .../guiEditor/gui/EditorChooseGUI.ed.gui | 2 +- .../game/tools/guiEditor/gui/guiEditor.ed.gui | 2 +- .../gui/guiEditorNewGuiDialog.ed.gui | 2 +- .../guiEditor/gui/guiEditorPrefsDlg.ed.gui | 2 +- .../guiEditor/gui/guiEditorSelectDlg.ed.gui | 2 +- .../scripts/EditorChooseGUI.ed.tscript | 4 +-- .../scripts/guiEditorCanvas.ed.tscript | 16 ++++----- Templates/BaseGame/game/tools/main.tscript | 2 +- .../materialEditor/gui/MaterialToolbar.ed.gui | 2 +- .../gui/guiMaterialPreviewWindow.ed.gui | 2 +- .../gui/guiMaterialPropertiesWindow.ed.gui | 2 +- .../gui/materialInstancesView.ed.gui | 2 +- .../meshRoadEditor/meshRoadEditorGui.gui | 2 +- .../meshRoadEditorSettingsTab.gui | 2 +- .../meshRoadEditor/meshRoadEditorToolbar.gui | 2 +- .../missionAreaEditorGui.ed.gui | 2 +- .../tools/navEditor/CreateNewNavMeshDlg.gui | 2 +- .../tools/navEditor/NavEditorConsoleDlg.gui | 2 +- .../game/tools/navEditor/NavEditorGui.gui | 2 +- .../tools/navEditor/NavEditorSettingsTab.gui | 2 +- .../game/tools/navEditor/NavEditorToolbar.gui | 2 +- .../particleEditor/ParticleEditor.ed.gui | 2 +- .../game/tools/riverEditor/RiverEditorGui.gui | 2 +- .../riverEditor/RiverEditorSettingsTab.gui | 2 +- .../tools/riverEditor/RiverEditorToolbar.gui | 2 +- .../game/tools/roadEditor/RoadEditorGui.gui | 2 +- .../roadEditor/RoadEditorSettingsTab.gui | 2 +- .../tools/roadEditor/RoadEditorToolbar.gui | 2 +- .../gui/ShapeEditorSettingsTab.gui | 2 +- .../shapeEditor/gui/ShapeEditorToolbar.ed.gui | 2 +- .../gui/shapeEdAdvancedWindow.ed.gui | 2 +- .../shapeEditor/gui/shapeEdAnimWindow.ed.gui | 2 +- .../gui/shapeEdPreviewWindow.ed.gui | 2 +- .../shapeEditor/gui/shapeEdPropWindow.ed.gui | 2 +- .../gui/shapeEdSelectWindow.ed.gui | 2 +- .../worldEditor/gui/AddFMODProjectDlg.ed.gui | 2 +- .../gui/AxisGizmoSettingsTab.ed.gui | 2 +- .../worldEditor/gui/CameraSettingsTab.ed.gui | 2 +- .../gui/EditorChooseLevelGui.ed.gui | 4 +-- .../tools/worldEditor/gui/EditorGui.ed.gui | 2 +- .../gui/EditorSettingsWindow.ed.gui | 2 +- .../worldEditor/gui/GeneralSettingsTab.ed.gui | 2 +- .../gui/GenericPromptDialog.ed.gui | 2 +- .../gui/ManageBookmarksWindow.ed.gui | 2 +- .../gui/ManageSFXParametersWindow.ed.gui | 2 +- .../gui/ObjectEditorSettingsTab.ed.gui | 2 +- .../gui/ObjectSnapOptionsWindow.ed.gui | 4 +-- .../gui/ProceduralTerrainPainterGui.gui | 2 +- .../gui/SelectObjectsWindow.ed.gui | 2 +- .../gui/TerrainBrushSoftnessCurveDlg.ed.gui | 2 +- .../worldEditor/gui/TerrainEditToolbar.ed.gui | 2 +- .../gui/TerrainEditorSettingsTab.ed.gui | 2 +- .../gui/TerrainPainterToolbar.ed.gui | 2 +- .../gui/TerrainPainterWindow.ed.gui | 2 +- .../worldEditor/gui/TimeAdjustGui.ed.gui | 2 +- .../worldEditor/gui/ToolsPaletteWindow.ed.gui | 2 +- .../tools/worldEditor/gui/ToolsToolbar.ed.gui | 2 +- .../gui/TransformSelectionWindow.ed.gui | 2 +- .../gui/VisibilityLayerWindow.ed.gui | 2 +- .../gui/WorldEditorInspectorWindow.ed.gui | 2 +- .../worldEditor/gui/WorldEditorToolbar.ed.gui | 2 +- .../gui/WorldEditorTreeWindow.ed.gui | 2 +- .../gui/guiCreateNewTerrainGui.gui | 2 +- .../worldEditor/gui/guiTerrainExportGui.gui | 2 +- .../worldEditor/gui/guiTerrainImportGui.gui | 2 +- .../gui/guiTerrainMaterialDlg.ed.gui | 2 +- .../gui/guiTerrainTextureSettingsDlg.ed.gui | 2 +- .../gui/guiWorldEditorMissionInspector.ed.gui | 2 +- .../worldEditor/gui/objectBuilderGui.ed.gui | 2 +- .../tools/worldEditor/gui/probeBakeDlg.gui | 2 +- .../game/tools/worldEditor/gui/shadowViz.gui | 2 +- .../worldEditor/scripts/EditorGui.ed.tscript | 6 ++-- .../Modules/Verve/gui/VerveCinematic.gui | 2 +- .../inputTest/scripts/gui/inputMonitor.gui | 2 +- .../scripts/gui/joystickSettings.gui | 2 +- Templates/Modules/vr/guis/oculusVROverlay.gui | 2 +- 178 files changed, 230 insertions(+), 245 deletions(-) diff --git a/Engine/source/T3D/gameBase/gameConnection.cpp b/Engine/source/T3D/gameBase/gameConnection.cpp index e4a4c9f5e..3c58c62b9 100644 --- a/Engine/source/T3D/gameBase/gameConnection.cpp +++ b/Engine/source/T3D/gameBase/gameConnection.cpp @@ -374,7 +374,7 @@ void GameConnection::onConnectionEstablished(bool isInitiator) const char *argv[MaxConnectArgs + 2]; argv[0] = "onConnect"; - argv[1] = NULL; // Filled in later + argv[1] = getIdString(); for(U32 i = 0; i < mConnectArgc; i++) argv[i + 2] = mConnectArgv[i]; // NOTE: Need to fallback to Con::execute() as IMPLEMENT_CALLBACK does not @@ -494,33 +494,23 @@ bool GameConnection::readConnectRequest(BitStream *stream, const char **errorStr *errorString = "CR_INVALID_ARGS"; return false; } + + char buffer[256]; + Net::addressToString(getNetAddress(), buffer); + ConsoleValue connectArgv[MaxConnectArgs + 3]; - ConsoleValue connectArgvValue[MaxConnectArgs + 3]; - - // TODO(JTH): Fix pls. - AssertISV(false, "TODO: FIX CONSOLE VALUE"); - return false; - - /* - for(U32 i = 0; i < mConnectArgc+3; i++) - { - - connectArgv[i].value = &connectArgvValue[i]; - connectArgvValue[i].init(); - } for(U32 i = 0; i < mConnectArgc; i++) { char argString[256]; stream->readString(argString); mConnectArgv[i] = dStrdup(argString); - connectArgv[i + 3] = mConnectArgv[i]; + connectArgv[i + 3].setString(argString); } - connectArgvValue[0].setStackStringValue("onConnectRequest"); - connectArgvValue[1].setIntValue(0); - char buffer[256]; - Net::addressToString(getNetAddress(), buffer); - connectArgvValue[2].setStackStringValue(buffer); + + connectArgv[0].setStringTableEntry("onConnectRequest"); + connectArgv[1].setInt(0); + connectArgv[2].setString(buffer); // NOTE: Cannot convert over to IMPLEMENT_CALLBACK as it has variable args. const char *ret = Con::execute(this, mConnectArgc + 3, connectArgv); @@ -530,7 +520,6 @@ bool GameConnection::readConnectRequest(BitStream *stream, const char **errorStr return false; } return true; - */ } //---------------------------------------------------------------------------- //---------------------------------------------------------------------------- diff --git a/Engine/source/console/console.h b/Engine/source/console/console.h index db9af8a23..4a9f3be9d 100644 --- a/Engine/source/console/console.h +++ b/Engine/source/console/console.h @@ -292,7 +292,7 @@ public: TORQUE_FORCEINLINE void setString(const char* val) { - setString(val, dStrlen(val)); + setString(val, val != NULL ? dStrlen(val) : 0); } TORQUE_FORCEINLINE void setString(const char* val, S32 len) diff --git a/Engine/source/console/simEvents.cpp b/Engine/source/console/simEvents.cpp index e375438e9..6c943f054 100644 --- a/Engine/source/console/simEvents.cpp +++ b/Engine/source/console/simEvents.cpp @@ -38,7 +38,7 @@ SimConsoleEvent::SimConsoleEvent(S32 argc, ConsoleValue *argv, bool onObject) { if (argv) { - mArgv->setString(argv[i].getString()); + mArgv[i].setString(argv[i].getString()); } } } diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/levelInfo.tscript b/Templates/BaseGame/game/core/clientServer/scripts/server/levelInfo.tscript index 269362638..dbfa7237d 100644 --- a/Templates/BaseGame/game/core/clientServer/scripts/server/levelInfo.tscript +++ b/Templates/BaseGame/game/core/clientServer/scripts/server/levelInfo.tscript @@ -143,6 +143,7 @@ function parseMissionGroupForIds( %className, %childGroup ) if(!isObject(%currentGroup)) return ""; + %classIds = ""; for(%i = 0; %i < (%currentGroup).getCount(); %i++) { if( (%currentGroup).getObject(%i).getClassName() $= %className ) diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.tscript b/Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.tscript index 64e2aa268..9bb2457ac 100644 --- a/Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.tscript +++ b/Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.tscript @@ -193,6 +193,9 @@ function resetMission() clearServerPaths(); + // TODO: Is this right? + %client = ClientGroup.getObject(0); + // Inform the game code we're resetting. %hasGameMode = callGamemodeFunction("onMissionReset", %client); } \ No newline at end of file diff --git a/Templates/BaseGame/game/core/console/guis/console.gui b/Templates/BaseGame/game/core/console/guis/console.gui index 1d6153ce2..3c5c217a6 100644 --- a/Templates/BaseGame/game/core/console/guis/console.gui +++ b/Templates/BaseGame/game/core/console/guis/console.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ConsoleDlg) { +$guiContent = new GuiControl(ConsoleDlg) { position = "0 0"; extent = "1024 768"; minExtent = "8 8"; diff --git a/Templates/BaseGame/game/core/console/scripts/console.tscript b/Templates/BaseGame/game/core/console/scripts/console.tscript index 201bcfb92..9a024050d 100644 --- a/Templates/BaseGame/game/core/console/scripts/console.tscript +++ b/Templates/BaseGame/game/core/console/scripts/console.tscript @@ -62,7 +62,7 @@ function ConsoleEntry::eval() && !startsWith(%text, "for(") && !startsWith(%text, "switch(") && !startsWith(%text, "switch$(")) - eval("%result = " @ %text); + %result = eval("return" SPC %text); else eval(%text); $Con::warnVoidAssignment = %oldWarnVoidAssignment; diff --git a/Templates/BaseGame/game/core/postFX/scripts/postFxManager.tscript b/Templates/BaseGame/game/core/postFX/scripts/postFxManager.tscript index cf0080923..055411423 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/postFxManager.tscript +++ b/Templates/BaseGame/game/core/postFX/scripts/postFxManager.tscript @@ -59,7 +59,7 @@ function PostFXManager::loadPresetFile() { //Show the dialog and set the flag getLoadFilename($PostFXManager::fileFilter, "PostFXManager::loadPresetHandler"); - $PostFXManager::currentPreset = $Tools::FileDialogs::LastFilePath(); + $PostFXManager::currentPreset = $Tools::FileDialogs::LastFilePath; } function PostFXManager::loadPresetHandler( %filename ) diff --git a/Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.tscript b/Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.tscript index f496111eb..44ec46555 100644 --- a/Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.tscript +++ b/Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.tscript @@ -15,7 +15,7 @@ function findGameObject(%name) //%assetName = AssetDatabase.getAssetName(%assetId); - if(%assetId $= %name) + if(%assetId $= %name) { %gameObjectAsset = AssetDatabase.acquireAsset(%assetId); @@ -47,7 +47,7 @@ function spawnGameObject(%name, %addToScene) %go.setHidden(false); %go.setScopeAlways(); - if(%addToMissionGroup == true) //save instance when saving level + if(%addToScene == true) //save instance when saving level getScene(0).add(%go); else // clear instance on level exit MissionCleanup.add(%go); diff --git a/Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript b/Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript index 29d2f5df6..ee7378bf8 100644 --- a/Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript +++ b/Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript @@ -524,7 +524,9 @@ function loadDir(%dir) function loadDirs(%dirPath) { - %dirPath = nextToken(%dirPath, token, ";"); + %dirPath = nextToken(%dirPath, "$token", ";"); + %token = $token; + if (%dirPath !$= "") loadDirs(%dirPath); diff --git a/Templates/BaseGame/game/core/utility/scripts/parseArgs.tscript b/Templates/BaseGame/game/core/utility/scripts/parseArgs.tscript index 51975d635..d5a098c90 100644 --- a/Templates/BaseGame/game/core/utility/scripts/parseArgs.tscript +++ b/Templates/BaseGame/game/core/utility/scripts/parseArgs.tscript @@ -67,28 +67,28 @@ function parseArgs() $isDedicated = true; $Server::Dedicated = true; enableWinConsole(true); - $argUsed[%i]++; + $argUsed[$i]++; //-------------------- case "-mission": - $argUsed[%i]++; + $argUsed[$i]++; if ($hasNextArg) { $missionArg = $nextArg; - $argUsed[%i+1]++; - %i++; + $argUsed[$i+1]++; + $i++; } else error("Error: Missing Command Line argument. Usage: -mission "); //-------------------- case "-connect": - $argUsed[%i]++; + $argUsed[$i]++; if ($hasNextArg) { $JoinGameAddress = $nextArg; - $argUsed[%i+1]++; - %i++; + $argUsed[$i+1]++; + $i++; } else error("Error: Missing Command Line argument. Usage: -connect "); @@ -271,9 +271,9 @@ function parseArgs() { $levelToLoad = $nextArg @ " "; - for(%i = $i + 2; %i < $Game::argc; %i++) + for(%j = $i + 2; %j < $Game::argc; %j++) { - $arg = $Game::argv[%i]; + $arg = $Game::argv[%j]; %hasExt = strpos($arg, ".mis"); if(%hasExt == -1) @@ -329,30 +329,30 @@ function parseArgs() case "-fullscreen": $cliFullscreen = true; - $argUsed[%i]++; + $argUsed[$i]++; case "-windowed": $cliFullscreen = false; - $argUsed[%i]++; + $argUsed[$i]++; case "-openGL": $pref::Video::displayDevice = "OpenGL"; - $argUsed[%i]++; + $argUsed[$i]++; case "-directX": $pref::Video::displayDevice = "D3D"; - $argUsed[%i]++; + $argUsed[$i]++; case "-autoVideo": $pref::Video::displayDevice = ""; - $argUsed[%i]++; + $argUsed[$i]++; case "-prefs": - $argUsed[%i]++; + $argUsed[$i]++; if ($hasNextArg) { exec($nextArg, true, true); - $argUsed[%i+1]++; - %i++; + $argUsed[$i+1]++; + $i++; } else error("Error: Missing Command Line argument. Usage: -prefs "); diff --git a/Templates/BaseGame/game/core/utility/scripts/scene.tscript b/Templates/BaseGame/game/core/utility/scripts/scene.tscript index 795d541f3..4062c4749 100644 --- a/Templates/BaseGame/game/core/utility/scripts/scene.tscript +++ b/Templates/BaseGame/game/core/utility/scripts/scene.tscript @@ -1,8 +1,5 @@ function callGamemodeFunction(%gameModeFuncName, %arg0, %arg1, %arg2, %arg3, %arg4, %arg5, %arg6) { - if(%data !$= "") - %data = "\""@%data@"\""; - %activeSceneCount = getSceneCount(); %hasGameMode = 0; diff --git a/Templates/BaseGame/game/data/ExampleModule/GUIs/ExampleGUI.gui b/Templates/BaseGame/game/data/ExampleModule/GUIs/ExampleGUI.gui index 48bf13f92..396b5b291 100644 --- a/Templates/BaseGame/game/data/ExampleModule/GUIs/ExampleGUI.gui +++ b/Templates/BaseGame/game/data/ExampleModule/GUIs/ExampleGUI.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ExampleGUI) +$guiContent = new GuiControl(ExampleGUI) { position = "0 0"; extent = "100 100"; diff --git a/Templates/BaseGame/game/data/defaults.tscript b/Templates/BaseGame/game/data/defaults.tscript index eaea83a8d..c4512418e 100644 --- a/Templates/BaseGame/game/data/defaults.tscript +++ b/Templates/BaseGame/game/data/defaults.tscript @@ -25,7 +25,7 @@ $sceneLighting::cacheSize = 20000; $sceneLighting::purgeMethod = "lastCreated"; $sceneLighting::cacheLighting = 1; -$pref::Video::displayDevice = "D3D11"; +$pref::Video::displayDevice = ($platform $= "windows") ? "D3D11" : "OpenGL"; $pref::Video::disableVerticalSync = 1; $pref::Video::defaultFenceCount = 0; $pref::Video::screenShotSession = 0; diff --git a/Templates/BaseGame/game/data/gameUI/GUIs/playGui.gui b/Templates/BaseGame/game/data/gameUI/GUIs/playGui.gui index e9522b42f..4783b51a7 100644 --- a/Templates/BaseGame/game/data/gameUI/GUIs/playGui.gui +++ b/Templates/BaseGame/game/data/gameUI/GUIs/playGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GameTSCtrl(PlayGui) { +$guiContent = new GameTSCtrl(PlayGui) { cameraZRot = "0"; forceFOV = "0"; reflectPriority = "1"; diff --git a/Templates/BaseGame/game/data/ui/guis/IODropdownDlg.ed.gui b/Templates/BaseGame/game/data/ui/guis/IODropdownDlg.ed.gui index 5fa0093da..6a98fe6d7 100644 --- a/Templates/BaseGame/game/data/ui/guis/IODropdownDlg.ed.gui +++ b/Templates/BaseGame/game/data/ui/guis/IODropdownDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(IODropdownDlg) { +$guiContent = new GuiControl(IODropdownDlg) { profile = "GuiDefaultProfile"; horizSizing = "width"; vertSizing = "height"; diff --git a/Templates/BaseGame/game/data/ui/guis/RecordingsDlg.gui b/Templates/BaseGame/game/data/ui/guis/RecordingsDlg.gui index 0e863fff5..c13008f11 100644 --- a/Templates/BaseGame/game/data/ui/guis/RecordingsDlg.gui +++ b/Templates/BaseGame/game/data/ui/guis/RecordingsDlg.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(recordingsDlg) { +$guiContent = new GuiControl(recordingsDlg) { position = "0 0"; extent = "1024 768"; minExtent = "8 8"; diff --git a/Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.gui b/Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.gui index 9b4771717..8d92639fb 100644 --- a/Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.gui +++ b/Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ChooseLevelDlg) { +$guiContent = new GuiControl(ChooseLevelDlg) { position = "0 0"; extent = "1024 768"; minExtent = "8 8"; diff --git a/Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.gui b/Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.gui index 291f3a356..cfd2c3e96 100644 --- a/Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.gui +++ b/Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(GuiMusicPlayer) { +$guiContent = new GuiControl(GuiMusicPlayer) { isContainer = "1"; Profile = "GuiWindowProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/data/ui/guis/joinServerMenu.gui b/Templates/BaseGame/game/data/ui/guis/joinServerMenu.gui index a45d5d3ce..d84a381b2 100644 --- a/Templates/BaseGame/game/data/ui/guis/joinServerMenu.gui +++ b/Templates/BaseGame/game/data/ui/guis/joinServerMenu.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(JoinServerMenu) { +$guiContent = new GuiControl(JoinServerMenu) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/data/ui/guis/loadingGui.gui b/Templates/BaseGame/game/data/ui/guis/loadingGui.gui index b0af3e66e..d525e5931 100644 --- a/Templates/BaseGame/game/data/ui/guis/loadingGui.gui +++ b/Templates/BaseGame/game/data/ui/guis/loadingGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiChunkedBitmapCtrl(LoadingGui) { +$guiContent = new GuiChunkedBitmapCtrl(LoadingGui) { bitmap = "data/ui/images/background-dark.png"; useVariable = "0"; tile = "0"; diff --git a/Templates/BaseGame/game/data/ui/guis/mainMenu.gui b/Templates/BaseGame/game/data/ui/guis/mainMenu.gui index 9f4b8ec3b..d7f7fc3a3 100644 --- a/Templates/BaseGame/game/data/ui/guis/mainMenu.gui +++ b/Templates/BaseGame/game/data/ui/guis/mainMenu.gui @@ -1,7 +1,7 @@ exec( "tools/gui/profiles.ed.tscript" ); //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiChunkedBitmapCtrl(MainMenuGui) { +$guiContent = new GuiChunkedBitmapCtrl(MainMenuGui) { bitmap = "data/ui/images/background-dark.png"; useVariable = "0"; tile = "0"; diff --git a/Templates/BaseGame/game/data/ui/guis/messageBoxDlg.gui b/Templates/BaseGame/game/data/ui/guis/messageBoxDlg.gui index 8dd356d97..a78ae98d5 100644 --- a/Templates/BaseGame/game/data/ui/guis/messageBoxDlg.gui +++ b/Templates/BaseGame/game/data/ui/guis/messageBoxDlg.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(MessageBoxDlg) { +$guiContent = new GuiControl(MessageBoxDlg) { position = "0 0"; extent = "1024 768"; minExtent = "8 8"; diff --git a/Templates/BaseGame/game/data/ui/guis/netGraphGui.gui b/Templates/BaseGame/game/data/ui/guis/netGraphGui.gui index b034a447e..be8ba1233 100644 --- a/Templates/BaseGame/game/data/ui/guis/netGraphGui.gui +++ b/Templates/BaseGame/game/data/ui/guis/netGraphGui.gui @@ -73,7 +73,7 @@ new GuiControlProfile (NetGraphPacketLossProfile) }; //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(NetGraphGui) { +$guiContent = new GuiControl(NetGraphGui) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/data/ui/guis/optionsDlg.gui b/Templates/BaseGame/game/data/ui/guis/optionsDlg.gui index 3c78ac116..b2758c32c 100644 --- a/Templates/BaseGame/game/data/ui/guis/optionsDlg.gui +++ b/Templates/BaseGame/game/data/ui/guis/optionsDlg.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(OptionsDlg) { +$guiContent = new GuiControl(OptionsDlg) { position = "0 0"; extent = "1024 768"; minExtent = "8 8"; diff --git a/Templates/BaseGame/game/data/ui/guis/optionsMenu.gui b/Templates/BaseGame/game/data/ui/guis/optionsMenu.gui index 5d357e9fd..9b76cb979 100644 --- a/Templates/BaseGame/game/data/ui/guis/optionsMenu.gui +++ b/Templates/BaseGame/game/data/ui/guis/optionsMenu.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(OptionsMenu) { +$guiContent = new GuiControl(OptionsMenu) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/data/ui/guis/optionsMenu.tscript b/Templates/BaseGame/game/data/ui/guis/optionsMenu.tscript index eba6e173b..d22d847c3 100644 --- a/Templates/BaseGame/game/data/ui/guis/optionsMenu.tscript +++ b/Templates/BaseGame/game/data/ui/guis/optionsMenu.tscript @@ -276,11 +276,8 @@ function OptionsMenu::applyDisplaySettings(%this) // Change the device. if ( %newDevice !$= $pref::Video::displayDevice ) { - if ( %testNeedApply ) - return true; - $pref::Video::displayDevice = %newDevice; - if( %newAdapter !$= getDisplayDeviceInformation() ) + if( %newDevice !$= getDisplayDeviceInformation() ) MessageBoxOK( "Change requires restart", "Please restart the game for a display device change to take effect." ); $changingDisplayDevice = %newDevice; @@ -368,10 +365,7 @@ function OptionsMenu::applyGraphicsSettings(%this) // Check the anisotropic filtering. %level = OptionsMenuSettingsList.getCurrentOption(10); if ( %level != $pref::Video::defaultAnisotropy ) - { - if ( %testNeedApply ) - return true; - + { $pref::Video::defaultAnisotropy = %level; } @@ -418,9 +412,6 @@ function updateDisplaySettings() if ( %newMode !$= $pref::Video::mode || %newDeviceID != $pref::Video::deviceId || %newVsync != $pref::Video::disableVerticalSync || %newDeviceMode != $pref::Video::deviceMode) { - if ( %testNeedApply ) - return true; - //****Edge Case Hack // If we're in fullscreen mode and switching to a different monitor at the // same resolution and maintaining fullscreen, GFX...WindowTarget::resetMode() @@ -433,7 +424,7 @@ function updateDisplaySettings() $pref::Video::deviceId = %newDeviceID; $pref::Video::deviceMode = $Video::ModeBorderless; %tmpModeStr = Canvas.getMonitorMode(%newDeviceID, 0); - Canvas.setVideoMode(%tmpModeStr.x, %tmpModeStr.y, false, 32, getWord(%tmpModeStr, $WORD::REFRESH), %aa); + Canvas.setVideoMode(%tmpModeStr.x, %tmpModeStr.y, false, 32, getWord(%tmpModeStr, $WORD::REFRESH), %newFSAA); } $pref::Video::mode = %newMode; @@ -459,6 +450,8 @@ function OptionsMenu::populateAudioSettingsList(%this) %buffer = sfxGetAvailableDevices(); %count = getRecordCount( %buffer ); %audioDriverList = ""; + %audioProviderList = ""; + %audioDeviceList = ""; $currentAudioProvider = $currentAudioProvider $= "" ? $pref::SFX::provider : $currentAudioProvider; diff --git a/Templates/BaseGame/game/data/ui/guis/pauseMenu.gui b/Templates/BaseGame/game/data/ui/guis/pauseMenu.gui index 987493ba9..80d6eb74d 100644 --- a/Templates/BaseGame/game/data/ui/guis/pauseMenu.gui +++ b/Templates/BaseGame/game/data/ui/guis/pauseMenu.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(PauseMenu) { +$guiContent = new GuiControl(PauseMenu) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/data/ui/guis/profiler.gui b/Templates/BaseGame/game/data/ui/guis/profiler.gui index 46628c6df..c6d97a26f 100644 --- a/Templates/BaseGame/game/data/ui/guis/profiler.gui +++ b/Templates/BaseGame/game/data/ui/guis/profiler.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ProfilerGui) { +$guiContent = new GuiControl(ProfilerGui) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/data/ui/guis/profiler.tscript b/Templates/BaseGame/game/data/ui/guis/profiler.tscript index bc73338bf..402f7b1f1 100644 --- a/Templates/BaseGame/game/data/ui/guis/profiler.tscript +++ b/Templates/BaseGame/game/data/ui/guis/profiler.tscript @@ -101,7 +101,7 @@ function showMetics(%var) GlobalActionMap.bind(keyboard, "ctrl F2", showMetics); -%guiContent = new GuiControl(FrameOverlayGui) { +$guiContent = new GuiControl(FrameOverlayGui) { profile = "GuiModelessDialogProfile"; horizSizing = "right"; vertSizing = "bottom"; diff --git a/Templates/BaseGame/game/data/ui/guis/remapConfirmDlg.gui b/Templates/BaseGame/game/data/ui/guis/remapConfirmDlg.gui index 6e32fd1ec..97f5a55c9 100644 --- a/Templates/BaseGame/game/data/ui/guis/remapConfirmDlg.gui +++ b/Templates/BaseGame/game/data/ui/guis/remapConfirmDlg.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(RemapConfirmDlg) { +$guiContent = new GuiControl(RemapConfirmDlg) { position = "0 0"; extent = "1024 768"; minExtent = "8 8"; diff --git a/Templates/BaseGame/game/data/ui/guis/remapDlg.gui b/Templates/BaseGame/game/data/ui/guis/remapDlg.gui index 71832d81c..900ae8e95 100644 --- a/Templates/BaseGame/game/data/ui/guis/remapDlg.gui +++ b/Templates/BaseGame/game/data/ui/guis/remapDlg.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(RemapDlg) { +$guiContent = new GuiControl(RemapDlg) { position = "0 0"; extent = "1024 768"; minExtent = "8 8"; diff --git a/Templates/BaseGame/game/data/ui/guis/startupGui.gui b/Templates/BaseGame/game/data/ui/guis/startupGui.gui index ad7afcf63..fd42c23bd 100644 --- a/Templates/BaseGame/game/data/ui/guis/startupGui.gui +++ b/Templates/BaseGame/game/data/ui/guis/startupGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiFadeinBitmapCtrl(StartupGui) { +$guiContent = new GuiFadeinBitmapCtrl(StartupGui) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/main.tscript.in b/Templates/BaseGame/game/main.tscript.in index f2cae0249..5d5569e7d 100644 --- a/Templates/BaseGame/game/main.tscript.in +++ b/Templates/BaseGame/game/main.tscript.in @@ -37,9 +37,8 @@ else //If nothing else set a main menu, try to do so now if(!isObject(Canvas.getContent())) { - %mainMenuGUI = ProjectSettings.value("UI/mainMenuName"); - if (isObject( %mainMenuGUI )) - Canvas.setContent( %mainMenuGUI ); + if (isObject( ProjectSettings.value("UI/mainMenuName") )) + Canvas.setContent( ProjectSettings.value("UI/mainMenuName") ); } } diff --git a/Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui b/Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui index 42c5eca6e..6d40a9164 100644 --- a/Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui +++ b/Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiContainer(NewEditorGui) { +$guiContent = new GuiContainer(NewEditorGui) { margin = "0 0 0 0"; padding = "0 0 0 0"; anchorTop = "1"; diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorToolbar.gui b/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorToolbar.gui index 76fa8aff7..57651df52 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorToolbar.gui +++ b/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorToolbar.gui @@ -3,7 +3,7 @@ // Copyright (C) - Violent Tulip //----------------------------------------------------------------------------- -%guiContent = new GuiControl(VPathEditorToolbar) +$guiContent = new GuiControl(VPathEditorToolbar) { canSaveDynamicFields = "0"; internalName = "VPathEditorToolbar"; diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui index 091288fe0..bb6f76885 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui +++ b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(VerveEditorGui) { +$guiContent = new GuiControl(VerveEditorGui) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorGroupBuilder.gui b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorGroupBuilder.gui index 7b041f7f6..19076f551 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorGroupBuilder.gui +++ b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorGroupBuilder.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { +$guiContent = new GuiControl(VerveEditorGroupBuilderGUI) { isContainer = "1"; Profile = "GuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorImportPathNodes.gui b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorImportPathNodes.gui index 6ec7b430c..9309ee64f 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorImportPathNodes.gui +++ b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorImportPathNodes.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { +$guiContent = new GuiControl(VerveEditorImportPathNodesGUI) { isContainer = "1"; Profile = "GuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorPreferences.gui b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorPreferences.gui index 31579a5fb..417f15908 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorPreferences.gui +++ b/Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorPreferences.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(VerveEditorPreferenceGui) { +$guiContent = new GuiControl(VerveEditorPreferenceGui) { canSaveDynamicFields = "0"; isContainer = "1"; Profile = "GuiDefaultProfile"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/AssetImportConfigEditor.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/AssetImportConfigEditor.gui index 4bffe1234..d7844261c 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/AssetImportConfigEditor.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/AssetImportConfigEditor.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetImportConfigEditor) { +$guiContent = new GuiControl(AssetImportConfigEditor) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/GameObjectCreator.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/GameObjectCreator.gui index 6ade66e95..4b1894812 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/GameObjectCreator.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/GameObjectCreator.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(GameObjectCreator) { +$guiContent = new GuiControl(GameObjectCreator) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/addModuleWindow.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/addModuleWindow.gui index e8f35a13a..d6f2acc1f 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/addModuleWindow.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/addModuleWindow.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetBrowser_AddModule) { +$guiContent = new GuiControl(AssetBrowser_AddModule) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/addPackageWindow.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/addPackageWindow.gui index 48a48f5be..1bf51e529 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/addPackageWindow.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/addPackageWindow.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetBrowser_AddPackage) { +$guiContent = new GuiControl(AssetBrowser_AddPackage) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui index 40d772206..8a831a68d 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetBrowser) { +$guiContent = new GuiControl(AssetBrowser) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui index 1e4913025..5e8ab8dec 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetImportCtrl) { +$guiContent = new GuiControl(AssetImportCtrl) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/assetImportLog.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/assetImportLog.gui index 14935f2b1..81aca8284 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/assetImportLog.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/assetImportLog.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetBrowserImportLog) { +$guiContent = new GuiControl(AssetBrowserImportLog) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/assetNameEdit.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/assetNameEdit.gui index e99e12118..4e6ddfe69 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/assetNameEdit.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/assetNameEdit.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetBrowser_assetNameEdit) { +$guiContent = new GuiControl(AssetBrowser_assetNameEdit) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui index 2ee3b1cdc..803f71ba5 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetPreviewButtonsTemplate) { +$guiContent = new GuiControl(AssetPreviewButtonsTemplate) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/createNewCollectionSet.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/createNewCollectionSet.gui index faa48bd6e..9317d8bec 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/createNewCollectionSet.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/createNewCollectionSet.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(CreateNewCollectionSetCtrl) { +$guiContent = new GuiControl(CreateNewCollectionSetCtrl) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/editAsset.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/editAsset.gui index 180b4b5d7..9ac2e2ef2 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/editAsset.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/editAsset.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetBrowser_editAsset) { +$guiContent = new GuiControl(AssetBrowser_editAsset) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/editModule.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/editModule.gui index 18927399f..c2a59f6ef 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/editModule.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/editModule.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetBrowser_editModule) { +$guiContent = new GuiControl(AssetBrowser_editModule) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/looseFileAudit.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/looseFileAudit.gui index b4d6d1cce..2bc3d46ee 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/looseFileAudit.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/looseFileAudit.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(LooseFileAudit) { +$guiContent = new GuiControl(LooseFileAudit) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui index e7efb40d4..38d7b2449 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetBrowser_newAsset) { +$guiContent = new GuiControl(AssetBrowser_newAsset) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/newComponentAsset.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/newComponentAsset.gui index 37e6fc4a1..9fc756fd1 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/newComponentAsset.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/newComponentAsset.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetBrowser_newComponentAsset) { +$guiContent = new GuiControl(AssetBrowser_newComponentAsset) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/newFolder.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/newFolder.gui index ff1509cb4..7030b5e40 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/newFolder.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/newFolder.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetBrowser_newFolder) { +$guiContent = new GuiControl(AssetBrowser_newFolder) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/selectModule.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/selectModule.gui index ed907fbd9..9795c8a74 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/selectModule.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/selectModule.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetBrowser_SelectModule) { +$guiContent = new GuiControl(AssetBrowser_SelectModule) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/selectPackage.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/selectPackage.gui index c31dbf53e..a74dbf594 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/selectPackage.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/selectPackage.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssetBrowser_SelectPackage) { +$guiContent = new GuiControl(AssetBrowser_SelectPackage) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/selectPath.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/selectPath.gui index 21949c518..5bdb39b21 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/selectPath.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/selectPath.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(SelectAssetPath) { +$guiContent = new GuiControl(SelectAssetPath) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/guiFile.gui.template b/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/guiFile.gui.template index 63dc722d2..5224885a7 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/guiFile.gui.template +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/guiFile.gui.template @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(@@) +$guiContent = new GuiControl(@@) { position = "0 0"; extent = "100 100"; diff --git a/Templates/BaseGame/game/tools/componentEditor/gui/TypeMaskFieldGui.gui b/Templates/BaseGame/game/tools/componentEditor/gui/TypeMaskFieldGui.gui index a18277419..a5ce9d51b 100644 --- a/Templates/BaseGame/game/tools/componentEditor/gui/TypeMaskFieldGui.gui +++ b/Templates/BaseGame/game/tools/componentEditor/gui/TypeMaskFieldGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(TypeMaskFieldGui) { +$guiContent = new GuiControl(TypeMaskFieldGui) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/componentEditor/gui/superToolTipDlg.ed.gui b/Templates/BaseGame/game/tools/componentEditor/gui/superToolTipDlg.ed.gui index ef506941a..a0a79e60b 100644 --- a/Templates/BaseGame/game/tools/componentEditor/gui/superToolTipDlg.ed.gui +++ b/Templates/BaseGame/game/tools/componentEditor/gui/superToolTipDlg.ed.gui @@ -1,4 +1,4 @@ -%guiContent = new GuiControl(SuperTooltipDlg) { +$guiContent = new GuiControl(SuperTooltipDlg) { canSaveDynamicFields = "0"; Profile = "GuiTransparentProfileModeless"; class = "SuperTooltip"; diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui index f28b3b5b4..07ecfc7be 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) { +$guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorSettingsTab.ed.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorSettingsTab.ed.gui index 3cd3a1ebd..b77d68f85 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorSettingsTab.ed.gui +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorSettingsTab.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ConvexEditorSettingsTab,EditorGuiGroup) { +$guiContent = new GuiControl(ConvexEditorSettingsTab,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui index 2e737c942..aad716277 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(convexEditorToolbar, EditorGuiGroup) { +$guiContent = new GuiControl(convexEditorToolbar, EditorGuiGroup) { canSaveDynamicFields = "0"; internalName = ""; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorCreatePrompt.ed.gui b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorCreatePrompt.ed.gui index e8c3b5adb..5f1783390 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorCreatePrompt.ed.gui +++ b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorCreatePrompt.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(DatablockEditorCreatePrompt,EditorGuiGroup) { +$guiContent = new GuiControl(DatablockEditorCreatePrompt,EditorGuiGroup) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui index 5a68c4df2..2fce2fb25 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui +++ b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl() { +$guiContent = new GuiControl() { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui index d07a4158d..67d71544d 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui +++ b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl() { +$guiContent = new GuiControl() { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/debugger/gui/breakConditionDlg.ed.gui b/Templates/BaseGame/game/tools/debugger/gui/breakConditionDlg.ed.gui index d6355e58f..9a5c53881 100644 --- a/Templates/BaseGame/game/tools/debugger/gui/breakConditionDlg.ed.gui +++ b/Templates/BaseGame/game/tools/debugger/gui/breakConditionDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(DebuggerBreakConditionDlg, EditorGuiGroup) { +$guiContent = new GuiControl(DebuggerBreakConditionDlg, EditorGuiGroup) { profile = "ToolsGuiDefaultProfile"; horizSizing = "right"; vertSizing = "bottom"; diff --git a/Templates/BaseGame/game/tools/debugger/gui/connectDlg.ed.gui b/Templates/BaseGame/game/tools/debugger/gui/connectDlg.ed.gui index 927312fed..5d72d44ee 100644 --- a/Templates/BaseGame/game/tools/debugger/gui/connectDlg.ed.gui +++ b/Templates/BaseGame/game/tools/debugger/gui/connectDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(DebuggerConnectDlg, EditorGuiGroup) { +$guiContent = new GuiControl(DebuggerConnectDlg, EditorGuiGroup) { profile = "ToolsGuiDefaultProfile"; horizSizing = "right"; vertSizing = "bottom"; diff --git a/Templates/BaseGame/game/tools/debugger/gui/debugger.ed.gui b/Templates/BaseGame/game/tools/debugger/gui/debugger.ed.gui index 616a8f0fb..6efe6786c 100644 --- a/Templates/BaseGame/game/tools/debugger/gui/debugger.ed.gui +++ b/Templates/BaseGame/game/tools/debugger/gui/debugger.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(DebuggerGui, EditorGuiGroup) { +$guiContent = new GuiControl(DebuggerGui, EditorGuiGroup) { profile = "ToolsGuiWindowProfile"; horizSizing = "right"; vertSizing = "bottom"; diff --git a/Templates/BaseGame/game/tools/debugger/gui/editWatchDlg.ed.gui b/Templates/BaseGame/game/tools/debugger/gui/editWatchDlg.ed.gui index d1d5ebe4e..e53a8c7c8 100644 --- a/Templates/BaseGame/game/tools/debugger/gui/editWatchDlg.ed.gui +++ b/Templates/BaseGame/game/tools/debugger/gui/editWatchDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(DebuggerEditWatchDlg, EditorGuiGroup) { +$guiContent = new GuiControl(DebuggerEditWatchDlg, EditorGuiGroup) { profile = "ToolsGuiDefaultProfile"; horizSizing = "right"; vertSizing = "bottom"; diff --git a/Templates/BaseGame/game/tools/debugger/gui/findDlg.ed.gui b/Templates/BaseGame/game/tools/debugger/gui/findDlg.ed.gui index 5a74273d5..a16b9784b 100644 --- a/Templates/BaseGame/game/tools/debugger/gui/findDlg.ed.gui +++ b/Templates/BaseGame/game/tools/debugger/gui/findDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(DebuggerFindDlg, EditorGuiGroup) { +$guiContent = new GuiControl(DebuggerFindDlg, EditorGuiGroup) { profile = "ToolsGuiDefaultProfile"; horizSizing = "right"; vertSizing = "bottom"; diff --git a/Templates/BaseGame/game/tools/debugger/gui/watchDlg.ed.gui b/Templates/BaseGame/game/tools/debugger/gui/watchDlg.ed.gui index 898563807..2bd913b85 100644 --- a/Templates/BaseGame/game/tools/debugger/gui/watchDlg.ed.gui +++ b/Templates/BaseGame/game/tools/debugger/gui/watchDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(DebuggerWatchDlg, EditorGuiGroup) { +$guiContent = new GuiControl(DebuggerWatchDlg, EditorGuiGroup) { profile = "ToolsGuiDefaultProfile"; horizSizing = "right"; vertSizing = "bottom"; diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui index 919291d2c..816bb0cc2 100644 --- a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui +++ b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { +$guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/forestEditor/forestEditToolbar.ed.gui b/Templates/BaseGame/game/tools/forestEditor/forestEditToolbar.ed.gui index 782383121..5b6911a9b 100644 --- a/Templates/BaseGame/game/tools/forestEditor/forestEditToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/forestEditor/forestEditToolbar.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ForestEditToolbar,EditorGuiGroup) { +$guiContent = new GuiControl(ForestEditToolbar,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui index e46a09f3d..a663c9d0b 100644 --- a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui +++ b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { +$guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { renderMissionArea = "0"; missionAreaFillColor = "255 0 0 20"; missionAreaFrameColor = "255 0 0 128"; diff --git a/Templates/BaseGame/game/tools/gui/EditorLoadingGui.gui b/Templates/BaseGame/game/tools/gui/EditorLoadingGui.gui index 5d7152e44..e5950b677 100644 --- a/Templates/BaseGame/game/tools/gui/EditorLoadingGui.gui +++ b/Templates/BaseGame/game/tools/gui/EditorLoadingGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(EditorLoadingGui,EditorGuiGroup) { +$guiContent = new GuiControl(EditorLoadingGui,EditorGuiGroup) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui b/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui index 3d5d939ad..93010d0e1 100644 --- a/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui +++ b/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { +$guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/gui/GuiEaseEditDlg.ed.gui b/Templates/BaseGame/game/tools/gui/GuiEaseEditDlg.ed.gui index 4c76d8388..abe4422e1 100644 --- a/Templates/BaseGame/game/tools/gui/GuiEaseEditDlg.ed.gui +++ b/Templates/BaseGame/game/tools/gui/GuiEaseEditDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(GuiEaseEditDlg,EditorGuiGroup) { +$guiContent = new GuiControl(GuiEaseEditDlg,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/gui/assimpImport.ed.gui b/Templates/BaseGame/game/tools/gui/assimpImport.ed.gui index a9ba1f768..dcee11033 100644 --- a/Templates/BaseGame/game/tools/gui/assimpImport.ed.gui +++ b/Templates/BaseGame/game/tools/gui/assimpImport.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AssimpImportDlg,EditorGuiGroup) { +$guiContent = new GuiControl(AssimpImportDlg,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "width"; diff --git a/Templates/BaseGame/game/tools/gui/colladaImport.ed.gui b/Templates/BaseGame/game/tools/gui/colladaImport.ed.gui index d098bffe6..4eb34b486 100644 --- a/Templates/BaseGame/game/tools/gui/colladaImport.ed.gui +++ b/Templates/BaseGame/game/tools/gui/colladaImport.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ColladaImportDlg,EditorGuiGroup) { +$guiContent = new GuiControl(ColladaImportDlg,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "width"; @@ -1754,8 +1754,8 @@ function convertColladaModels(%pattern) function showImportDialog(%shapePath, %cmd) { - %this.path = %shapePath; - %this.cmd = %cmd; + ColladaImportDlg.path = %shapePath; + ColladaImportDlg.cmd = %cmd; if ( fileExt(%shapePath) $= ".dts" || fileExt(%shapePath) $= ".dsq" || fileExt(%shapePath) $= ".dae" || fileExt(%shapePath) $= ".kmz" ) diff --git a/Templates/BaseGame/game/tools/gui/colorPicker.ed.gui b/Templates/BaseGame/game/tools/gui/colorPicker.ed.gui index 0d4f7a975..f390cf95e 100644 --- a/Templates/BaseGame/game/tools/gui/colorPicker.ed.gui +++ b/Templates/BaseGame/game/tools/gui/colorPicker.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { +$guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { displayMode = "Dropper"; // this makes the background visible actionOnMove = "1"; position = "0 0"; diff --git a/Templates/BaseGame/game/tools/gui/cubemapEditor.gui b/Templates/BaseGame/game/tools/gui/cubemapEditor.gui index 26ae7877d..d273e13e9 100644 --- a/Templates/BaseGame/game/tools/gui/cubemapEditor.gui +++ b/Templates/BaseGame/game/tools/gui/cubemapEditor.gui @@ -1,4 +1,4 @@ -%guiContent = new GuiControl(CubemapEditor) { +$guiContent = new GuiControl(CubemapEditor) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/gui/fileDialogBase.ed.tscript b/Templates/BaseGame/game/tools/gui/fileDialogBase.ed.tscript index 9d40e0434..7d36db457 100644 --- a/Templates/BaseGame/game/tools/gui/fileDialogBase.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/fileDialogBase.ed.tscript @@ -255,8 +255,7 @@ function FileDialogOkButton::onClick( %this ) // Callback eval( %this.parent.SuccessCallback @ "(\"" @ %fullPath @"\");" ); - - %parent.SuccessCallback = 0; + %this.parent.SuccessCallback = 0; //error("Ok"); diff --git a/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui b/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui index 596e8e216..653fedee3 100644 --- a/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui +++ b/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiWindowCollapseCtrl() { +$guiContent = new GuiWindowCollapseCtrl() { collapseGroup = "-1"; collapseGroupNum = "-1"; resizeWidth = "1"; diff --git a/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript b/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript index 33b65f6bd..28b2d0d68 100644 --- a/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript @@ -37,7 +37,7 @@ function inspectObject( %object ) // Create a new object inspector window. exec( "./guiObjectInspector.ed.gui" ); - if( !isObject( %guiContent) ) + if( !isObject( $guiContent) ) { error( "InspectObject: failed to create GUI from 'guiObjectInspector.ed.gui'" ); return; @@ -45,9 +45,9 @@ function inspectObject( %object ) // Initialize the inspector. - %guiContent.init( %object ); + $guiContent.init( %object ); - Canvas.getContent().add( %guiContent ); + Canvas.getContent().add( $guiContent ); } //============================================================================================= diff --git a/Templates/BaseGame/game/tools/gui/materialSelector.ed.gui b/Templates/BaseGame/game/tools/gui/materialSelector.ed.gui index b3ad85549..a7c36de34 100644 --- a/Templates/BaseGame/game/tools/gui/materialSelector.ed.gui +++ b/Templates/BaseGame/game/tools/gui/materialSelector.ed.gui @@ -778,6 +778,8 @@ function MaterialSelector::buildStaticFilters( %this ) // if you want to add any more containers to staticFilterObjects, here's // where to do it + %filterArray = MaterialSelector-->filterArray; + %staticFilterContainer = new GuiControl (){ new GuiContainer(){ profile = "ToolsGuiDefaultProfile"; @@ -1366,7 +1368,7 @@ function MaterialSelector::loadMaterialFilters( %this ) // create category and update current material if there is one function MaterialSelector::createFilter( %this, %filter ) { - if( %filter $= %existingFilters ) + if( %filter $= "" ) { toolsMessageBoxOK( "Error", "Can not create blank filter."); return; diff --git a/Templates/BaseGame/game/tools/gui/messageBoxes/IODropdownDlg.ed.gui b/Templates/BaseGame/game/tools/gui/messageBoxes/IODropdownDlg.ed.gui index a65acf0b0..e62771773 100644 --- a/Templates/BaseGame/game/tools/gui/messageBoxes/IODropdownDlg.ed.gui +++ b/Templates/BaseGame/game/tools/gui/messageBoxes/IODropdownDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(IODropdownDlg) { +$guiContent = new GuiControl(IODropdownDlg) { profile = "GuiDefaultProfile"; horizSizing = "width"; vertSizing = "height"; diff --git a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOK.ed.gui b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOK.ed.gui index f1f2beb76..9ec300d92 100644 --- a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOK.ed.gui +++ b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOK.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(toolsMessageBoxOKDlg) { +$guiContent = new GuiControl(toolsMessageBoxOKDlg) { profile = "GuiOverlayProfile"; horizSizing = "width"; vertSizing = "height"; diff --git a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKBuy.ed.gui b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKBuy.ed.gui index 176f47a1e..befe7e2fe 100644 --- a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKBuy.ed.gui +++ b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKBuy.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(toolsMessageBoxOKBuyDlg) { +$guiContent = new GuiControl(toolsMessageBoxOKBuyDlg) { profile = "ToolsGuiDefaultProfile"; horizSizing = "width"; vertSizing = "height"; diff --git a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancel.ed.gui b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancel.ed.gui index 2fc84fa07..9fb96b373 100644 --- a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancel.ed.gui +++ b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancel.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(toolsMessageBoxOKCancelDlg) { +$guiContent = new GuiControl(toolsMessageBoxOKCancelDlg) { profile = "GuiOverlayProfile"; horizSizing = "width"; vertSizing = "height"; diff --git a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancelDetailsDlg.ed.gui b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancelDetailsDlg.ed.gui index 83d810b4a..0e38c2e4f 100644 --- a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancelDetailsDlg.ed.gui +++ b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancelDetailsDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(toolsMessageBoxOKCancelDetailsDlg) { +$guiContent = new GuiControl(toolsMessageBoxOKCancelDetailsDlg) { canSaveDynamicFields = "0"; Profile = "GuiOverlayProfile"; HorizSizing = "width"; diff --git a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNo.ed.gui b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNo.ed.gui index 83cc0f1b5..d9d5b45bd 100644 --- a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNo.ed.gui +++ b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNo.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(toolsMessageBoxYesNoDlg) { +$guiContent = new GuiControl(toolsMessageBoxYesNoDlg) { profile = "GuiOverlayProfile"; horizSizing = "width"; vertSizing = "height"; diff --git a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNoCancel.ed.gui b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNoCancel.ed.gui index 9a707cdca..89e63cb87 100644 --- a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNoCancel.ed.gui +++ b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNoCancel.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(toolsMessageBoxYesNoCancelDlg) { +$guiContent = new GuiControl(toolsMessageBoxYesNoCancelDlg) { canSaveDynamicFields = "0"; Profile = "GuiOverlayProfile"; HorizSizing = "width"; diff --git a/Templates/BaseGame/game/tools/gui/messageBoxes/messagePopup.ed.gui b/Templates/BaseGame/game/tools/gui/messageBoxes/messagePopup.ed.gui index 317bbc7d1..475bb928a 100644 --- a/Templates/BaseGame/game/tools/gui/messageBoxes/messagePopup.ed.gui +++ b/Templates/BaseGame/game/tools/gui/messageBoxes/messagePopup.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(MessagePopupDlg) { +$guiContent = new GuiControl(MessagePopupDlg) { profile = "GuiDefaultProfile"; horizSizing = "width"; vertSizing = "height"; diff --git a/Templates/BaseGame/game/tools/gui/postFxEditor.gui b/Templates/BaseGame/game/tools/gui/postFxEditor.gui index 4827435da..7d53b9869 100644 --- a/Templates/BaseGame/game/tools/gui/postFxEditor.gui +++ b/Templates/BaseGame/game/tools/gui/postFxEditor.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(postFXEditor) { +$guiContent = new GuiControl(postFXEditor) { position = "0 0"; extent = "1920 1200"; minExtent = "8 8"; diff --git a/Templates/BaseGame/game/tools/gui/profilerGraph.gui b/Templates/BaseGame/game/tools/gui/profilerGraph.gui index 8e2e2b68f..0a2fc44ab 100644 --- a/Templates/BaseGame/game/tools/gui/profilerGraph.gui +++ b/Templates/BaseGame/game/tools/gui/profilerGraph.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ProfilerGraphGui) { +$guiContent = new GuiControl(ProfilerGraphGui) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/gui/renderTargetVisualizer.ed.gui b/Templates/BaseGame/game/tools/gui/renderTargetVisualizer.ed.gui index f0f829253..79007fda4 100644 --- a/Templates/BaseGame/game/tools/gui/renderTargetVisualizer.ed.gui +++ b/Templates/BaseGame/game/tools/gui/renderTargetVisualizer.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(RenderTargetVisualizer) { +$guiContent = new GuiControl(RenderTargetVisualizer) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/gui/saveChangesMBDlg.ed.gui b/Templates/BaseGame/game/tools/gui/saveChangesMBDlg.ed.gui index b6bd3641d..3c7e26fd3 100644 --- a/Templates/BaseGame/game/tools/gui/saveChangesMBDlg.ed.gui +++ b/Templates/BaseGame/game/tools/gui/saveChangesMBDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(toolsMessageBoxSaveChangesDlg, EditorGuiGroup) { +$guiContent = new GuiControl(toolsMessageBoxSaveChangesDlg, EditorGuiGroup) { canSaveDynamicFields = "0"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "width"; diff --git a/Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui b/Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui index 2eca2d3ba..119e812ea 100644 --- a/Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui +++ b/Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ScriptEditorDlg,EditorGuiGroup) { +$guiContent = new GuiControl(ScriptEditorDlg,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultNonModalProfile"; HorizSizing = "width"; diff --git a/Templates/BaseGame/game/tools/gui/simViewDlg.ed.gui b/Templates/BaseGame/game/tools/gui/simViewDlg.ed.gui index 14bc25b57..2ec6b5a71 100644 --- a/Templates/BaseGame/game/tools/gui/simViewDlg.ed.gui +++ b/Templates/BaseGame/game/tools/gui/simViewDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(simViewDlg, EditorGuiGroup) { +$guiContent = new GuiControl(simViewDlg, EditorGuiGroup) { canSaveDynamicFields = "0"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/guiEditor/gui/EditorChooseGUI.ed.gui b/Templates/BaseGame/game/tools/guiEditor/gui/EditorChooseGUI.ed.gui index 02d9e04b3..0187020e5 100644 --- a/Templates/BaseGame/game/tools/guiEditor/gui/EditorChooseGUI.ed.gui +++ b/Templates/BaseGame/game/tools/guiEditor/gui/EditorChooseGUI.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiChunkedBitmapCtrl(EditorChooseGUI, EditorGuiGroup) { +$guiContent = new GuiChunkedBitmapCtrl(EditorChooseGUI, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui b/Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui index 9426a7fdd..3c24eb885 100644 --- a/Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui +++ b/Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui @@ -3,7 +3,7 @@ // Copyright (C) GarageGames.com, Inc. //--------------------------------------------------------------------------------------------- -%guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { +$guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { canSaveDynamicFields = "0"; isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; diff --git a/Templates/BaseGame/game/tools/guiEditor/gui/guiEditorNewGuiDialog.ed.gui b/Templates/BaseGame/game/tools/guiEditor/gui/guiEditorNewGuiDialog.ed.gui index 98252410a..1e224911d 100644 --- a/Templates/BaseGame/game/tools/guiEditor/gui/guiEditorNewGuiDialog.ed.gui +++ b/Templates/BaseGame/game/tools/guiEditor/gui/guiEditorNewGuiDialog.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(GuiEditorNewGuiDialog,EditorGuiGroup) { +$guiContent = new GuiControl(GuiEditorNewGuiDialog,EditorGuiGroup) { isContainer = "1"; profile = "ToolsGuiOverlayProfile"; horizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/guiEditor/gui/guiEditorPrefsDlg.ed.gui b/Templates/BaseGame/game/tools/guiEditor/gui/guiEditorPrefsDlg.ed.gui index 6f901d1a8..5ddf53f6d 100644 --- a/Templates/BaseGame/game/tools/guiEditor/gui/guiEditorPrefsDlg.ed.gui +++ b/Templates/BaseGame/game/tools/guiEditor/gui/guiEditorPrefsDlg.ed.gui @@ -1,4 +1,4 @@ -%guiContent = new GuiControl(GuiEditorPrefsDlg, EditorGuiGroup) { +$guiContent = new GuiControl(GuiEditorPrefsDlg, EditorGuiGroup) { canSaveDynamicFields = "0"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/guiEditor/gui/guiEditorSelectDlg.ed.gui b/Templates/BaseGame/game/tools/guiEditor/gui/guiEditorSelectDlg.ed.gui index 1794a238d..148b77554 100644 --- a/Templates/BaseGame/game/tools/guiEditor/gui/guiEditorSelectDlg.ed.gui +++ b/Templates/BaseGame/game/tools/guiEditor/gui/guiEditorSelectDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(GuiEditorSelectDlgContainer,EditorGuiGroup) { +$guiContent = new GuiControl(GuiEditorSelectDlgContainer,EditorGuiGroup) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/EditorChooseGUI.ed.tscript b/Templates/BaseGame/game/tools/guiEditor/scripts/EditorChooseGUI.ed.tscript index 698d38bbf..00ec3e024 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/EditorChooseGUI.ed.tscript +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/EditorChooseGUI.ed.tscript @@ -49,7 +49,7 @@ function GE_OpenGUIFile() // The level file should have contained a scenegraph, which should now be in the instant // group. And, it should be the only thing in the group. - if( !isObject( %guiContent ) ) + if( !isObject( $guiContent ) ) { toolsMessageBox( getEngineName(), "You have loaded a Gui file that was created before this version. It has been loaded but you must open it manually from the content list dropdown", @@ -58,7 +58,7 @@ function GE_OpenGUIFile() return 0; } - GuiEditContent( %guiContent ); + GuiEditContent( $guiContent ); } function GE_GUIList::onURL(%this, %url) diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript index 450920e6f..1fbe50c12 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript @@ -281,7 +281,7 @@ function GuiEditCanvas::load( %this, %filename ) // The GUI file should have contained a GUIControl which should now be in the instant // group. And, it should be the only thing in the group. - if( !isObject( %guiContent ) ) + if( !isObject( $guiContent ) ) { toolsMessageBox( getEngineName(), "You have loaded a Gui file that was created before this version. It has been loaded but you must open it manually from the content list dropdown", @@ -289,7 +289,7 @@ function GuiEditCanvas::load( %this, %filename ) return 0; } - GuiEditor.openForEditing( %guiContent ); + GuiEditor.openForEditing( $guiContent ); GuiEditorStatusBar.print( "Loaded '" @ %filename @ "'" ); } @@ -449,7 +449,7 @@ function GuiEditCanvas::save( %this, %selectedOnly, %noPrompt ) %fo.writeLine( %beforeNewFileLines[ %i ] ); %fo.writeLine("//--- OBJECT WRITE BEGIN ---"); - %fo.writeObject(%currentObject, "%guiContent = "); + %fo.writeObject(%currentObject, "$guiContent = "); %fo.writeLine("//--- OBJECT WRITE END ---"); // Write out captured TorqueScript below Gui object @@ -488,19 +488,19 @@ function GuiEditCanvas::append( %this ) // Find guiContent. - if( !isObject( %guiContent ) ) + if( !isObject( $guiContent ) ) { toolsMessageBox( "Error loading GUI file", "The GUI content controls could not be found. This function can only be used with files saved by the GUI editor.", "Ok", "Error" ); return; } if( !GuiEditorContent.getCount() ) - GuiEditor.openForEditing( %guiContent ); + GuiEditor.openForEditing( $guiContent ); else { - GuiEditor.getCurrentAddSet().add( %guiContent ); - GuiEditor.readGuides( %guiContent ); - GuiEditor.onAddNewCtrl( %guiContent ); + GuiEditor.getCurrentAddSet().add( $guiContent ); + GuiEditor.readGuides( $guiContent ); + GuiEditor.onAddNewCtrl( $guiContent ); GuiEditor.onHierarchyChanged(); } diff --git a/Templates/BaseGame/game/tools/main.tscript b/Templates/BaseGame/game/tools/main.tscript index 36c7844c4..e2cfad1b2 100644 --- a/Templates/BaseGame/game/tools/main.tscript +++ b/Templates/BaseGame/game/tools/main.tscript @@ -252,7 +252,7 @@ function EditorCreateFakeGameSession(%fileName) $Game::MissionGroup = "MissionGroup"; - exec(%file); + exec(%fileName); } function fastLoadWorldEdit(%val) diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/MaterialToolbar.ed.gui b/Templates/BaseGame/game/tools/materialEditor/gui/MaterialToolbar.ed.gui index efc140578..64bf201d7 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/MaterialToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/materialEditor/gui/MaterialToolbar.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(MaterialEditorToolbar) { +$guiContent = new GuiControl(MaterialEditorToolbar) { canSaveDynamicFields = "0"; internalName = "ShapeEditorToolbar"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui index 8b6dedb44..e7606081e 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui +++ b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl() { +$guiContent = new GuiControl() { canSaveDynamicFields = "0"; internalName = "MatEdPreviewWindowContainer"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui index 8882e1728..93a1f190f 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui +++ b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { +$guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSaveDynamicFields = "0"; internalName = "MatEdPropertiesWindowContainer"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/materialInstancesView.ed.gui b/Templates/BaseGame/game/tools/materialEditor/gui/materialInstancesView.ed.gui index ce5c683de..9e34544b5 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/materialInstancesView.ed.gui +++ b/Templates/BaseGame/game/tools/materialEditor/gui/materialInstancesView.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(MaterialInstanceViewCtrl) { +$guiContent = new GuiControl(MaterialInstanceViewCtrl) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui index 14bc92d2a..6d50e7fbc 100644 --- a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui +++ b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { +$guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorSettingsTab.gui b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorSettingsTab.gui index 81485d307..9b01c4c33 100644 --- a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorSettingsTab.gui +++ b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorSettingsTab.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(MeshRoadEditorSettingsTab,EditorGuiGroup) { +$guiContent = new GuiControl(MeshRoadEditorSettingsTab,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorToolbar.gui b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorToolbar.gui index 14444b62d..5266570ae 100644 --- a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorToolbar.gui +++ b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorToolbar.gui @@ -1,4 +1,4 @@ -%guiContent = new GuiControl(MeshRoadEditorToolbar,EditorGuiGroup) { +$guiContent = new GuiControl(MeshRoadEditorToolbar,EditorGuiGroup) { canSaveDynamicFields = "0"; internalName = "MeshRoadEditorToolbar"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui index 03e8fdfe5..754ec57f6 100644 --- a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui +++ b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) { +$guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/navEditor/CreateNewNavMeshDlg.gui b/Templates/BaseGame/game/tools/navEditor/CreateNewNavMeshDlg.gui index 906990409..412eacaa3 100644 --- a/Templates/BaseGame/game/tools/navEditor/CreateNewNavMeshDlg.gui +++ b/Templates/BaseGame/game/tools/navEditor/CreateNewNavMeshDlg.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(CreateNewNavMeshDlg) { +$guiContent = new GuiControl(CreateNewNavMeshDlg) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/navEditor/NavEditorConsoleDlg.gui b/Templates/BaseGame/game/tools/navEditor/NavEditorConsoleDlg.gui index 19c063d7a..4fbdfc100 100644 --- a/Templates/BaseGame/game/tools/navEditor/NavEditorConsoleDlg.gui +++ b/Templates/BaseGame/game/tools/navEditor/NavEditorConsoleDlg.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiWindowCtrl(NavEditorConsoleDlg) { +$guiContent = new GuiWindowCtrl(NavEditorConsoleDlg) { text = "Nav Console"; resizeWidth = "1"; resizeHeight = "1"; diff --git a/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui b/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui index e00dbf991..f415a43fa 100644 --- a/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui +++ b/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { +$guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/navEditor/NavEditorSettingsTab.gui b/Templates/BaseGame/game/tools/navEditor/NavEditorSettingsTab.gui index 1cbe2a81e..9aafcd0b9 100644 --- a/Templates/BaseGame/game/tools/navEditor/NavEditorSettingsTab.gui +++ b/Templates/BaseGame/game/tools/navEditor/NavEditorSettingsTab.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiTabPageCtrl(ENavEditorSettingsPage) { +$guiContent = new GuiTabPageCtrl(ENavEditorSettingsPage) { fitBook = "1"; text = "Navigation Editor"; maxLength = "1024"; diff --git a/Templates/BaseGame/game/tools/navEditor/NavEditorToolbar.gui b/Templates/BaseGame/game/tools/navEditor/NavEditorToolbar.gui index b38fd953a..cdee55fb9 100644 --- a/Templates/BaseGame/game/tools/navEditor/NavEditorToolbar.gui +++ b/Templates/BaseGame/game/tools/navEditor/NavEditorToolbar.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(NavEditorToolbar,EditorGuiGroup) { +$guiContent = new GuiControl(NavEditorToolbar,EditorGuiGroup) { position = "306 0"; extent = "800 32"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui b/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui index e24bc379a..9cd6f594c 100644 --- a/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui +++ b/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui @@ -20,7 +20,7 @@ $PE_guielement_pos_colorpicker = "158 0"; $PE_guielement_ext_colorpicker = "18 18"; //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiWindowCollapseCtrl(PE_Window) { +$guiContent = new GuiWindowCollapseCtrl(PE_Window) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui b/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui index 1a6831489..7645b8855 100644 --- a/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui +++ b/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { +$guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/riverEditor/RiverEditorSettingsTab.gui b/Templates/BaseGame/game/tools/riverEditor/RiverEditorSettingsTab.gui index 553e2d7c6..c1c6d37ed 100644 --- a/Templates/BaseGame/game/tools/riverEditor/RiverEditorSettingsTab.gui +++ b/Templates/BaseGame/game/tools/riverEditor/RiverEditorSettingsTab.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(RiverEditorSettingsTab,EditorGuiGroup) { +$guiContent = new GuiControl(RiverEditorSettingsTab,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/riverEditor/RiverEditorToolbar.gui b/Templates/BaseGame/game/tools/riverEditor/RiverEditorToolbar.gui index 141e577d1..f938acfdf 100644 --- a/Templates/BaseGame/game/tools/riverEditor/RiverEditorToolbar.gui +++ b/Templates/BaseGame/game/tools/riverEditor/RiverEditorToolbar.gui @@ -1,4 +1,4 @@ -%guiContent = new GuiControl(RiverEditorToolbar, EditorGuiGroup) { +$guiContent = new GuiControl(RiverEditorToolbar, EditorGuiGroup) { canSaveDynamicFields = "0"; internalName = "MeshRoadEditorToolbar"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui b/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui index 7f9eba0f6..93767d251 100644 --- a/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui +++ b/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { +$guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/roadEditor/RoadEditorSettingsTab.gui b/Templates/BaseGame/game/tools/roadEditor/RoadEditorSettingsTab.gui index b37485cda..b2d2ae39a 100644 --- a/Templates/BaseGame/game/tools/roadEditor/RoadEditorSettingsTab.gui +++ b/Templates/BaseGame/game/tools/roadEditor/RoadEditorSettingsTab.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(RoadEditorSettingsTab,EditorGuiGroup) { +$guiContent = new GuiControl(RoadEditorSettingsTab,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/roadEditor/RoadEditorToolbar.gui b/Templates/BaseGame/game/tools/roadEditor/RoadEditorToolbar.gui index bfa2e0513..dbe3fdc8e 100644 --- a/Templates/BaseGame/game/tools/roadEditor/RoadEditorToolbar.gui +++ b/Templates/BaseGame/game/tools/roadEditor/RoadEditorToolbar.gui @@ -1,4 +1,4 @@ -%guiContent = new GuiControl(RoadEditorToolbar) { +$guiContent = new GuiControl(RoadEditorToolbar) { canSaveDynamicFields = "0"; internalName = "RoadEditorToolbar"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorSettingsTab.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorSettingsTab.gui index 1a455e9a6..e19052bc2 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorSettingsTab.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorSettingsTab.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ShapeEditorSettingsTab,EditorGuiGroup) { +$guiContent = new GuiControl(ShapeEditorSettingsTab,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorToolbar.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorToolbar.ed.gui index ccaaf03fb..cdb2c080c 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorToolbar.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) { +$guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) { canSaveDynamicFields = "0"; internalName = ""; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui index 405ce3ebc..ea2197bd3 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { +$guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { text = "Advanced Properties"; resizeWidth = "0"; resizeHeight = "0"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAnimWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAnimWindow.ed.gui index 8785db315..a379cc533 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAnimWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAnimWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) { +$guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) { canSaveDynamicFields = "0"; isContainer = "1"; Profile = "ToolsGuiToolbarWindowProfile"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPreviewWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPreviewWindow.ed.gui index 81b815d5c..65035d565 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPreviewWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPreviewWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl() { +$guiContent = new GuiControl() { canSaveDynamicFields = "0"; isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui index 52d581366..32e4da230 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) { +$guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) { canSaveDynamicFields = "0"; isContainer = "1"; Profile = "ToolsGuiWindowProfile"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui index eb7a3225a..7b2fe0875 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl() { +$guiContent = new GuiControl() { canSaveDynamicFields = "0"; isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/AddFMODProjectDlg.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/AddFMODProjectDlg.ed.gui index 56c892fa9..b7bc1d86b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/AddFMODProjectDlg.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/AddFMODProjectDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AddFMODProjectDlg,EditorGuiGroup) { +$guiContent = new GuiControl(AddFMODProjectDlg,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiOverlayProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/AxisGizmoSettingsTab.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/AxisGizmoSettingsTab.ed.gui index e5eba667e..08165a2ba 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/AxisGizmoSettingsTab.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/AxisGizmoSettingsTab.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AxisGizmoSettingsTab,EditorGuiGroup) { +$guiContent = new GuiControl(AxisGizmoSettingsTab,EditorGuiGroup) { isContainer = "1"; profile = "ToolsGuiDefaultProfile"; horizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/CameraSettingsTab.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/CameraSettingsTab.ed.gui index b267b25a6..969109a3b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/CameraSettingsTab.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/CameraSettingsTab.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(CameraSettingsTab,EditorGuiGroup) { +$guiContent = new GuiControl(CameraSettingsTab,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorChooseLevelGui.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/EditorChooseLevelGui.ed.gui index a384f59e7..a3eecd66b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorChooseLevelGui.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/EditorChooseLevelGui.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiContainer(EditorChooseLevelGui, EditorGuiGroup) { +$guiContent = new GuiContainer(EditorChooseLevelGui, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; @@ -34,7 +34,7 @@ }; }; -%guiContent = new GuiContainer(EditorChooseLevelContainer, EditorGuiGroup) { +$guiContent = new GuiContainer(EditorChooseLevelContainer, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui index c2330f6de..2223182c7 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { +$guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui index 7662ecf00..97c607324 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { +$guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/GeneralSettingsTab.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/GeneralSettingsTab.ed.gui index a49ab4064..933e42e8b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/GeneralSettingsTab.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/GeneralSettingsTab.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(GeneralSettingsTab,EditorGuiGroup) { +$guiContent = new GuiControl(GeneralSettingsTab,EditorGuiGroup) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/GenericPromptDialog.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/GenericPromptDialog.ed.gui index ade528157..8ab2debf3 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/GenericPromptDialog.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/GenericPromptDialog.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(GenericPromptDialog) { +$guiContent = new GuiControl(GenericPromptDialog) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui index c5f4ff469..d8cd38297 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui @@ -1,4 +1,4 @@ -%guiContent = new GuiControl(ManageBookmarksContainer, EditorGuiGroup) { +$guiContent = new GuiControl(ManageBookmarksContainer, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui index 29c55dc74..d24407c8b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ManageSFXParametersContainer,EditorGuiGroup) { +$guiContent = new GuiControl(ManageSFXParametersContainer,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiModelessDialogProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ObjectEditorSettingsTab.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ObjectEditorSettingsTab.ed.gui index b8928eb7d..97382bb99 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ObjectEditorSettingsTab.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ObjectEditorSettingsTab.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ObjectEditorSettingsTab,EditorGuiGroup) { +$guiContent = new GuiControl(ObjectEditorSettingsTab,EditorGuiGroup) { isContainer = "1"; profile = "ToolsGuiDefaultProfile"; horizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui index 9805d31dd..ec5165c1d 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ObjectSnapOptionsContainer, EditorGuiGroup) { +$guiContent = new GuiControl(ObjectSnapOptionsContainer, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; @@ -843,7 +843,7 @@ password = "0"; tabComplete = "0"; sinkAllKeyEvents = "0"; - passwordMask = "•"; + passwordMask = "�"; text = "2.0"; maxLength = "6"; margin = "0 0 0 0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ProceduralTerrainPainterGui.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ProceduralTerrainPainterGui.gui index 452c23bf6..690d653fa 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ProceduralTerrainPainterGui.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ProceduralTerrainPainterGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ProceduralTerrainPainterGui) { +$guiContent = new GuiControl(ProceduralTerrainPainterGui) { canSaveDynamicFields = "0"; isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/SelectObjectsWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/SelectObjectsWindow.ed.gui index 3e95e91d4..c7955d868 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/SelectObjectsWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/SelectObjectsWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ESelectObjectsWindowContainer,EditorGuiGroup) { +$guiContent = new GuiControl(ESelectObjectsWindowContainer,EditorGuiGroup) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainBrushSoftnessCurveDlg.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainBrushSoftnessCurveDlg.ed.gui index 6fb188adf..f58b8fb6c 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainBrushSoftnessCurveDlg.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainBrushSoftnessCurveDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(TerrainBrushSoftnessCurveDlg, EditorGuiGroup) { +$guiContent = new GuiControl(TerrainBrushSoftnessCurveDlg, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui index cc9d6983b..2cf1d3ce5 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { +$guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { canSaveDynamicFields = "0"; internalName = "TerrainEditToolbar"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditorSettingsTab.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditorSettingsTab.ed.gui index 8f219ec67..87cc92ff7 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditorSettingsTab.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditorSettingsTab.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(TerrainEditorSettingsTab,EditorGuiGroup) { +$guiContent = new GuiControl(TerrainEditorSettingsTab,EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui index ca4126330..5e25e475c 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { +$guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { canSaveDynamicFields = "0"; internalName = "TerrainPainterToolbar"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui index a08c05841..cb7f299d7 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) { +$guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TimeAdjustGui.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TimeAdjustGui.ed.gui index 4b7b8a26e..96f64c447 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TimeAdjustGui.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TimeAdjustGui.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(TimeAdjustGui, EditorGuiGroup) { +$guiContent = new GuiControl(TimeAdjustGui, EditorGuiGroup) { isContainer = "1"; Profile = "ToolsGuiModelessDialogProfile"; HorizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteWindow.ed.gui index b6b9c5507..491f7ad1b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl() { +$guiContent = new GuiControl() { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui index 1f15e5310..614db16e0 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiContainer(EWToolsToolbar) { +$guiContent = new GuiContainer(EWToolsToolbar) { canSaveDynamicFields = "0"; Enabled = "0"; internalName = "ToolsToolbar"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TransformSelectionWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TransformSelectionWindow.ed.gui index 26324ea74..1d368b39b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TransformSelectionWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TransformSelectionWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(TransformSelectionContainer, EditorGuiGroup) { +$guiContent = new GuiControl(TransformSelectionContainer, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/VisibilityLayerWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/VisibilityLayerWindow.ed.gui index 6e65a2749..cff92d9ab 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/VisibilityLayerWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/VisibilityLayerWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(VisibilityLayerContainer, EditorGuiGroup) { +$guiContent = new GuiControl(VisibilityLayerContainer, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui index 9abe8f9e3..bdfff71fb 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl() { +$guiContent = new GuiControl() { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui index f736e8555..aeb37db79 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) { +$guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) { canSaveDynamicFields = "0"; internalName = "WorldEditorToolbar"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui index 297336551..c74135219 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl() { +$guiContent = new GuiControl() { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiCreateNewTerrainGui.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiCreateNewTerrainGui.gui index 943e85185..41c9ed965 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiCreateNewTerrainGui.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiCreateNewTerrainGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(CreateNewTerrainGui, EditorGuiGroup) { +$guiContent = new GuiControl(CreateNewTerrainGui, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainExportGui.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainExportGui.gui index 411e74676..fd62d885a 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainExportGui.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainExportGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(TerrainExportGui, EditorGuiGroup) { +$guiContent = new GuiControl(TerrainExportGui, EditorGuiGroup) { canSaveDynamicFields = "0"; Profile = "ToolsGuiOverlayProfile"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui index c013cba61..9055f4fdc 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(TerrainImportGui, EditorGuiGroup) { +$guiContent = new GuiControl(TerrainImportGui, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui index 0d4339eae..57c9677e6 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) { +$guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainTextureSettingsDlg.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainTextureSettingsDlg.ed.gui index 47c3549a2..f63f53614 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainTextureSettingsDlg.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainTextureSettingsDlg.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(TerrainTextureSettingsDlg, EditorGuiGroup) { +$guiContent = new GuiControl(TerrainTextureSettingsDlg, EditorGuiGroup) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiWorldEditorMissionInspector.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiWorldEditorMissionInspector.ed.gui index ab7bfe2f5..166db3024 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiWorldEditorMissionInspector.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiWorldEditorMissionInspector.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(WorldEditorMissionInspector,EditorGuiGroup) { +$guiContent = new GuiControl(WorldEditorMissionInspector,EditorGuiGroup) { canSaveDynamicFields = "0"; isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui index b486ca467..da4b05df3 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ObjectBuilderGui, EditorGuiGroup) { +$guiContent = new GuiControl(ObjectBuilderGui, EditorGuiGroup) { profile = "ToolsGuiDefaultProfile"; horizSizing = "right"; vertSizing = "bottom"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/probeBakeDlg.gui b/Templates/BaseGame/game/tools/worldEditor/gui/probeBakeDlg.gui index ae952c9b8..cf4f2ad4b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/probeBakeDlg.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/probeBakeDlg.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ProbeBakeDlg) { +$guiContent = new GuiControl(ProbeBakeDlg) { position = "0 0"; extent = "1024 768"; minExtent = "8 2"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/shadowViz.gui b/Templates/BaseGame/game/tools/worldEditor/gui/shadowViz.gui index e130850bd..997d05417 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/shadowViz.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/shadowViz.gui @@ -4,7 +4,7 @@ //--------------------------------------------------------------------------------------------- //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(AL_ShadowVizOverlayCtrl) { +$guiContent = new GuiControl(AL_ShadowVizOverlayCtrl) { canSaveDynamicFields = "0"; isContainer = "1"; Profile = "GuiModelessDialogProfile"; diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript index ee4e7bfb2..1f5dc01f3 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript @@ -113,9 +113,9 @@ function EditorGui::init(%this) { // Load Terrain Painter GUI exec("~/worldEditor/gui/TerrainPainterWindow.ed.gui"); - if( isObject( %guiContent ) ){ - %this.add( %guiContent->TerrainPainter ); - %this.add( %guiContent->TerrainPainterPreview ); + if( isObject( $guiContent ) ){ + %this.add( $guiContent->TerrainPainter ); + %this.add( $guiContent->TerrainPainterPreview ); } exec("~/worldEditor/gui/guiTerrainMaterialDlg.ed.gui"); diff --git a/Templates/Modules/Verve/gui/VerveCinematic.gui b/Templates/Modules/Verve/gui/VerveCinematic.gui index f71a3171c..d12463244 100644 --- a/Templates/Modules/Verve/gui/VerveCinematic.gui +++ b/Templates/Modules/Verve/gui/VerveCinematic.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GameTSCtrl(VerveCinematicGui) { +$guiContent = new GameTSCtrl(VerveCinematicGui) { canSaveDynamicFields = "1"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/Modules/inputTest/scripts/gui/inputMonitor.gui b/Templates/Modules/inputTest/scripts/gui/inputMonitor.gui index e1549f06f..67708cf2e 100644 --- a/Templates/Modules/inputTest/scripts/gui/inputMonitor.gui +++ b/Templates/Modules/inputTest/scripts/gui/inputMonitor.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(InputMonitorDlg) { +$guiContent = new GuiControl(InputMonitorDlg) { position = "0 0"; extent = "1024 768"; minExtent = "8 8"; diff --git a/Templates/Modules/inputTest/scripts/gui/joystickSettings.gui b/Templates/Modules/inputTest/scripts/gui/joystickSettings.gui index d9b4d19a9..ca30235d4 100644 --- a/Templates/Modules/inputTest/scripts/gui/joystickSettings.gui +++ b/Templates/Modules/inputTest/scripts/gui/joystickSettings.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(JoystickSettingsDlg) { +$guiContent = new GuiControl(JoystickSettingsDlg) { position = "0 0"; extent = "1024 768"; minExtent = "8 8"; diff --git a/Templates/Modules/vr/guis/oculusVROverlay.gui b/Templates/Modules/vr/guis/oculusVROverlay.gui index 62a9f719c..d05852cbd 100644 --- a/Templates/Modules/vr/guis/oculusVROverlay.gui +++ b/Templates/Modules/vr/guis/oculusVROverlay.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -%guiContent = singleton GuiControl(OculusVROverlay) { +$guiContent = singleton GuiControl(OculusVROverlay) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1";