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

Several changes

Browse source 
- Awesome custom Arena Gate Quest Home courtesy of ROBYER1
- Tweak to credits (to include ROBYER1)
- New menu background thanks to Artsmen
This commit is contained in:
Simon 2022-04-06 23:19:44 +01:00
parent 8af442434e
commit d0e1a38e74
7 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/app/src/main/AndroidManifest.xml
View file

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.ioq3quest" package="com.drbeef.ioq3quest"
android:installLocation="preferExternal" android:installLocation="preferExternal"
android:versionCode="40" android:versionCode="45"
android:versionName="0.28.0"> android:versionName="0.30.2">
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" /> <uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
<uses-feature android:glEsVersion="0x00030001" /> <uses-feature android:glEsVersion="0x00030001" />
<!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>--> <!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>-->
@ -23,6 +23,7 @@
<meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/> <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
<meta-data android:name="com.oculus.supportedDevices" android:value="quest|quest2"/> <meta-data android:name="com.oculus.supportedDevices" android:value="quest|quest2"/>
<meta-data android:name="com.oculus.ossplash" android:value="true"/> <meta-data android:name="com.oculus.ossplash" android:value="true"/>
<meta-data android:name="com.oculus.environmentVersion" android:value="1"/>
<activity android:name="com.drbeef.ioq3quest.MainActivity" <activity android:name="com.drbeef.ioq3quest.MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:screenOrientation="landscape" android:screenOrientation="landscape"

BIN
android/app/src/main/assets/pak66.pk3 Normal file
View file

Binary file not shown.

BIN
android/app/src/main/assets/scene.zip Normal file
View file

Binary file not shown.

12
android/app/src/main/cpp/code/cgame/cg_players.c
View file

@ -1913,8 +1913,8 @@ static void CG_PlayerPowerups( centity_t *cent, refEntity_t *torso ) {
} }
else { else {
vec3_t offset; vec3_t offset;
VectorSet(offset, 0, -16, 0); VectorSet(offset, 0, -1, 0);
CG_TrailItem( cent, cgs.media.redFlagModel, offset, 1.0f ); CG_TrailItem( cent, cgs.media.redFlagModel, offset, 0.1f );
} }
trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 1.0, 0.2f, 0.2f ); trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 1.0, 0.2f, 0.2f );
} }
@ -1926,8 +1926,8 @@ static void CG_PlayerPowerups( centity_t *cent, refEntity_t *torso ) {
} }
else { else {
vec3_t offset; vec3_t offset;
VectorSet(offset, 0, -16, 0); VectorSet(offset, 0, -1, 0);
CG_TrailItem( cent, cgs.media.blueFlagModel, offset, 1.0f ); CG_TrailItem( cent, cgs.media.blueFlagModel, offset, 0.1f );
} }
trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.2f, 0.2f, 1.0 ); trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.2f, 0.2f, 1.0 );
} }
@ -1939,8 +1939,8 @@ static void CG_PlayerPowerups( centity_t *cent, refEntity_t *torso ) {
} }
else { else {
vec3_t offset; vec3_t offset;
VectorSet(offset, 0, -16, 0); VectorSet(offset, 0, -1, 0);
CG_TrailItem( cent, cgs.media.neutralFlagModel, offset, 1.0f ); CG_TrailItem( cent, cgs.media.neutralFlagModel, offset, 0.1f );
} }
trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 1.0, 1.0, 1.0 ); trap_R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 1.0, 1.0, 1.0 );
} }

4
android/app/src/main/cpp/code/q3_ui/ui_credits.c
View file

@ -128,9 +128,9 @@ Special Thanks to the whole discord!
UI_DrawString( 320, y, "DrBeef", UI_CENTER|UI_SMALLFONT, color_white ); UI_DrawString( 320, y, "DrBeef", UI_CENTER|UI_SMALLFONT, color_white );
y += 1.42 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; y += 1.42 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE;
UI_DrawProportionalString( 320, y, "Companion App", UI_CENTER|UI_SMALLFONT, color_red ); UI_DrawProportionalString( 320, y, "Companion App Custom Quest Home", UI_CENTER|UI_SMALLFONT, color_red );
y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE;
UI_DrawString( 320, y, "Baggyg", UI_CENTER|UI_SMALLFONT, color_white ); UI_DrawString( 320, y, "Baggyg ROBYER1", UI_CENTER|UI_SMALLFONT, color_white );
y += 1.42 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; y += 1.42 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE;
UI_DrawProportionalString( 320, y, "Additional Quake3Quest coding", UI_CENTER|UI_SMALLFONT, color_red ); UI_DrawProportionalString( 320, y, "Additional Quake3Quest coding", UI_CENTER|UI_SMALLFONT, color_red );

3
android/app/src/main/java/com/drbeef/ioq3quest/MainActivity.java
View file

@ -100,8 +100,9 @@ public class MainActivity extends SDLActivity // implements KeyEvent.Callback
//copy demo //copy demo
copy_asset("/sdcard/ioquake3Quest/baseq3", "pak0.pk3", false); copy_asset("/sdcard/ioquake3Quest/baseq3", "pak0.pk3", false);
//our special pak file //our special pak files
copy_asset("/sdcard/ioquake3Quest/baseq3", "pakQ3Q.pk3", true); copy_asset("/sdcard/ioquake3Quest/baseq3", "pakQ3Q.pk3", true);
copy_asset("/sdcard/ioquake3Quest/baseq3", "pak66.pk3", true);
copy_asset("/sdcard/ioquake3Quest/missionpack", "pakQ3Q.pk3", true); copy_asset("/sdcard/ioquake3Quest/missionpack", "pakQ3Q.pk3", true);
//If open arena is installed then copy necessary stuff //If open arena is installed then copy necessary stuff

7
android/run.bat
View file

@ -3,7 +3,7 @@
setlocal setlocal
set BUILD_TYPE=release set BUILD_TYPE=release
set VERSION=0.28.1 set VERSION=0.30.2-multiview
@REM Define the following environment variables to sign a release build @REM Define the following environment variables to sign a release build
@REM set KEYSTORE= @REM set KEYSTORE=
@ -29,6 +29,11 @@ if %BUILD_TYPE%==debug (
set GRADLE_BUILD_TYPE=:app:assembleDebug set GRADLE_BUILD_TYPE=:app:assembleDebug
) )
REM package our special pk3
pushd android\app\src\main
call make_pakQ3Q.bat
popd
echo #define Q3QVERSION "%VERSION%" > .\android\app\src\main\cpp\code\vr\vr_version.h echo #define Q3QVERSION "%VERSION%" > .\android\app\src\main\cpp\code\vr\vr_version.h
pushd %~dp0\.. pushd %~dp0\..