teambeef
/
jkxr
mirror of https://github.com/DrBeef/JKXR.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make gaze based force push.pull more forgiving to the player's aim

This commit is contained in:
Simon 2023-12-09 20:16:47 +00:00
parent 1141b17bf1
commit 48e9037aaf
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projects/Android/AndroidManifest.xml
View File

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.jkxr" package="com.drbeef.jkxr"
android:versionCode="66" android:versionCode="66"
android:versionName="1.1.22" android:installLocation="auto" > android:versionName="1.1.23" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. --> <!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030002" android:required="true"/> <uses-feature android:glEsVersion="0x00030002" android:required="true"/>

6
Projects/Android/jni/OpenJK/code/game/wp_saber.cpp
View File

@ -9262,11 +9262,13 @@ void ForceThrowEx( gentity_t *self, qboolean pull, qboolean fake, qboolean aimBy
if ( pull ) if ( pull )
{ {
cone = forcePullCone[self->client->ps.forcePowerLevel[FP_PULL]]; cone = forcePullCone[self->client->ps.forcePowerLevel[FP_PULL]] -
((aimByViewAngles != 0) ? 0.05f : 0.0f);
} }
else else
{ {
cone = forcePushCone[self->client->ps.forcePowerLevel[FP_PUSH]]; cone = forcePushCone[self->client->ps.forcePowerLevel[FP_PUSH]] -
((aimByViewAngles != 0) ? 0.05f : 0.0f);
} }
// if ( cone >= 1.0f ) // if ( cone >= 1.0f )

2
Projects/Android/jni/OpenJK/code/qcommon/stv_version.h
View File

@ -23,7 +23,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
// Current version of the single player game // Current version of the single player game
#include "../win32/AutoVersion.h" #include "../win32/AutoVersion.h"
#define JKXR_VERSION "1.1.22-ea" #define JKXR_VERSION "1.1.23"
#ifdef _DEBUG #ifdef _DEBUG
#define Q3_VERSION "(debug)OpenJK: v" VERSION_STRING_DOTTED " JKXR: " JKXR_VERSION #define Q3_VERSION "(debug)OpenJK: v" VERSION_STRING_DOTTED " JKXR: " JKXR_VERSION

6
Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp
View File

@ -5765,11 +5765,13 @@ void ForceThrowEx( gentity_t *self, qboolean pull, qboolean aimByViewAngles )
if ( pull ) if ( pull )
{ {
cone = forcePullCone[self->client->ps.forcePowerLevel[FP_PULL]]; cone = forcePullCone[self->client->ps.forcePowerLevel[FP_PULL]] -
((aimByViewAngles != 0) ? 0.05f : 0.0f);
} }
else else
{ {
cone = forcePushCone[self->client->ps.forcePowerLevel[FP_PUSH]]; cone = forcePushCone[self->client->ps.forcePowerLevel[FP_PUSH]] -
((aimByViewAngles != 0) ? 0.05f : 0.0f);
} }
if ( cone >= 1.0f ) if ( cone >= 1.0f )