teambeef/quake2quest
0
0
Fork 0
mirror of https://github.com/DrBeef/Quake2Quest.git synced 2025-02-21 10:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update version for release

Browse source 
Also ensure the grenade launcher uses the trjectory for the laser sight
This commit is contained in:
Simon 2019-12-13 12:54:34 +00:00
parent 4d65a8f78e
commit 2838832544
5 changed files with 19 additions and 12 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"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.quake2quest" package="com.drbeef.quake2quest"
android:versionCode="10" android:versionCode="11"
android:versionName="0.9.2" android:installLocation="auto" > android:versionName="1.0.0" 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="0x00030001" android:required="true"/> <uses-feature android:glEsVersion="0x00030001" android:required="true"/>

17
Projects/Android/jni/quake2/src/client/cl_tempentities.c
View file

@ -523,7 +523,8 @@ void CL_ParseLaserSight ()
cl_lasersight.endtime = cl.time+250; cl_lasersight.endtime = cl.time+250;
} }
void SetWeapon6DOF(int weapmodel, vec3_t origin, vec3_t gunorigin, vec3_t gunangles); //void SetWeapon6DOF(int weapmodel, vec3_t origin, vec3_t gunorigin, vec3_t gunangles);
void convertFromVRtoQ2(vec3_t in, vec3_t offset, vec3_t out);
trace_t CL_Trace (vec3_t start, vec3_t end, float size, int contentmask) trace_t CL_Trace (vec3_t start, vec3_t end, float size, int contentmask)
{ {
@ -535,18 +536,24 @@ trace_t CL_Trace (vec3_t start, vec3_t end, float size, int contentmask)
return CM_BoxTrace (start, end, mins, maxs, 0, contentmask); return CM_BoxTrace (start, end, mins, maxs, 0, contentmask);
} }
extern vec3_t weaponangles;
extern vec3_t weaponoffset;
void CL_UpdateLaserSightOrigins () void CL_UpdateLaserSightOrigins ()
{ {
if (cl_lasersight.endtime > cl.time) { if (cl_lasersight.endtime > cl.time) {
vec3_t forward, right; vec3_t forward, right;
vec3_t end; vec3_t end;
vec3_t gunorigin; vec3_t gunorigin;
vec3_t gunangles;
//At the point of calling this, the vieworg should already have the player height included //At the point of calling this, the vieworg should already have the player height included
SetWeapon6DOF(0, cl.refdef.vieworg, gunorigin, gunangles); convertFromVRtoQ2(weaponoffset, cl.refdef.vieworg, gunorigin);
gunorigin[2] += 1; // just add a little bit gunorigin[2] += 1; // just add a little bit
AngleVectors(gunangles, forward, right, NULL); AngleVectors(weaponangles, forward, right, NULL);
VectorMA(gunorigin, (float)(cl_lasersight.ent.frame != 6 ? 4096.0 : 6.0), forward, end);
qboolean useTrajectoryIndicator = cl_lasersight.ent.frame == 6 || cl_lasersight.ent.frame == 7;
VectorMA(gunorigin, (float)(useTrajectoryIndicator ? 16.0 : 4096.0), forward, end);
trace_t tr = CL_Trace(gunorigin, end, 1, trace_t tr = CL_Trace(gunorigin, end, 1,
CONTENTS_SOLID | CONTENTS_MONSTER | CONTENTS_DEADMONSTER); CONTENTS_SOLID | CONTENTS_MONSTER | CONTENTS_DEADMONSTER);
VectorCopy(gunorigin, cl_lasersight.ent.origin); VectorCopy(gunorigin, cl_lasersight.ent.origin);

2
Projects/Android/jni/quake2/src/common/header/common.h
View file

@ -32,7 +32,7 @@
#include "shared.h" #include "shared.h"
#include "crc.h" #include "crc.h"
#define Q2QVERSION "0.9.2" #define Q2QVERSION "1.0.0"
#define YQ2VERSION "7.41" #define YQ2VERSION "7.41"
#define BASEDIRNAME "Quake2Quest" #define BASEDIRNAME "Quake2Quest"

6
Projects/Android/local.properties
View file

@ -4,6 +4,6 @@
# Location of the SDK. This is only used by Gradle. # Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the # For customization when using a Version Control System, please read the
# header note. # header note.
#Sun Dec 08 15:32:07 CET 2019 #Thu Dec 12 20:21:11 GMT 2019
ndk.dir=C\:\\Users\\baggyg\\AppData\\Local\\Android\\Sdk\\ndk-bundle ndk.dir=C\:\\Users\\Simon\\AppData\\Local\\Android\\Sdk\\ndk-bundle
sdk.dir=C\:\\Users\\baggyg\\AppData\\Local\\Android\\Sdk sdk.dir=C\:\\Users\\Simon\\AppData\\Local\\Android\\Sdk

2
assets/config.cfg
View file

@ -2,8 +2,8 @@
//set cheats "1" //set cheats "1"
set gl_texturemode "GL_LINEAR_MIPMAP_Linear" set gl_texturemode "GL_LINEAR_MIPMAP_Linear"
set gl_shadows "1" set gl_shadows "1"
set gl1_stencilshadow "1"
set s_loadas8bit "0" set s_loadas8bit "0"
set vid_gamma "0.900000"
set cl_showfps "1" set cl_showfps "1"
/////////////////////// key bindings /////////////////////// key bindings