Oops forgot to commit this before the v1.1.1 release!

This commit is contained in:
Simon 2020-09-04 21:28:43 +01:00
parent 0644bd7cf1
commit ae448f8dd0
5 changed files with 10 additions and 5 deletions

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.rtcwquest" package="com.drbeef.rtcwquest"
android:versionCode="38" android:versionCode="39"
android:versionName="1.1.0" android:installLocation="auto" > android:versionName="1.1.1" 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"/>

View file

@ -3573,7 +3573,7 @@ void CG_ApplyShakeCamera() {
VectorAdd( cg.refdefViewAngles, cg.cameraShakeAngles, cg.refdefViewAngles ); VectorAdd( cg.refdefViewAngles, cg.cameraShakeAngles, cg.refdefViewAngles );
AnglesToAxis( cg.refdefViewAngles, cg.refdef.viewaxis ); AnglesToAxis( cg.refdefViewAngles, cg.refdef.viewaxis );
if (VectorLength(cg.cameraShakeAngles) > 0.01f) if (VectorLength(cg.cameraShakeAngles) > 0.1f)
{ {
trap_Vibrate(10, 0, Com_Clamp(0.0f, 1.0f, fabs(cg.cameraShakeAngles[0]))); trap_Vibrate(10, 0, Com_Clamp(0.0f, 1.0f, fabs(cg.cameraShakeAngles[0])));
trap_Vibrate(10, 1, Com_Clamp(0.0f, 1.0f, fabs(cg.cameraShakeAngles[1]))); trap_Vibrate(10, 1, Com_Clamp(0.0f, 1.0f, fabs(cg.cameraShakeAngles[1])));

View file

@ -411,6 +411,10 @@ void CG_Bleed( vec3_t origin, int entityNum ) {
0.1 ); // rand scale 0.1 ); // rand scale
} }
{
//Make a hit blood cloud
CG_ParticleBloodCloud( cent, bOrigin, vec3_origin );
}
} }
// done. // done.
} }

View file

@ -2635,6 +2635,7 @@ void CG_AddPacketEntities( void ) {
// no entities should be marked as interpolating // no entities should be marked as interpolating
} }
VectorClear(cg.cameraShakeAngles);
cg.rumbleScale = 0.0; // RF, default to 0 each frame cg.rumbleScale = 0.0; // RF, default to 0 each frame
// the auto-rotating items will all have the same axis // the auto-rotating items will all have the same axis

View file

@ -42,7 +42,7 @@ If you have questions concerning this license or the applicable additional terms
// q_shared.h -- included first by ALL program modules. // q_shared.h -- included first by ALL program modules.
// A user mod should never modify this file // A user mod should never modify this file
#define Q3_VERSION "RTCWQuest 1.1.0 (Wolf 1.41)" #define Q3_VERSION "RTCWQuest 1.1.1 (Wolf 1.41)"
// ver 1.0.0 - release // ver 1.0.0 - release
// ver 1.0.1 - post-release work // ver 1.0.1 - post-release work
// ver 1.1.0 - patch 1 (12/12/01) // ver 1.1.0 - patch 1 (12/12/01)