Split vr asset packs to avoid duplicates

.gitignore

@@ -23,7 +23,7 @@ $RECYCLE.BIN/
 *.apk
 *.ap_
 *.class
-projects/Android/build/*
+Projects/Android/build/*
 assets/oculussig*
 Projects/Android/.cxx/*
 *.json
@@ -41,6 +41,10 @@ assets/pak0.pk3
 assets/sp_pak_weapons.pk3
 assets/z_zvr_weapons.pk3
 assets/sp_vpak8.pk3
+assets/z_vr_assets.pk3
+assets/z_vr_assets_base.pk3
+assets/z_vr_assets_jka.pk3
+assets/z_vr_assets_jko.pk3
 Projects/Android/jni/SupportLibs/liboggvorbis/libs/armeabi-v7a/libogg.so
 Projects/Android/jni/SupportLibs/liboggvorbis/libs/armeabi-v7a/libvorbis-jni.so
 Projects/Android/jni/SupportLibs/liboggvorbis/libs/armeabi-v7a/libvorbis.so

Projects/Android/build.gradle

@@ -65,10 +65,16 @@ buildscript {
     }
 }
 
-task packJOResources(type: Zip) {
+task packBaseResources(type: Zip) {
-    from "../../z_vr_assets/"
+    from "../../z_vr_assets_base/"
     destinationDir file("../../assets/")
-    archiveName "z_vr_assets.pk3"
+    archiveName "z_vr_assets_base.pk3"
+}
+
+task packJOResources(type: Zip) {
+    from "../../z_vr_assets_jko/"
+    destinationDir file("../../assets/")
+    archiveName "z_vr_assets_jko.pk3"
 }
 
 task packJAResources(type: Zip) {
@@ -78,5 +84,5 @@ task packJAResources(type: Zip) {
 }
 
 tasks.matching {it.name.startsWith("assemble")}.all { Task task ->
-    task.dependsOn([packJOResources, packJAResources])
+    task.dependsOn([packBaseResources, packJOResources, packJAResources])
 }

java/com/drbeef/jkxr/GLES3JNIActivity.java

@@ -224,7 +224,9 @@ import java.util.Vector;
 		copy_asset("/sdcard/JKXR/JK3/base", "weapons_vr_ja.cfg", true);
 
 		//Our assets
-		copy_asset("/sdcard/JKXR/JK2/base", "z_vr_assets.pk3", true);
+		copy_asset("/sdcard/JKXR/JK2/base", "z_vr_assets_base.pk3", true);
+		copy_asset("/sdcard/JKXR/JK2/base", "z_vr_assets_jko.pk3", true);
+		copy_asset("/sdcard/JKXR/JK3/base", "z_vr_assets_base.pk3", true);
 		copy_asset("/sdcard/JKXR/JK3/base", "z_vr_assets_jka.pk3", true);
 
 		//Bummser's default configuration

z_vr_assets/ui/credits.menu

@@ -1,274 +0,0 @@
-{
-	menuDef
-	{
-		name					"credits"
-		fullScreen				1
-		rect					0 0 640 480
-		visible					1
-		focusColor				1 1 1 1
-		descX					320
-		descY					426
-		descScale				1
-		descColor				1 .682 0 .8
-		descAlignment				ITEM_ALIGN_CENTER
-		onESC
-		{
-			uiScript	Quit ;
-		}
-		onAccept
-		{
-			uiScript	Quit ;
-		}
-
-		itemDef
-		{
-			name				none
-			style				WINDOW_STYLE_SHADER
-			rect				0 0 640 480
-      background			"gfx/colors/black"
-			forecolor			1 1 1 1
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 10 640 40
-			text				"JKXR by Team Beef"
-			font				2
-			forecolor			1 0 0 1
-			textscale			1.2
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 35 640 40
-			text				"--------------------"
-			font				2
-			forecolor			1 1 1 1
-			textscale			1.2
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 70 640 40
-			text				"Team Beef are DrBeef,  Baggyg,  Bummser"
-			font				2
-			forecolor			0 0 1 1
-			textscale			1.3
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 120 640 40
-			text				"Lead programmer"
-			font				2
-			forecolor			1 0 0 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 140 640 40
-			text				"DrBeef"
-			font				2
-			forecolor			1 1 1 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 170 640 40
-			text				"JKXR Companion App"
-			font				2
-			forecolor			1 0 0 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 190 640 40
-			text				"Baggyg"
-			font				2
-			forecolor			1 1 1 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 220 640 40
-			text				"Additional Development Contributions"
-			font				2
-			forecolor			1 0 0 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 240 640 40
-			text				"MuadDib"
-			font				2
-			forecolor			1 1 1 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 270 640 40
-			text				"VR Compatible Weapon Models"
-			font				2
-			forecolor			1 0 0 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 290 640 40
-			text				"Vince Crusty  and  Elin"
-			font				2
-			forecolor			1 1 1 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 350 640 40
-			text				"With Special Thanks to:"
-			font				2
-			forecolor			1 0 0 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 380 640 40
-			text				"Team Beef patrons, all Team Beef discord members,"
-			font				2
-			forecolor			1 1 1 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 400 640 40
-			text				"the OpenJK Development Team and Raven Software for"
-			font				2
-			forecolor			1 1 1 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 420 640 40
-			text				"creating and open-sourcing these wonderful games"
-			font				2
-			forecolor			1 1 1 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-
-		itemDef
-		{
-			name				none
-			type				ITEM_TYPE_TEXT
-			rect				0 455 640 40
-			text				"Join our Patreon:  patreon.com/teambeef"
-			font				2
-			forecolor			1 0 0 1
-			textscale			1.0
-			textalign			ITEM_ALIGN_CENTER
-			textalignx			320
-			visible			1
-			decoration
-		}
-	}
-}

z_vr_assets_base/ui/credits.menu

@@ -261,7 +261,7 @@
 			name				none
 			type				ITEM_TYPE_TEXT
 			rect				0 455 640 40
-			text				"Join our Patreon:  patreon.com/teambeef"
+			text				"JKXR: https://www.quakevr.com/jkxr"
 			font				2
 			forecolor			1 0 0 1
 			textscale			1.0
@@ -270,5 +270,6 @@
 			visible			1
 			decoration
 		}
+
 	}
 }