mirror of
https://github.com/DrBeef/QuestZDoom.git
synced 2025-02-22 03:51:36 +00:00
Major Update - LZDoom 3.85
- Updated to LZDoom 3.85 - Fix for issue where multi-projectile weapons don't have projectile spread - Configurable cinema mode toggle button
This commit is contained in:
parent
42b4cf7859
commit
4f3b54e84a
1094 changed files with 36038 additions and 28203 deletions
|
@ -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="17"
|
||||
android:versionName="1.0.1" android:installLocation="auto" >
|
||||
android:versionCode="18"
|
||||
android:versionName="1.1.0" android:installLocation="auto" >
|
||||
|
||||
<!-- Tell the system this app requires OpenGL ES 3.1. -->
|
||||
<uses-feature android:glEsVersion="0x00030001" android:required="true"/>
|
||||
|
|
|
@ -71,7 +71,7 @@ bool player_moving;
|
|||
bool shutdown;
|
||||
bool ready_teleport;
|
||||
bool trigger_teleport;
|
||||
|
||||
bool cinemamode;
|
||||
|
||||
#if !defined( EGL_OPENGL_ES3_BIT_KHR )
|
||||
#define EGL_OPENGL_ES3_BIT_KHR 0x0040
|
||||
|
@ -173,7 +173,7 @@ void QzDoom_setUseScreenLayer(bool use)
|
|||
|
||||
bool QzDoom_useScreenLayer()
|
||||
{
|
||||
return useVirtualScreen;
|
||||
return useVirtualScreen || cinemamode;
|
||||
}
|
||||
|
||||
static void UnEscapeQuotes( char *arg )
|
||||
|
@ -1304,6 +1304,8 @@ void VR_Init()
|
|||
shutdown = false;
|
||||
ready_teleport = false;
|
||||
trigger_teleport = false;
|
||||
|
||||
cinemamode = false;
|
||||
}
|
||||
|
||||
static ovrAppThread * gAppThread = NULL;
|
||||
|
|
|
@ -110,7 +110,6 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
|
|||
const ovrQuatf quatRemote = pDominantTracking->HeadPose.Pose.Orientation;
|
||||
vec3_t rotation = {0};
|
||||
rotation[PITCH] = vr_weapon_pitchadjust;
|
||||
//rotation[YAW] = (doomYaw - hmdorientation[YAW]);
|
||||
QuatToYawPitchRoll(quatRemote, rotation, weaponangles);
|
||||
|
||||
|
||||
|
@ -145,7 +144,6 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
|
|||
offhandoffset[2] = v[0];
|
||||
|
||||
vec3_t rotation = {0};
|
||||
rotation[PITCH] = 20;
|
||||
QuatToYawPitchRoll(pOffTracking->HeadPose.Pose.Orientation, rotation, offhandangles);
|
||||
|
||||
if (vr_moveuseoffhand != 0) {
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
cmake_minimum_required( VERSION 2.8.7 )
|
||||
|
||||
make_release_only()
|
||||
use_fast_math()
|
||||
|
||||
add_definitions(-DADLMIDI_DISABLE_MIDI_SEQUENCER)
|
||||
|
||||
add_library( adl STATIC
|
||||
adldata.cpp
|
||||
adlmidi.cpp
|
||||
adlmidi_load.cpp
|
||||
adlmidi_midiplay.cpp
|
||||
adlmidi_opl3.cpp
|
||||
adlmidi_private.cpp
|
||||
chips/dosbox/dbopl.cpp
|
||||
chips/dosbox_opl3.cpp
|
||||
chips/nuked/nukedopl3_174.c
|
||||
chips/nuked/nukedopl3.c
|
||||
chips/nuked_opl3.cpp
|
||||
chips/nuked_opl3_v174.cpp
|
||||
wopl/wopl_file.c
|
||||
)
|
||||
target_link_libraries( adl )
|
|
@ -504,9 +504,9 @@ ADLMIDI_EXPORT void adl_setLoopEnabled(ADL_MIDIPlayer *device, int loopEn)
|
|||
{
|
||||
if(!device)
|
||||
return;
|
||||
MidiPlayer *play = GET_MIDI_PLAYER(device);
|
||||
assert(play);
|
||||
#ifndef ADLMIDI_DISABLE_MIDI_SEQUENCER
|
||||
MidiPlayer *play = GET_MIDI_PLAYER(device);
|
||||
assert(play);
|
||||
play->m_sequencer.setLoopEnabled(loopEn != 0);
|
||||
#else
|
||||
ADL_UNUSED(loopEn);
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue