Merge remote-tracking branch 'origin/master' into questzdoom

This commit is contained in:
Emanuele Disco 2021-11-12 13:47:26 +09:00
commit e1371f4bde
5 changed files with 5 additions and 4 deletions

2
.gitmodules vendored
View file

@ -1,4 +1,4 @@
[submodule "gzdoom"]
path = Projects/Android/jni/gzdoom-g3.3mgw_mobile
url = https://github.com/emawind84/gzdoom.git
url = https://github.com/DrBeef/gzdoom.git
branch = questzdoom

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.questzdoom"
android:versionCode="29"
android:versionName="1.3.0" android:installLocation="auto" >
android:versionCode="31"
android:versionName="1.4.0" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030001" android:required="true"/>

View file

@ -177,6 +177,7 @@ void HandleInput_Default( int control_scheme, ovrInputStateGamepad *pFootTrackin
offhandoffset[2] = v[0];
vec3_t rotation = {0};
rotation[PITCH] = vr_weapon_pitchadjust;
QuatToYawPitchRoll(pOffTracking->HeadPose.Pose.Orientation, rotation, offhandangles);
if (vr_moveuseoffhand) {

@ -1 +1 @@
Subproject commit 9155ab78b52e490213659a570fccce3c4a65f224
Subproject commit c6b023d3e32fac0986c2b65076c761db75696e7c

Binary file not shown.