teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2025-02-20 19:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

g_TeamBeefDirectorsCut

Browse source 
some other very minor fixes at the same time
This commit is contained in:
Simon 2023-01-19 21:43:53 +00:00
parent 15d08031db
commit fb59d40e3f
14 changed files with 125 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Projects/Android/jni/OpenJK/Android.mk
View file

@ -2,8 +2,8 @@ LOCAL_PATH := $(call my-dir)
# Uncomment for the correct headset - slight changes required in OpenXR implementation
#OPENXR_HMD = -DMETA_QUEST
OPENXR_HMD = -DPICO_XR
OPENXR_HMD = -DMETA_QUEST
#OPENXR_HMD = -DPICO_XR
JK3_BASE_CFLAGS = $(OPENXR_HMD) -O1 -DHAVE_GLES -DFINAL_BUILD -fexceptions -Wall -Wno-write-strings -Wno-comment -fno-caller-saves -fno-tree-vectorize -Wno-unused-but-set-variable -fvisibility=hidden
JK3_BASE_CPPFLAGS = -fvisibility-inlines-hidden -Wno-invalid-offsetof -fvisibility=hidden
@ -16,6 +16,7 @@ JK3_BASE_LDLIBS += -Wl
JK3_BASE_C_INCLUDES := $(OPENJK_PATH)/lib $(JK3_CODE_PATH)/client $(JK3_CODE_PATH)/server $(JK3_CODE_PATH)/libs/freetype2/include $(JK3_CODE_PATH)/common $(JK3_CODE_PATH)/gl
JK3_BASE_C_INCLUDES += $(LOCAL_PATH)/../../../../../../3rdParty/khronos/openxr/OpenXR-SDK/include
JK3_BASE_C_INCLUDES += $(LOCAL_PATH)/../../../../../../3rdParty/khronos/openxr/OpenXR-SDK/src/common
JK3_BASE_C_INCLUDES += $(JK3_CODE_PATH)/ $(OPENJK_PATH)/code/ $(OPENJK_PATH)/shared/ $(JK3_CODE_PATH)/ui $(OPENJK_PATH)/lib/gsl-lite/include
# Jedi Outcast

4
Projects/Android/jni/OpenJK/Android_client_ja.mk
View file

@ -129,8 +129,8 @@ JKVR_SRC_FILES := ${TOP_DIR}/JKVR/JKVR_SurfaceView.cpp \
${TOP_DIR}/JKVR/VrInputDefault.cpp \
${TOP_DIR}/JKVR/VrInputWeaponAlign.cpp \
${TOP_DIR}/JKVR/argtable3.c \
${TOP_DIR}/JKVR/OpenXRInput_MetaQuest.cpp \
${TOP_DIR}/JKVR/OpenXRInput_PicoXR.cpp
${TOP_DIR}/JKVR/OpenXrInput_MetaQuest.cpp \
${TOP_DIR}/JKVR/OpenXrInput_PicoXR.cpp
LOCAL_SRC_FILES += $(JK3_SRC) $(JKVR_SRC_FILES)

4
Projects/Android/jni/OpenJK/Android_client_jo.mk
View file

@ -129,8 +129,8 @@ JKVR_SRC_FILES := ${TOP_DIR}/JKVR/JKVR_SurfaceView.cpp \
${TOP_DIR}/JKVR/VrInputDefault.cpp \
${TOP_DIR}/JKVR/VrInputWeaponAlign.cpp \
${TOP_DIR}/JKVR/argtable3.c \
${TOP_DIR}/JKVR/OpenXRInput_MetaQuest.cpp \
${TOP_DIR}/JKVR/OpenXRInput_PicoXR.cpp
${TOP_DIR}/JKVR/OpenXrInput_MetaQuest.cpp \
${TOP_DIR}/JKVR/OpenXrInput_PicoXR.cpp
LOCAL_SRC_FILES += $(JK3_SRC) $(JKVR_SRC_FILES)

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

@ -148,6 +148,8 @@ extern cvar_t *g_stepSlideFix;
extern cvar_t *g_saberAutoBlocking;
extern cvar_t *g_saberAutoDeflect1stPerson;
extern cvar_t *g_TeamBeefDirectorsCut;
static void PM_SetWaterLevelAtPoint( vec3_t org, int *waterlevel, int *watertype );
#define FLY_NONE 0

4
Projects/Android/jni/OpenJK/code/game/g_main.cpp
View file

@ -186,6 +186,8 @@ cvar_t *g_AIsurrender;
cvar_t *g_numEntities;
//cvar_t *g_iscensored;
cvar_t *g_TeamBeefDirectorsCut;
cvar_t *g_saberAutoDeflect1stPerson;
cvar_t *g_saberAutoBlocking;
cvar_t *g_saberRealisticCombat;
@ -660,6 +662,8 @@ void G_InitCvars( void ) {
g_subtitles = gi.cvar( "g_subtitles", "0", CVAR_ARCHIVE );
com_buildScript = gi.cvar ("com_buildscript", "0", 0);
g_TeamBeefDirectorsCut = gi.cvar( "g_TeamBeefDirectorsCut", "1", CVAR_ARCHIVE ); // Team Beef Director's Cut tweaks
g_saberAutoDeflect1stPerson = gi.cvar( "g_saberAutoDeflect1stPerson", "0", CVAR_CHEAT );//Whether the saber will auto deflect missiles in first person
g_saberAutoBlocking = gi.cvar( "g_saberAutoBlocking", "0", CVAR_CHEAT );//must press +block button to do any blocking
g_saberRealisticCombat = gi.cvar( "g_saberMoreRealistic", "1", CVAR_ARCHIVE );//makes collision more precise, increases damage

4
Projects/Android/jni/OpenJK/code/rd-gles/G2_API.cpp
View file

@ -948,8 +948,8 @@ qboolean G2API_RemoveGhoul2Model(CGhoul2Info_v &ghlInfo, const int modelIndex)
{
// if we hit this assert then we are trying to delete a ghoul2 model on a ghoul2 instance that
// one way or another is already gone.
G2ERROR(0,"Remove Nonexistant Model");
assert(0 && "remove non existing model");
//G2ERROR(0,"Remove Nonexistant Model");
//assert(0 && "remove non existing model");
return qfalse;
}

4
Projects/Android/jni/OpenJK/codeJK2/game/g_main.cpp
View file

@ -164,6 +164,8 @@ cvar_t *g_AIsurrender;
cvar_t *g_numEntities;
cvar_t *g_iscensored;
cvar_t *g_TeamBeefDirectorsCut;
cvar_t *g_saberAutoDeflect1stPerson;
cvar_t *g_saberAutoBlocking;
cvar_t *g_saberRealisticCombat;
@ -584,6 +586,8 @@ void G_InitCvars( void ) {
g_subtitles = gi.cvar( "g_subtitles", "0", CVAR_ARCHIVE );
com_buildScript = gi.cvar ("com_buildscript", "0", 0);
g_TeamBeefDirectorsCut = gi.cvar( "g_TeamBeefDirectorsCut", "1", CVAR_ARCHIVE ); // Team Beef Director's Cut tweaks
g_saberAutoDeflect1stPerson = gi.cvar( "g_saberAutoDeflect1stPerson", "0", CVAR_ARCHIVE|CVAR_CHEAT );//Whether the saber will auto deflect missiles in first person
g_saberAutoBlocking = gi.cvar( "g_saberAutoBlocking", "0", CVAR_ARCHIVE|CVAR_CHEAT );//must press +block button to do any blocking
g_saberRealisticCombat = gi.cvar( "g_saberRealisticCombat", "1", CVAR_ARCHIVE );//makes collision more precise, increases damage

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

@ -118,6 +118,8 @@ void ForceThrow( gentity_t *self, qboolean pull );
qboolean WP_ForcePowerAvailable( gentity_t *self, forcePowers_t forcePower, int overrideAmt );
void WP_ForcePowerDrain( gentity_t *self, forcePowers_t forcePower, int overrideAmt );
extern cvar_t *g_TeamBeefDirectorsCut;
extern cvar_t *g_saberAutoDeflect1stPerson;
extern cvar_t *g_saberAutoBlocking;
extern cvar_t *g_saberRealisticCombat;

1
assets/openjo_sp_pico.cfg
View file

@ -113,6 +113,7 @@ seta cl_renderer "rd-gles-jo"
seta com_maxfps "125"
seta d_slowmodeath "4"
seta expanded_menu_enabled "0"
seta g_TeamBeefDirectorsCut "1"
seta g_dismemberment "3"
seta g_dismemberprobabilities "100"
seta g_saberAnimSpeed "1.300000"

1
assets/openjo_sp_quest.cfg
View file

@ -113,6 +113,7 @@ seta cl_renderer "rd-gles-jo"
seta com_maxfps "125"
seta d_slowmodeath "4"
seta expanded_menu_enabled "0"
seta g_TeamBeefDirectorsCut "1"
seta g_dismemberment "3"
seta g_dismemberprobabilities "100"
seta g_saberAnimSpeed "1.300000"

BIN
assets/z_vr_assets.pk3
View file

Binary file not shown.

12
z_vr_assets/strip/menus_vr.sp
View file

@ -3,7 +3,7 @@ CONFIG W:\bin\striped.cfg
ID 100
REFERENCE MENUS_VR
DESCRIPTION "VR Menu Localizations"
COUNT 134
COUNT 136
INDEX 0
{
REFERENCE COMMON_CONTROLS_ITEM
@ -674,3 +674,13 @@ INDEX 133
REFERENCE USE_GESTURE_BOUNDARY_DESC
TEXT_LANGUAGE1 "Configures how far you need to reach to activate use gesture."
}
INDEX 134
{
REFERENCE DIRECTORS_CUT_ITEM
TEXT_LANGUAGE1 "Team Beef Director's Cut:"
}
INDEX 135
{
REFERENCE DIRECTORS_CUT_DESC
TEXT_LANGUAGE1 "Various tweaks for better balance of VR gameplay."
}

61
z_vr_assets/ui/ingamesetup.menu
View file

@ -2666,6 +2666,40 @@
// DIFFICULTY FIELDS
//
//----------------------------------------------------------------------------------------------
itemDef
{
name none
group difficulty
type ITEM_TYPE_YESNO
text @MENUS_VR_DIRECTORS_CUT_ITEM
cvar "g_TeamBeefDirectorsCut"
rect 315 191 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
font 2
textscale 0.8
forecolor 1 1 1 1
visible 0
// appearance_slot 2
descText @MENUS_VR_DIRECTORS_CUT_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight2
}
mouseexit
{
hide highlight2
}
}
itemDef
{
name none
@ -2673,7 +2707,7 @@
type ITEM_TYPE_YESNO
text @MENUS_VR_LASER_AUTODEFLECTING_ITEM
cvar "g_saberAutoDeflect1stPerson"
rect 315 191 300 20
rect 315 231 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
@ -2690,12 +2724,12 @@
mouseenter
{
show highlight2
show highlight4
}
mouseexit
{
hide highlight2
hide highlight4
}
}
@ -2714,7 +2748,7 @@
@MENUS_VR_SABER_REALISM_CRITICAL 2
@MENUS_VR_SABER_REALISM_INSTANT 3
}
rect 315 211 300 20
rect 315 251 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
@ -2731,12 +2765,12 @@
mouseenter
{
show highlight3
show highlight5
}
mouseexit
{
hide highlight3
hide highlight5
}
}
@ -2753,7 +2787,7 @@
@MENUS_VR_FENCING_SPEED_DEFAULT 1.2
@MENUS_VR_FENCING_SPEED_FASTER 1.3
}
rect 315 231 300 20
rect 315 271 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
@ -2765,16 +2799,17 @@
descText @MENUS_VR_FENCING_SPEED_DESC
action
{
play "sound/interface/button1.wav" ;
play sound/interface/button1
}
mouseenter
{
show highlight4
show highlight6
}
mouseexit
{
hide highlight4
hide highlight6
}
}
@ -2792,7 +2827,7 @@
@MENUS2_JEDI_KNIGHT 2
@MENUS1_JEDI_MASTER 3
}
rect 315 271 300 20
rect 315 311 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
@ -2809,11 +2844,11 @@
mouseenter
{
show highlight6
show highlight8
}
mouseexit
{
hide highlight6
hide highlight8
}
}

52
z_vr_assets/ui/setup.menu
View file

@ -2755,6 +2755,40 @@
// DIFFICULTY FIELDS
//
//----------------------------------------------------------------------------------------------
itemDef
{
name none
group difficulty
type ITEM_TYPE_YESNO
text @MENUS_VR_DIRECTORS_CUT_ITEM
cvar "g_TeamBeefDirectorsCut"
rect 315 191 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
font 2
textscale 0.8
forecolor 1 1 1 1
visible 0
// appearance_slot 2
descText @MENUS_VR_DIRECTORS_CUT_DESC
action
{
play sound/interface/button1
}
mouseenter
{
show highlight2
}
mouseexit
{
hide highlight2
}
}
itemDef
{
name none
@ -2762,7 +2796,7 @@
type ITEM_TYPE_YESNO
text @MENUS_VR_LASER_AUTODEFLECTING_ITEM
cvar "g_saberAutoDeflect1stPerson"
rect 315 191 300 20
rect 315 231 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
@ -2779,12 +2813,12 @@
mouseenter
{
show highlight2
show highlight4
}
mouseexit
{
hide highlight2
hide highlight4
}
}
@ -2803,7 +2837,7 @@
@MENUS_VR_SABER_REALISM_CRITICAL 2
@MENUS_VR_SABER_REALISM_INSTANT 3
}
rect 315 211 300 20
rect 315 251 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
@ -2820,12 +2854,12 @@
mouseenter
{
show highlight3
show highlight5
}
mouseexit
{
hide highlight3
hide highlight5
}
}
@ -2842,7 +2876,7 @@
@MENUS_VR_FENCING_SPEED_DEFAULT 1.2
@MENUS_VR_FENCING_SPEED_FASTER 1.3
}
rect 315 231 300 20
rect 315 271 300 20
textalign ITEM_ALIGN_RIGHT
textalignx 151
textaligny -2
@ -2859,12 +2893,12 @@
mouseenter
{
show highlight4
show highlight6
}
mouseexit
{
hide highlight4
hide highlight6
}
}