teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-22 12:01:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some small tweaks

Browse source 
including ensuring the HUD 3D icons are drawn by defualt
This commit is contained in:
Simon 2022-04-13 11:39:17 +01:00
parent cca1c051f1
commit 9153db7a45
8 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.ioq3quest"
android:installLocation="preferExternal"
android:versionCode="46"
android:versionName="0.31.1">
android:versionCode="47"
android:versionName="0.31.2">
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
<uses-feature android:glEsVersion="0x00030001" />
<!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>-->

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

Binary file not shown.

2
android/app/src/main/cpp/code/cgame/cg_main.c
View file

@ -233,7 +233,7 @@ static cvarTable_t cvarTable[] = {
{ &cg_drawTimer, "cg_drawTimer", "0", CVAR_ARCHIVE },
{ &cg_drawFPS, "cg_drawFPS", "0", CVAR_ARCHIVE },
{ &cg_drawSnapshot, "cg_drawSnapshot", "0", CVAR_ARCHIVE },
{ &cg_draw3dIcons, "cg_draw3dIcons", "0", CVAR_ARCHIVE },
{ &cg_draw3dIcons, "cg_draw3dIcons", "1", CVAR_ARCHIVE },
{ &cg_debugWeaponAiming, "cg_debugWeaponAiming", "0", CVAR_ARCHIVE },
{ &cg_weaponSelectorSimple2DIcons, "cg_weaponSelectorSimple2DIcons", "0", CVAR_ARCHIVE },
{ &cg_drawIcons, "cg_drawIcons", "1", CVAR_ARCHIVE },

6
android/app/src/main/cpp/code/cgame/cg_view.c
View file

@ -768,6 +768,12 @@ static int CG_CalcViewValues( ) {
CG_LaserSight(weaponorigin, trace.endpos, colour, 1.0f);
}
if (cg.predictedPlayerState.pm_flags == PM_SPECTATOR)
{
//If spectating, just take the weapon angles directly
VectorCopy(weaponangles, vr->calculated_weaponangles);
}
else
{
VectorSubtract(trace.endpos, cg.refdef.vieworg, dir);
vectoangles(dir, vr->calculated_weaponangles);

8
android/app/src/main/cpp/code/q3_ui/ui_menu.c
View file

@ -228,18 +228,18 @@ static void Main_MenuDraw( void ) {
int yPos = 410;
if (uis.demoversion) {
UI_DrawProportionalString( 320, 372, "DEMO DEMO DEMO DEMO DEMO DEMO DEMO DEMO DEMO", UI_CENTER|UI_SMALLFONT, color );
UI_DrawProportionalString( 320, 372, "Demo: Play the 1st tier of SP or MP on our demo servers. Install full game for more!", UI_CENTER|UI_SMALLFONT, color );
UI_DrawString( 320, yPos, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color );
} else {
UI_DrawString( 320, yPos, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color );
}
yPos += SMALLCHAR_HEIGHT;
UI_DrawString( 320, yPos, "Quake3Quest " Q3QVERSION " - Visit quake3.quakevr.com for discord invite.", UI_CENTER|UI_SMALLFONT, color );
UI_DrawString( 320, yPos, "Quake3Quest " Q3QVERSION " - Visit quake3.quakevr.com for discord invite.", UI_CENTER|UI_SMALLFONT, color_white );
yPos += SMALLCHAR_HEIGHT;
UI_DrawString( 320, yPos, "Join our discord for news, leaderboards and community!", UI_CENTER|UI_SMALLFONT, color );
UI_DrawString( 320, yPos, "Join our discord for news, leaderboards and community!", UI_CENTER|UI_SMALLFONT, color_white );
yPos += SMALLCHAR_HEIGHT;
UI_DrawString( 320, yPos, "Get mods & mappacks via the companion app!", UI_CENTER|UI_SMALLFONT, color );
UI_DrawString( 320, yPos, "Get mods & mappacks via the companion app!", UI_CENTER|UI_SMALLFONT, color_white );
}

4
android/app/src/main/cpp/code/renderergles3/tr_glsl.c
View file

@ -1670,6 +1670,10 @@ void GLSL_ShutdownGPUShaders(void)
for ( i = 0; i < 4; i++)
GLSL_DeleteGPUShader(&tr.depthBlurShader[i]);
//Clean up buffers
qglDeleteBuffers(PROJECTION_COUNT, viewMatricesBuffer);
qglDeleteBuffers(PROJECTION_COUNT, projectionMatricesBuffer);
}

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

@ -104,6 +104,9 @@ public class MainActivity extends SDLActivity // implements KeyEvent.Callback
copy_asset("/sdcard/ioquake3Quest/baseq3", "pakQ3Q.pk3", true);
copy_asset("/sdcard/ioquake3Quest/missionpack", "pakQ3Q.pk3", true);
//Copy omarlego's background image pak
copy_asset("/sdcard/ioquake3Quest/baseq3", "pak66.pk3", false);
//If open arena is installed then copy necessary stuff
if (new File("/sdcard/ioquake3Quest/baseoa").exists()) {
copy_asset("/sdcard/ioquake3Quest/baseoa", "autoexec_oa.cfg", "autoexec.cfg", false);

2
android/run.bat
View file

@ -3,7 +3,7 @@
setlocal
set BUILD_TYPE=release
set VERSION=0.31.1-multiview
set VERSION=0.31.2-multiview
@REM Define the following environment variables to sign a release build
@REM set KEYSTORE=