Merge pull request #51 from tverona1/misc

Update app name, fix go controller
tverona1 · Jul 23, 2020 · 7a577a8 · 7a577a8
2 parents 94299d5 + 2b8154d
commit 7a577a8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Assets/OVRInputSelection/InputSystem/OVRRawRaycaster.cs b/Assets/OVRInputSelection/InputSystem/OVRRawRaycaster.cs
@@ -190,8 +190,10 @@ void ProcessButtonPresses(OVRInput.Controller activeController, bool isLeft, Tra
         {
             // Handle selection callbacks. An object is selected if the button selecting it was
             // pressed AND released while hovering over the object.
-            if (isLeft && (activeController & OVRInput.Controller.LTouch) != OVRInput.Controller.LTouch ||
-                !isLeft && (activeController & OVRInput.Controller.RTouch) != OVRInput.Controller.RTouch)
+            if (isLeft && (activeController & OVRInput.Controller.LTouch) != OVRInput.Controller.LTouch &&
+                (activeController & OVRInput.Controller.LTrackedRemote) != OVRInput.Controller.LTrackedRemote ||
+                !isLeft && (activeController & OVRInput.Controller.RTouch) != OVRInput.Controller.RTouch &&
+                (activeController & OVRInput.Controller.RTrackedRemote) != OVRInput.Controller.RTrackedRemote)
             {
                 return;
             }

diff --git a/Assets/Resources/OVRBuildConfig.asset b/Assets/Resources/OVRBuildConfig.asset
@@ -12,6 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3}
   m_Name: OVRBuildConfig
   m_EditorClassIdentifier: 
-  androidSDKPath: C:\Program Files\Unity\Hub\Editor\2019.3.12f1\Editor\Data\PlaybackEngines\AndroidPlayer\SDK
+  androidSDKPath: 
   gradlePath: 
   jdkPath: 
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: AAA
-  productName: Quest App Launcher
+  productName: .Quest App Launcher
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -119,7 +119,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.11
+  bundleVersion: 0.11.1
   preloadedAssets:
   - {fileID: -8332471933877474197, guid: 2be630b98a6f0a248ac3849f76251ed9, type: 2}
   - {fileID: 11400000, guid: 497e8cda6e724d341b6eeb4df763826d, type: 2}