TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lotsa fixes.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-05-04 21:18:15 -04:00
parent db047275f1
commit 6f7fdca87d
178 changed files with 230 additions and 245 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Engine/source/T3D/gameBase/gameConnection.cpp
View file

@ -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;
*/
}
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------

2
Engine/source/console/console.h
View file

@ -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)

2
Engine/source/console/simEvents.cpp
View file

@ -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());
}
}
}

1
Templates/BaseGame/game/core/clientServer/scripts/server/levelInfo.tscript
View file

@ -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 )

3
Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.tscript
View file

@ -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);
}

2
Templates/BaseGame/game/core/console/guis/console.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ConsoleDlg) {
$guiContent = new GuiControl(ConsoleDlg) {
position = "0 0";
extent = "1024 768";
minExtent = "8 8";

2
Templates/BaseGame/game/core/console/scripts/console.tscript
View file

@ -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;

2
Templates/BaseGame/game/core/postFX/scripts/postFxManager.tscript
View file

@ -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 )

4
Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.tscript
View file

@ -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);

4
Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript
View file

@ -524,7 +524,9 @@ function loadDir(%dir)
function loadDirs(%dirPath)
{
%dirPath = nextToken(%dirPath, token, ";");
%dirPath = nextToken(%dirPath, "$token", ";");
%token = $token;
if (%dirPath !$= "")
loadDirs(%dirPath);

34
Templates/BaseGame/game/core/utility/scripts/parseArgs.tscript
View file

@ -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 <filename>");
//--------------------
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 <ip_address>");
@ -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 <path/script." @ $TorqueScriptFileExtension @ ">");

3
Templates/BaseGame/game/core/utility/scripts/scene.tscript
View file

@ -1,8 +1,5 @@
function callGamemodeFunction(%gameModeFuncName, %arg0, %arg1, %arg2, %arg3, %arg4, %arg5, %arg6)
{
if(%data !$= "")
%data = "\""@%data@"\"";
%activeSceneCount = getSceneCount();
%hasGameMode = 0;

2
Templates/BaseGame/game/data/ExampleModule/GUIs/ExampleGUI.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ExampleGUI)
$guiContent = new GuiControl(ExampleGUI)
{
position = "0 0";
extent = "100 100";

2
Templates/BaseGame/game/data/defaults.tscript
View file

@ -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;

2
Templates/BaseGame/game/data/gameUI/GUIs/playGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GameTSCtrl(PlayGui) {
$guiContent = new GameTSCtrl(PlayGui) {
cameraZRot = "0";
forceFOV = "0";
reflectPriority = "1";

2
Templates/BaseGame/game/data/ui/guis/IODropdownDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(IODropdownDlg) {
$guiContent = new GuiControl(IODropdownDlg) {
profile = "GuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/data/ui/guis/RecordingsDlg.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(recordingsDlg) {
$guiContent = new GuiControl(recordingsDlg) {
position = "0 0";
extent = "1024 768";
minExtent = "8 8";

2
Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ChooseLevelDlg) {
$guiContent = new GuiControl(ChooseLevelDlg) {
position = "0 0";
extent = "1024 768";
minExtent = "8 8";

2
Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(GuiMusicPlayer) {
$guiContent = new GuiControl(GuiMusicPlayer) {
isContainer = "1";
Profile = "GuiWindowProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/data/ui/guis/joinServerMenu.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(JoinServerMenu) {
$guiContent = new GuiControl(JoinServerMenu) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/data/ui/guis/loadingGui.gui
View file

@ -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";

2
Templates/BaseGame/game/data/ui/guis/mainMenu.gui
View file

@ -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";

2
Templates/BaseGame/game/data/ui/guis/messageBoxDlg.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MessageBoxDlg) {
$guiContent = new GuiControl(MessageBoxDlg) {
position = "0 0";
extent = "1024 768";
minExtent = "8 8";

2
Templates/BaseGame/game/data/ui/guis/netGraphGui.gui
View file

@ -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";

2
Templates/BaseGame/game/data/ui/guis/optionsDlg.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(OptionsDlg) {
$guiContent = new GuiControl(OptionsDlg) {
position = "0 0";
extent = "1024 768";
minExtent = "8 8";

2
Templates/BaseGame/game/data/ui/guis/optionsMenu.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(OptionsMenu) {
$guiContent = new GuiControl(OptionsMenu) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

17
Templates/BaseGame/game/data/ui/guis/optionsMenu.tscript
View file

@ -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;

2
Templates/BaseGame/game/data/ui/guis/pauseMenu.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(PauseMenu) {
$guiContent = new GuiControl(PauseMenu) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/data/ui/guis/profiler.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ProfilerGui) {
$guiContent = new GuiControl(ProfilerGui) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/data/ui/guis/profiler.tscript
View file

@ -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";

2
Templates/BaseGame/game/data/ui/guis/remapConfirmDlg.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(RemapConfirmDlg) {
$guiContent = new GuiControl(RemapConfirmDlg) {
position = "0 0";
extent = "1024 768";
minExtent = "8 8";

2
Templates/BaseGame/game/data/ui/guis/remapDlg.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(RemapDlg) {
$guiContent = new GuiControl(RemapDlg) {
position = "0 0";
extent = "1024 768";
minExtent = "8 8";

2
Templates/BaseGame/game/data/ui/guis/startupGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiFadeinBitmapCtrl(StartupGui) {
$guiContent = new GuiFadeinBitmapCtrl(StartupGui) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

5
Templates/BaseGame/game/main.tscript.in
View file

@ -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") );
}
}

2
Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorToolbar.gui
View file

@ -3,7 +3,7 @@
// Copyright (C) - Violent Tulip
//-----------------------------------------------------------------------------
%guiContent = new GuiControl(VPathEditorToolbar)
$guiContent = new GuiControl(VPathEditorToolbar)
{
canSaveDynamicFields = "0";
internalName = "VPathEditorToolbar";

2
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(VerveEditorGui) {
$guiContent = new GuiControl(VerveEditorGui) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorGroupBuilder.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
$guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
isContainer = "1";
Profile = "GuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorImportPathNodes.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
$guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
isContainer = "1";
Profile = "GuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorPreferences.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(VerveEditorPreferenceGui) {
$guiContent = new GuiControl(VerveEditorPreferenceGui) {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "GuiDefaultProfile";

2
Templates/BaseGame/game/tools/assetBrowser/guis/AssetImportConfigEditor.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetImportConfigEditor) {
$guiContent = new GuiControl(AssetImportConfigEditor) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/GameObjectCreator.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(GameObjectCreator) {
$guiContent = new GuiControl(GameObjectCreator) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/addModuleWindow.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/assetBrowser/guis/addPackageWindow.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowser) {
$guiContent = new GuiControl(AssetBrowser) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetImportCtrl) {
$guiContent = new GuiControl(AssetImportCtrl) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetImportLog.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetBrowserImportLog) {
$guiContent = new GuiControl(AssetBrowserImportLog) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetNameEdit.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssetPreviewButtonsTemplate) {
$guiContent = new GuiControl(AssetPreviewButtonsTemplate) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/createNewCollectionSet.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(CreateNewCollectionSetCtrl) {
$guiContent = new GuiControl(CreateNewCollectionSetCtrl) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/editAsset.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/assetBrowser/guis/editModule.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/assetBrowser/guis/looseFileAudit.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(LooseFileAudit) {
$guiContent = new GuiControl(LooseFileAudit) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/assetBrowser/guis/newComponentAsset.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/assetBrowser/guis/newFolder.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/assetBrowser/guis/selectModule.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/assetBrowser/guis/selectPackage.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/assetBrowser/guis/selectPath.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(SelectAssetPath) {
$guiContent = new GuiControl(SelectAssetPath) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/guiFile.gui.template
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(@@)
$guiContent = new GuiControl(@@)
{
position = "0 0";
extent = "100 100";

2
Templates/BaseGame/game/tools/componentEditor/gui/TypeMaskFieldGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(TypeMaskFieldGui) {
$guiContent = new GuiControl(TypeMaskFieldGui) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/componentEditor/gui/superToolTipDlg.ed.gui
View file

@ -1,4 +1,4 @@
%guiContent = new GuiControl(SuperTooltipDlg) {
$guiContent = new GuiControl(SuperTooltipDlg) {
canSaveDynamicFields = "0";
Profile = "GuiTransparentProfileModeless";
class = "SuperTooltip";

2
Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) {
$guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/convexEditor/convexEditorSettingsTab.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ConvexEditorSettingsTab,EditorGuiGroup) {
$guiContent = new GuiControl(ConvexEditorSettingsTab,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(convexEditorToolbar, EditorGuiGroup) {
$guiContent = new GuiControl(convexEditorToolbar, EditorGuiGroup) {
canSaveDynamicFields = "0";
internalName = "";
isContainer = "1";

2
Templates/BaseGame/game/tools/datablockEditor/DatablockEditorCreatePrompt.ed.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl() {
$guiContent = new GuiControl() {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl() {
$guiContent = new GuiControl() {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/debugger/gui/breakConditionDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DebuggerBreakConditionDlg, EditorGuiGroup) {
$guiContent = new GuiControl(DebuggerBreakConditionDlg, EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";
vertSizing = "bottom";

2
Templates/BaseGame/game/tools/debugger/gui/connectDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DebuggerConnectDlg, EditorGuiGroup) {
$guiContent = new GuiControl(DebuggerConnectDlg, EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";
vertSizing = "bottom";

2
Templates/BaseGame/game/tools/debugger/gui/debugger.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DebuggerGui, EditorGuiGroup) {
$guiContent = new GuiControl(DebuggerGui, EditorGuiGroup) {
profile = "ToolsGuiWindowProfile";
horizSizing = "right";
vertSizing = "bottom";

2
Templates/BaseGame/game/tools/debugger/gui/editWatchDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DebuggerEditWatchDlg, EditorGuiGroup) {
$guiContent = new GuiControl(DebuggerEditWatchDlg, EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";
vertSizing = "bottom";

2
Templates/BaseGame/game/tools/debugger/gui/findDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DebuggerFindDlg, EditorGuiGroup) {
$guiContent = new GuiControl(DebuggerFindDlg, EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";
vertSizing = "bottom";

2
Templates/BaseGame/game/tools/debugger/gui/watchDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(DebuggerWatchDlg, EditorGuiGroup) {
$guiContent = new GuiControl(DebuggerWatchDlg, EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "right";
vertSizing = "bottom";

2
Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiDecalEditorCtrl(DecalEditorGui) {
$guiContent = new GuiDecalEditorCtrl(DecalEditorGui) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

2
Templates/BaseGame/game/tools/forestEditor/forestEditToolbar.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ForestEditToolbar,EditorGuiGroup) {
$guiContent = new GuiControl(ForestEditToolbar,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/gui/EditorLoadingGui.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/gui/GuiEaseEditDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(GuiEaseEditDlg,EditorGuiGroup) {
$guiContent = new GuiControl(GuiEaseEditDlg,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/gui/assimpImport.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(AssimpImportDlg,EditorGuiGroup) {
$guiContent = new GuiControl(AssimpImportDlg,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "width";

6
Templates/BaseGame/game/tools/gui/colladaImport.ed.gui
View file

@ -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" )

2
Templates/BaseGame/game/tools/gui/colorPicker.ed.gui
View file

@ -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";

2
Templates/BaseGame/game/tools/gui/cubemapEditor.gui
View file

@ -1,4 +1,4 @@
%guiContent = new GuiControl(CubemapEditor) {
$guiContent = new GuiControl(CubemapEditor) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";

3
Templates/BaseGame/game/tools/gui/fileDialogBase.ed.tscript
View file

@ -255,8 +255,7 @@ function FileDialogOkButton::onClick( %this )
// Callback
eval( %this.parent.SuccessCallback @ "(\"" @ %fullPath @"\");" );
%parent.SuccessCallback = 0;
%this.parent.SuccessCallback = 0;
//error("Ok");

2
Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiWindowCollapseCtrl() {
$guiContent = new GuiWindowCollapseCtrl() {
collapseGroup = "-1";
collapseGroupNum = "-1";
resizeWidth = "1";

6
Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript
View file

@ -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 );
}
//=============================================================================================

4
Templates/BaseGame/game/tools/gui/materialSelector.ed.gui
View file

@ -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;

2
Templates/BaseGame/game/tools/gui/messageBoxes/IODropdownDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(IODropdownDlg) {
$guiContent = new GuiControl(IODropdownDlg) {
profile = "GuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOK.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxOKDlg) {
$guiContent = new GuiControl(toolsMessageBoxOKDlg) {
profile = "GuiOverlayProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKBuy.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxOKBuyDlg) {
$guiContent = new GuiControl(toolsMessageBoxOKBuyDlg) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancel.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxOKCancelDlg) {
$guiContent = new GuiControl(toolsMessageBoxOKCancelDlg) {
profile = "GuiOverlayProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancelDetailsDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxOKCancelDetailsDlg) {
$guiContent = new GuiControl(toolsMessageBoxOKCancelDetailsDlg) {
canSaveDynamicFields = "0";
Profile = "GuiOverlayProfile";
HorizSizing = "width";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNo.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxYesNoDlg) {
$guiContent = new GuiControl(toolsMessageBoxYesNoDlg) {
profile = "GuiOverlayProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNoCancel.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxYesNoCancelDlg) {
$guiContent = new GuiControl(toolsMessageBoxYesNoCancelDlg) {
canSaveDynamicFields = "0";
Profile = "GuiOverlayProfile";
HorizSizing = "width";

2
Templates/BaseGame/game/tools/gui/messageBoxes/messagePopup.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MessagePopupDlg) {
$guiContent = new GuiControl(MessagePopupDlg) {
profile = "GuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";

2
Templates/BaseGame/game/tools/gui/postFxEditor.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(postFXEditor) {
$guiContent = new GuiControl(postFXEditor) {
position = "0 0";
extent = "1920 1200";
minExtent = "8 8";

2
Templates/BaseGame/game/tools/gui/profilerGraph.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ProfilerGraphGui) {
$guiContent = new GuiControl(ProfilerGraphGui) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/gui/renderTargetVisualizer.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(RenderTargetVisualizer) {
$guiContent = new GuiControl(RenderTargetVisualizer) {
position = "0 0";
extent = "1024 768";
minExtent = "8 2";

2
Templates/BaseGame/game/tools/gui/saveChangesMBDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(toolsMessageBoxSaveChangesDlg, EditorGuiGroup) {
$guiContent = new GuiControl(toolsMessageBoxSaveChangesDlg, EditorGuiGroup) {
canSaveDynamicFields = "0";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "width";

Some files were not shown because too many files have changed in this diff Show more