Merge pull request #495 from JeffProgrammer/tsneo

TorqueScript Interpreter 2.0
This commit is contained in:
Areloch 2021-09-09 19:22:15 -05:00 committed by GitHub
commit 6487e2eede
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
309 changed files with 9842 additions and 10062 deletions

View file

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

View file

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

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

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

View file

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

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

View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiChunkedBitmapCtrl(LoadingGui) {
$guiContent = new GuiChunkedBitmapCtrl(LoadingGui) {
bitmapAsset = "UI:background_dark_image";
useVariable = "0";
tile = "0";

View file

@ -1,7 +1,7 @@
exec( "tools/gui/profiles.ed.tscript" );
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiChunkedBitmapCtrl(MainMenuGui) {
$guiContent = new GuiChunkedBitmapCtrl(MainMenuGui) {
bitmapAsset = "UI:background_dark_image";
useVariable = "0";
tile = "0";

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

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

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

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

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;

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

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

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

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

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

View file

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

View file

@ -27,7 +27,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;

View file

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