diff --git a/.gitignore b/.gitignore index f280047..dbc8fda 100644 --- a/.gitignore +++ b/.gitignore @@ -28,9 +28,9 @@ $RECYCLE.BIN/ *.class projects/Android/build/* assets/oculussig* -Projects/Android/.externalNativeBuild/ndkBuild/debug/arm64-v8a/android_gradle_build.json +Projects/Android/.cxx/* *.json -Projects/Android/.externalNativeBuild/ndkBuild/debug/arm64-v8a/ndkBuild_build_command.txt +Projects/Android/.gradle/* Projects/Android/.externalNativeBuild/ndkBuild/debug/arm64-v8a/ndkBuild_build_output.txt Projects/Android/.externalNativeBuild/ndkBuild/release/arm64-v8a/ndkBuild_build_command.txt Projects/Android/.externalNativeBuild/ndkBuild/release/armeabi-v7a/ndkBuild_build_output.txt diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml index 92621c1..8bb958f 100644 --- a/Projects/Android/AndroidManifest.xml +++ b/Projects/Android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="17" + android:versionName="1.0.6" android:installLocation="auto" > @@ -18,6 +18,8 @@ + + diff --git a/Projects/Android/gradle/wrapper/gradle-wrapper.properties b/Projects/Android/gradle/wrapper/gradle-wrapper.properties index c9ebeef..7048f9c 100644 --- a/Projects/Android/gradle/wrapper/gradle-wrapper.properties +++ b/Projects/Android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jul 27 06:47:04 BST 2019 +#Thu Dec 10 20:38:41 GMT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/Projects/Android/jni/Quake2VR/Q2VR_SurfaceView.c b/Projects/Android/jni/Quake2VR/Q2VR_SurfaceView.c index 2463805..b0e52b4 100644 --- a/Projects/Android/jni/Quake2VR/Q2VR_SurfaceView.c +++ b/Projects/Android/jni/Quake2VR/Q2VR_SurfaceView.c @@ -1432,7 +1432,12 @@ void * AppThreadFunction( void * parm ) chdir("/sdcard"); - for ( bool destroyed = false; destroyed == false; ) + //Set 90hz mode for Quest 2 + if (vrapi_GetSystemPropertyInt(&java, VRAPI_SYS_PROP_DEVICE_TYPE) == VRAPI_DEVICE_TYPE_OCULUSQUEST2) { + vrapi_SetDisplayRefreshRate(appState.Ovr, 90); + } + + for ( bool destroyed = false; destroyed == false; ) { for ( ; ; ) { diff --git a/Projects/Android/jni/quake2/src/common/header/common.h b/Projects/Android/jni/quake2/src/common/header/common.h index 764a298..14baba4 100644 --- a/Projects/Android/jni/quake2/src/common/header/common.h +++ b/Projects/Android/jni/quake2/src/common/header/common.h @@ -32,7 +32,7 @@ #include "shared.h" #include "crc.h" -#define Q2QVERSION "1.0.5" +#define Q2QVERSION "1.0.6" #define YQ2VERSION "7.41" #define BASEDIRNAME "Quake2Quest"