From f5d8de8c4d87a4b0f6d1530e2632ab23dd10f5a2 Mon Sep 17 00:00:00 2001 From: Areloch Date: Mon, 1 Jun 2015 22:01:29 -0500 Subject: [PATCH 1/2] Fixed an issue where non-occulus builds didn't correctly push pop-up dialogs to the canvas. --- Templates/Empty/game/scripts/client/serverConnection.cs | 1 + Templates/Full/game/scripts/client/serverConnection.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/Templates/Empty/game/scripts/client/serverConnection.cs b/Templates/Empty/game/scripts/client/serverConnection.cs index 8bac91813..ad8d3769f 100644 --- a/Templates/Empty/game/scripts/client/serverConnection.cs +++ b/Templates/Empty/game/scripts/client/serverConnection.cs @@ -55,6 +55,7 @@ function GameConnection::initialControlSet(%this) { if (Canvas.getContent() != PlayGui.getId()) Canvas.setContent(PlayGui); + $GameCanvas = Canvas; } } diff --git a/Templates/Full/game/scripts/client/serverConnection.cs b/Templates/Full/game/scripts/client/serverConnection.cs index c50478212..dc0784663 100644 --- a/Templates/Full/game/scripts/client/serverConnection.cs +++ b/Templates/Full/game/scripts/client/serverConnection.cs @@ -56,6 +56,7 @@ function GameConnection::initialControlSet(%this) if (Canvas.getContent() != PlayGui.getId()) { Canvas.setContent(PlayGui); + $GameCanvas = Canvas; } } } From 9368b7b915bde00983da1865eeea3dc599af3255 Mon Sep 17 00:00:00 2001 From: Areloch Date: Mon, 1 Jun 2015 22:34:55 -0500 Subject: [PATCH 2/2] Adjusted the popup issue fix to ensure nothing breaks in either regular or oculus mode. --- .../Empty/game/core/scripts/gui/messageBoxes/messageBox.ed.cs | 3 ++- Templates/Empty/game/scripts/client/serverConnection.cs | 1 - .../Full/game/core/scripts/gui/messageBoxes/messageBox.ed.cs | 3 ++- Templates/Full/game/scripts/client/serverConnection.cs | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Templates/Empty/game/core/scripts/gui/messageBoxes/messageBox.ed.cs b/Templates/Empty/game/core/scripts/gui/messageBoxes/messageBox.ed.cs index 6d71a6eeb..13c855927 100644 --- a/Templates/Empty/game/core/scripts/gui/messageBoxes/messageBox.ed.cs +++ b/Templates/Empty/game/core/scripts/gui/messageBoxes/messageBox.ed.cs @@ -20,7 +20,8 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -$GameCanvas = 0; +if($GameCanvas == OculusCanvas) + $GameCanvas = 0; // Cleanup Dialog created by 'core' if( isObject( MessagePopupDlg ) ) diff --git a/Templates/Empty/game/scripts/client/serverConnection.cs b/Templates/Empty/game/scripts/client/serverConnection.cs index ad8d3769f..8bac91813 100644 --- a/Templates/Empty/game/scripts/client/serverConnection.cs +++ b/Templates/Empty/game/scripts/client/serverConnection.cs @@ -55,7 +55,6 @@ function GameConnection::initialControlSet(%this) { if (Canvas.getContent() != PlayGui.getId()) Canvas.setContent(PlayGui); - $GameCanvas = Canvas; } } diff --git a/Templates/Full/game/core/scripts/gui/messageBoxes/messageBox.ed.cs b/Templates/Full/game/core/scripts/gui/messageBoxes/messageBox.ed.cs index 6d71a6eeb..13c855927 100644 --- a/Templates/Full/game/core/scripts/gui/messageBoxes/messageBox.ed.cs +++ b/Templates/Full/game/core/scripts/gui/messageBoxes/messageBox.ed.cs @@ -20,7 +20,8 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -$GameCanvas = 0; +if($GameCanvas == OculusCanvas) + $GameCanvas = 0; // Cleanup Dialog created by 'core' if( isObject( MessagePopupDlg ) ) diff --git a/Templates/Full/game/scripts/client/serverConnection.cs b/Templates/Full/game/scripts/client/serverConnection.cs index dc0784663..c50478212 100644 --- a/Templates/Full/game/scripts/client/serverConnection.cs +++ b/Templates/Full/game/scripts/client/serverConnection.cs @@ -56,7 +56,6 @@ function GameConnection::initialControlSet(%this) if (Canvas.getContent() != PlayGui.getId()) { Canvas.setContent(PlayGui); - $GameCanvas = Canvas; } } }