teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-24 21:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to credits (further changes pending)

Browse source 
also default gesture use to be on
This commit is contained in:
Simon 2023-03-05 16:13:44 +00:00
parent 911d89557d
commit ac8ac8f6d9
12 changed files with 227 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Projects/Android/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.jkxr"
android:versionCode="39"
android:versionName="0.6.2" android:installLocation="auto" >
android:versionCode="40"
android:versionName="0.7.0" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030002" android:required="true"/>

2
Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp
View file

@ -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);

2
Projects/Android/jni/OpenJK/code/game/g_active.cpp
View file

@ -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 )

2
Projects/Android/jni/OpenJK/code/game/g_trigger.cpp
View file

@ -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

2
Projects/Android/jni/OpenJK/code/game/g_utils.cpp
View file

@ -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 );

2
Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp
View file

@ -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 )

2
Projects/Android/jni/OpenJK/codeJK2/game/g_trigger.cpp
View file

@ -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

2
Projects/Android/jni/OpenJK/codeJK2/game/g_utils.cpp
View file

@ -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 );

BIN
assets/z_vr_assets.pk3
View file

Binary file not shown.

BIN
assets/z_vr_assets_jka.pk3
View file

Binary file not shown.

128
z_vr_assets/ui/credits.menu
View file

@ -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

128
z_vr_assets_jka/ui/credits.menu
View file

@ -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