teambeef/quake2quest
0
0
Fork 0
mirror of https://github.com/DrBeef/Quake2Quest.git synced 2024-11-10 06:41:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix missing comfort vignette

Browse source
This commit is contained in:
Simon 2019-12-21 18:20:23 +00:00
parent 34d7a2bbfd
commit ec228f855e
3 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Projects/Android/AndroidManifest.xml
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.quake2quest" package="com.drbeef.quake2quest"
android:versionCode="12" android:versionCode="13"
android:versionName="1.0.1" android:installLocation="auto" > android:versionName="1.0.2" 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"/>

2
Projects/Android/jni/quake2/src/common/header/common.h
View file

@ -32,7 +32,7 @@
#include "shared.h" #include "shared.h"
#include "crc.h" #include "crc.h"
#define Q2QVERSION "1.0.1" #define Q2QVERSION "1.0.2"
#define YQ2VERSION "7.41" #define YQ2VERSION "7.41"
#define BASEDIRNAME "Quake2Quest" #define BASEDIRNAME "Quake2Quest"

24
java/com/drbeef/quake2quest/GLES3JNIActivity.java
View file

@ -163,24 +163,20 @@ import static android.system.Os.setenv;
{ {
//This will copy the shareware version of quake2 if user doesn't have anything installed //This will copy the shareware version of quake2 if user doesn't have anything installed
copy_asset("/sdcard/Quake2Quest", "pak0.pak"); copy_asset("/sdcard/Quake2Quest", "pak0.pak");
//HD Textures
copy_asset("/sdcard/Quake2Quest", "pak6.pak");
//Custom weapons
copy_asset("/sdcard/Quake2Quest", "pak99.pak");
//Configuration files
copy_asset("/sdcard/Quake2Quest", "config.cfg"); copy_asset("/sdcard/Quake2Quest", "config.cfg");
copy_asset("/sdcard/Quake2Quest", "autoexec.cfg"); copy_asset("/sdcard/Quake2Quest", "autoexec.cfg");
copy_asset("/sdcard/Quake2Quest", "commandline.txt"); copy_asset("/sdcard/Quake2Quest", "commandline.txt");
//The custom weapon PAK file //Comfort Vignette Mask
copy_asset("/sdcard/Quake2Quest", "pak6.pak"); copy_asset("/sdcard/Quake2Quest", "vignette.tga");
copy_asset("/sdcard/Quake2Quest", "pak99.pak");
/* String models[] = {"g_blast", "v_blast",
"g_shotg", "v_shotg",
"g_shotg2", "v_shotg2"};
for (String model : models) {
copy_asset("/sdcard/Quake2Quest", "models/weapons/" + model + "/skin_new.pcx");
copy_asset("/sdcard/Quake2Quest", "models/weapons/" + model + "/skin_new.tga");
copy_asset("/sdcard/Quake2Quest", "models/weapons/" + model + "/tris.md2");
}
*/
//Read these from a file and pass through //Read these from a file and pass through
commandLineParams = new String("quake2"); commandLineParams = new String("quake2");