TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjusted the popup issue fix to ensure nothing breaks in either regular or oculus mode.

Browse source
This commit is contained in:
Areloch 2015-06-01 22:34:55 -05:00
parent f5d8de8c4d
commit 9368b7b915
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Templates/Empty/game/core/scripts/gui/messageBoxes/messageBox.ed.cs
View file

@ -20,7 +20,8 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
$GameCanvas = 0; if($GameCanvas == OculusCanvas)
$GameCanvas = 0;
// Cleanup Dialog created by 'core' // Cleanup Dialog created by 'core'
if( isObject( MessagePopupDlg ) ) if( isObject( MessagePopupDlg ) )

1
Templates/Empty/game/scripts/client/serverConnection.cs
View file

@ -55,7 +55,6 @@ function GameConnection::initialControlSet(%this)
{ {
if (Canvas.getContent() != PlayGui.getId()) if (Canvas.getContent() != PlayGui.getId())
Canvas.setContent(PlayGui); Canvas.setContent(PlayGui);
$GameCanvas = Canvas;
} }
} }

3
Templates/Full/game/core/scripts/gui/messageBoxes/messageBox.ed.cs
View file

@ -20,7 +20,8 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
$GameCanvas = 0; if($GameCanvas == OculusCanvas)
$GameCanvas = 0;
// Cleanup Dialog created by 'core' // Cleanup Dialog created by 'core'
if( isObject( MessagePopupDlg ) ) if( isObject( MessagePopupDlg ) )

1
Templates/Full/game/scripts/client/serverConnection.cs
View file

@ -56,7 +56,6 @@ function GameConnection::initialControlSet(%this)
if (Canvas.getContent() != PlayGui.getId()) if (Canvas.getContent() != PlayGui.getId())
{ {
Canvas.setContent(PlayGui); Canvas.setContent(PlayGui);
$GameCanvas = Canvas;
} }
} }
} }