diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml index 990a5ca..2707710 100644 --- a/Projects/Android/AndroidManifest.xml +++ b/Projects/Android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="40" + android:versionName="0.7.0" android:installLocation="auto" > diff --git a/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp b/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp index e663a20..60a16c0 100644 --- a/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp +++ b/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp @@ -301,7 +301,7 @@ void VR_Init() vr_haptic_intensity = Cvar_Get ("vr_haptic_intensity", "1.0", CVAR_ARCHIVE); vr_comfort_vignette = Cvar_Get ("vr_comfort_vignette", "0.0", CVAR_ARCHIVE); vr_saber_3rdperson_mode = Cvar_Get ("vr_saber_3rdperson_mode", "1", CVAR_ARCHIVE); - vr_gesture_triggered_use = Cvar_Get ("vr_gesture_triggered_use", "2", CVAR_ARCHIVE); + vr_gesture_triggered_use = Cvar_Get ("vr_gesture_triggered_use", "1", CVAR_ARCHIVE); vr_use_gesture_boundary = Cvar_Get ("vr_use_gesture_boundary", "0.35", CVAR_ARCHIVE); cvar_t *expanded_menu_enabled = Cvar_Get ("expanded_menu_enabled", "0", CVAR_ARCHIVE); diff --git a/Projects/Android/jni/OpenJK/code/game/g_active.cpp b/Projects/Android/jni/OpenJK/code/game/g_active.cpp index e58c7dc..ea5cc11 100644 --- a/Projects/Android/jni/OpenJK/code/game/g_active.cpp +++ b/Projects/Android/jni/OpenJK/code/game/g_active.cpp @@ -1446,7 +1446,7 @@ void G_TouchTriggersLerped( gentity_t *ent ) { memset (touched, qfalse, sizeof(touched) ); bool thirdPersonActive = gi.cvar("cg_thirdPerson", "0", CVAR_TEMP)->integer; - bool useGestureEnabled = gi.cvar("vr_gesture_triggered_use", "0", CVAR_ARCHIVE)->integer; // defined in VrCvars.h + bool useGestureEnabled = gi.cvar("vr_gesture_triggered_use", "1", CVAR_ARCHIVE)->integer; // defined in VrCvars.h bool useGestureAllowed = useGestureEnabled && !thirdPersonActive; for ( curDist = 0; !done && ent->maxs[1]>0; curDist += (float)ent->maxs[1]/2.0f ) diff --git a/Projects/Android/jni/OpenJK/code/game/g_trigger.cpp b/Projects/Android/jni/OpenJK/code/game/g_trigger.cpp index 8b40d49..16652ad 100644 --- a/Projects/Android/jni/OpenJK/code/game/g_trigger.cpp +++ b/Projects/Android/jni/OpenJK/code/game/g_trigger.cpp @@ -255,7 +255,7 @@ void Touch_Multi( gentity_t *self, gentity_t *other, trace_t *trace ) } bool thirdPersonActive = gi.cvar("cg_thirdPerson", "0", CVAR_TEMP)->integer; - bool useGestureEnabled = gi.cvar("vr_gesture_triggered_use", "0", CVAR_ARCHIVE)->integer; // defined in VrCvars.h + bool useGestureEnabled = gi.cvar("vr_gesture_triggered_use", "1", CVAR_ARCHIVE)->integer; // defined in VrCvars.h bool useGestureAllowed = useGestureEnabled && !thirdPersonActive; if ( (self->spawnflags & 2) && ( !( self->spawnflags & 4 ) || ( ( self->spawnflags & 4) && !useGestureAllowed ) ) ) { // FACING and... ...is not USE_BUTTON or... ...is USE_BUTTON but use gestures are not active diff --git a/Projects/Android/jni/OpenJK/code/game/g_utils.cpp b/Projects/Android/jni/OpenJK/code/game/g_utils.cpp index acc77f6..7af7d81 100644 --- a/Projects/Android/jni/OpenJK/code/game/g_utils.cpp +++ b/Projects/Android/jni/OpenJK/code/game/g_utils.cpp @@ -1767,7 +1767,7 @@ void TryUse_Internal( gentity_t *ent, vec3_t src, vec3_t vf ) //extend to find end of use trace bool thirdPersonActive = gi.cvar("cg_thirdPerson", "0", CVAR_TEMP)->integer; - bool useGestureEnabled = gi.cvar("vr_gesture_triggered_use", "0", CVAR_ARCHIVE)->integer; // defined in VrCvars.h + bool useGestureEnabled = gi.cvar("vr_gesture_triggered_use", "1", CVAR_ARCHIVE)->integer; // defined in VrCvars.h bool useGestureAllowed = useGestureEnabled && !thirdPersonActive; float useDistance = useGestureAllowed ? USE_DISTANCE_GESTURE : USE_DISTANCE_BUTTON; VectorMA( src, useDistance, vf, dest ); diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp index 6b779cf..d87fa2e 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp @@ -909,7 +909,7 @@ void G_TouchTriggersLerped( gentity_t *ent ) { memset (touched, qfalse, sizeof(touched) ); bool thirdPersonActive = gi.cvar("cg_thirdPerson", "0", CVAR_TEMP)->integer; - bool useGestureEnabled = gi.cvar("vr_gesture_triggered_use", "0", CVAR_ARCHIVE)->integer; // defined in VrCvars.h + bool useGestureEnabled = gi.cvar("vr_gesture_triggered_use", "1", CVAR_ARCHIVE)->integer; // defined in VrCvars.h bool useGestureAllowed = useGestureEnabled && !thirdPersonActive; for ( curDist = 0; !done && ent->maxs[1]>0; curDist += (float)ent->maxs[1]/2.0f ) diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp index f53720a..88aa75a 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp @@ -225,7 +225,7 @@ void Touch_Multi( gentity_t *self, gentity_t *other, trace_t *trace ) } bool thirdPersonActive = gi.cvar("cg_thirdPerson", "0", CVAR_TEMP)->integer; - bool useGestureEnabled = gi.cvar("vr_gesture_triggered_use", "0", CVAR_ARCHIVE)->integer; // defined in VrCvars.h + bool useGestureEnabled = gi.cvar("vr_gesture_triggered_use", "1", CVAR_ARCHIVE)->integer; // defined in VrCvars.h bool useGestureAllowed = useGestureEnabled && !thirdPersonActive; if ( (self->spawnflags & 2) && ( !( self->spawnflags & 4 ) || ( ( self->spawnflags & 4) && !useGestureAllowed ) ) ) { // FACING and... ...is not USE_BUTTON or... ...is USE_BUTTON but use gestures are not active diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp index 9551cb6..1a7bb78 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp @@ -1532,7 +1532,7 @@ void TryUse_Internal( gentity_t *ent, vec3_t src, vec3_t vf ) { //extend to find end of use trace bool thirdPersonActive = gi.cvar("cg_thirdPerson", "0", CVAR_TEMP)->integer; - bool useGestureEnabled = gi.cvar("vr_gesture_triggered_use", "0", CVAR_ARCHIVE)->integer; // defined in VrCvars.h + bool useGestureEnabled = gi.cvar("vr_gesture_triggered_use", "1", CVAR_ARCHIVE)->integer; // defined in VrCvars.h bool useGestureAllowed = useGestureEnabled && !thirdPersonActive; float useDistance = useGestureAllowed ? USE_DISTANCE_GESTURE : USE_DISTANCE_BUTTON; VectorMA( src, useDistance, vf, dest ); diff --git a/assets/z_vr_assets.pk3 b/assets/z_vr_assets.pk3 index 384b5ef..93b2e5f 100644 Binary files a/assets/z_vr_assets.pk3 and b/assets/z_vr_assets.pk3 differ diff --git a/assets/z_vr_assets_jka.pk3 b/assets/z_vr_assets_jka.pk3 index 99aa884..fc843c0 100644 Binary files a/assets/z_vr_assets_jka.pk3 and b/assets/z_vr_assets_jka.pk3 differ diff --git a/z_vr_assets/ui/credits.menu b/z_vr_assets/ui/credits.menu index ca53eec..16ce4ce 100644 --- a/z_vr_assets/ui/credits.menu +++ b/z_vr_assets/ui/credits.menu @@ -50,7 +50,7 @@ { name none type ITEM_TYPE_TEXT - rect 0 50 640 40 + rect 0 35 640 40 text "--------------------" font 2 forecolor 1 1 1 1 @@ -65,11 +65,11 @@ { name none type ITEM_TYPE_TEXT - rect 0 100 640 40 + rect 0 70 640 40 text "Team Beef are DrBeef, Baggyg, Bummser" font 2 forecolor 0 0 1 1 - textscale 1.2 + textscale 1.3 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -80,11 +80,11 @@ { name none type ITEM_TYPE_TEXT - rect 0 150 640 40 + rect 0 120 640 40 text "Lead programmer" font 2 forecolor 1 0 0 1 - textscale 1.2 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -95,11 +95,11 @@ { name none type ITEM_TYPE_TEXT - rect 0 200 640 40 + rect 0 140 640 40 text "DrBeef" font 2 forecolor 1 1 1 1 - textscale 1.2 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -110,11 +110,11 @@ { name none type ITEM_TYPE_TEXT - rect 0 250 640 40 - text "Companion App" + rect 0 170 640 40 + text "JKXR Companion App" font 2 forecolor 1 0 0 1 - textscale 1.2 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -125,11 +125,71 @@ { name none type ITEM_TYPE_TEXT - rect 0 300 640 40 + rect 0 190 640 40 text "Baggyg" font 2 forecolor 1 1 1 1 - textscale 1.2 + textscale 1.0 + textalign ITEM_ALIGN_CENTER + textalignx 320 + visible 1 + decoration + } + + itemDef + { + name none + type ITEM_TYPE_TEXT + rect 0 220 640 40 + text "Additional Development Contributions" + font 2 + forecolor 1 0 0 1 + textscale 1.0 + textalign ITEM_ALIGN_CENTER + textalignx 320 + visible 1 + decoration + } + + itemDef + { + name none + type ITEM_TYPE_TEXT + rect 0 240 640 40 + text "MuadDib" + font 2 + forecolor 1 1 1 1 + textscale 1.0 + textalign ITEM_ALIGN_CENTER + textalignx 320 + visible 1 + decoration + } + + itemDef + { + name none + type ITEM_TYPE_TEXT + rect 0 270 640 40 + text "VR Compatible Weapon Models" + font 2 + forecolor 1 0 0 1 + textscale 1.0 + textalign ITEM_ALIGN_CENTER + textalignx 320 + visible 1 + decoration + } + + itemDef + { + name none + type ITEM_TYPE_TEXT + rect 0 290 640 40 + text "Vince Crusty and Elin" + font 2 + forecolor 1 1 1 1 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -141,10 +201,10 @@ name none type ITEM_TYPE_TEXT rect 0 350 640 40 - text "Special Thanks to the Team Beef patrons and whole discord!" + text "With Special Thanks to:" font 2 forecolor 1 0 0 1 - textscale 1.2 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -155,11 +215,11 @@ { name none type ITEM_TYPE_TEXT - rect 0 350 640 40 - text "Special Thanks to the Team Beef patrons and whole discord!" + rect 0 380 640 40 + text "Team Beef patrons, all Team Beef discord members," font 2 - forecolor 1 0 0 1 - textscale 1.2 + forecolor 1 1 1 1 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -171,10 +231,40 @@ name none type ITEM_TYPE_TEXT rect 0 400 640 40 + text "the OpenJK Development Team and Raven Software for" + font 2 + forecolor 1 1 1 1 + textscale 1.0 + textalign ITEM_ALIGN_CENTER + textalignx 320 + visible 1 + decoration + } + + itemDef + { + name none + type ITEM_TYPE_TEXT + rect 0 420 640 40 + text "creating and open-sourcing these wonderful games" + font 2 + forecolor 1 1 1 1 + textscale 1.0 + textalign ITEM_ALIGN_CENTER + textalignx 320 + visible 1 + decoration + } + + itemDef + { + name none + type ITEM_TYPE_TEXT + rect 0 455 640 40 text "JKXR: https://www.quakevr.com/jkxr" font 2 forecolor 1 0 0 1 - textscale 1.2 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 diff --git a/z_vr_assets_jka/ui/credits.menu b/z_vr_assets_jka/ui/credits.menu index ca53eec..16ce4ce 100644 --- a/z_vr_assets_jka/ui/credits.menu +++ b/z_vr_assets_jka/ui/credits.menu @@ -50,7 +50,7 @@ { name none type ITEM_TYPE_TEXT - rect 0 50 640 40 + rect 0 35 640 40 text "--------------------" font 2 forecolor 1 1 1 1 @@ -65,11 +65,11 @@ { name none type ITEM_TYPE_TEXT - rect 0 100 640 40 + rect 0 70 640 40 text "Team Beef are DrBeef, Baggyg, Bummser" font 2 forecolor 0 0 1 1 - textscale 1.2 + textscale 1.3 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -80,11 +80,11 @@ { name none type ITEM_TYPE_TEXT - rect 0 150 640 40 + rect 0 120 640 40 text "Lead programmer" font 2 forecolor 1 0 0 1 - textscale 1.2 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -95,11 +95,11 @@ { name none type ITEM_TYPE_TEXT - rect 0 200 640 40 + rect 0 140 640 40 text "DrBeef" font 2 forecolor 1 1 1 1 - textscale 1.2 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -110,11 +110,11 @@ { name none type ITEM_TYPE_TEXT - rect 0 250 640 40 - text "Companion App" + rect 0 170 640 40 + text "JKXR Companion App" font 2 forecolor 1 0 0 1 - textscale 1.2 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -125,11 +125,71 @@ { name none type ITEM_TYPE_TEXT - rect 0 300 640 40 + rect 0 190 640 40 text "Baggyg" font 2 forecolor 1 1 1 1 - textscale 1.2 + textscale 1.0 + textalign ITEM_ALIGN_CENTER + textalignx 320 + visible 1 + decoration + } + + itemDef + { + name none + type ITEM_TYPE_TEXT + rect 0 220 640 40 + text "Additional Development Contributions" + font 2 + forecolor 1 0 0 1 + textscale 1.0 + textalign ITEM_ALIGN_CENTER + textalignx 320 + visible 1 + decoration + } + + itemDef + { + name none + type ITEM_TYPE_TEXT + rect 0 240 640 40 + text "MuadDib" + font 2 + forecolor 1 1 1 1 + textscale 1.0 + textalign ITEM_ALIGN_CENTER + textalignx 320 + visible 1 + decoration + } + + itemDef + { + name none + type ITEM_TYPE_TEXT + rect 0 270 640 40 + text "VR Compatible Weapon Models" + font 2 + forecolor 1 0 0 1 + textscale 1.0 + textalign ITEM_ALIGN_CENTER + textalignx 320 + visible 1 + decoration + } + + itemDef + { + name none + type ITEM_TYPE_TEXT + rect 0 290 640 40 + text "Vince Crusty and Elin" + font 2 + forecolor 1 1 1 1 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -141,10 +201,10 @@ name none type ITEM_TYPE_TEXT rect 0 350 640 40 - text "Special Thanks to the Team Beef patrons and whole discord!" + text "With Special Thanks to:" font 2 forecolor 1 0 0 1 - textscale 1.2 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -155,11 +215,11 @@ { name none type ITEM_TYPE_TEXT - rect 0 350 640 40 - text "Special Thanks to the Team Beef patrons and whole discord!" + rect 0 380 640 40 + text "Team Beef patrons, all Team Beef discord members," font 2 - forecolor 1 0 0 1 - textscale 1.2 + forecolor 1 1 1 1 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1 @@ -171,10 +231,40 @@ name none type ITEM_TYPE_TEXT rect 0 400 640 40 + text "the OpenJK Development Team and Raven Software for" + font 2 + forecolor 1 1 1 1 + textscale 1.0 + textalign ITEM_ALIGN_CENTER + textalignx 320 + visible 1 + decoration + } + + itemDef + { + name none + type ITEM_TYPE_TEXT + rect 0 420 640 40 + text "creating and open-sourcing these wonderful games" + font 2 + forecolor 1 1 1 1 + textscale 1.0 + textalign ITEM_ALIGN_CENTER + textalignx 320 + visible 1 + decoration + } + + itemDef + { + name none + type ITEM_TYPE_TEXT + rect 0 455 640 40 text "JKXR: https://www.quakevr.com/jkxr" font 2 forecolor 1 0 0 1 - textscale 1.2 + textscale 1.0 textalign ITEM_ALIGN_CENTER textalignx 320 visible 1