From 77671fe0d9b81fdee20ccb8f641f17807b771a2f Mon Sep 17 00:00:00 2001 From: pelya Date: Thu, 6 Dec 2012 12:16:56 +0200 Subject: [PATCH] Updated OpenArena --- project/jni/application/openarena/AndroidAppSettings.cfg | 6 +++--- project/jni/application/openarena/AndroidBuild.sh | 6 +++--- project/jni/application/openarena/engine | 2 +- project/jni/application/openarena/vm | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index e4cd7e958..b3ac3d145 100644 --- a/project/jni/application/openarena/AndroidAppSettings.cfg +++ b/project/jni/application/openarena/AndroidAppSettings.cfg @@ -5,7 +5,7 @@ AppName="OpenArena" AppFullName=ws.openarena.sdl ScreenOrientation=h InhibitSuspend=n -AppDataDownloadUrl="!Game data|:baseoa/pak0.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak0.pk3/download^!Game data|:baseoa/pak1-maps.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak1-maps.pk3/download^!Game data|:baseoa/pak2-players-mature.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak2-players-mature.pk3/download^!Game data|:baseoa/pak2-players.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak2-players.pk3/download^!Game data|:baseoa/pak4-textures.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak4-textures.pk3/download^!Game data|:baseoa/pak5-TA.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak5-TA.pk3/download^!Game data|:baseoa/pak6-misc.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak6-misc.pk3/download^!Game data|:baseoa/pak6-patch085.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak6-patch085.pk3/download^!Game data|:baseoa/pak6-patch088.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak6-patch088.pk3/download^!Game data|:baseoa/skn-arachna-forlorna.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/skn-arachna-forlorna.pk3/download^!Game logic|:baseoa/pak7-android.pk3:vm.zip" +AppDataDownloadUrl="!Game data|:baseoa/pak0.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak0.pk3/download^!Game data|:baseoa/pak1-maps.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak1-maps.pk3/download^!Game data|:baseoa/pak2-players-mature.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak2-players-mature.pk3/download^!Game data|:baseoa/pak2-players.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak2-players.pk3/download^!Game data|:baseoa/pak4-textures.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak4-textures.pk3/download^!Game data|:baseoa/pak5-TA.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak5-TA.pk3/download^!Game data|:baseoa/pak6-misc.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak6-misc.pk3/download^!Game data|:baseoa/pak6-patch085.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak6-patch085.pk3/download^!Game data|:baseoa/pak6-patch088.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak6-patch088.pk3/download^!Game data|:baseoa/skn-arachna-forlorna.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/skn-arachna-forlorna.pk3/download^!Game logic|:baseoa/pak7-android.pk3:pak7-android.pk3" VideoDepthBpp=24 NeedDepthBuffer=y NeedStencilBuffer=y @@ -37,8 +37,8 @@ HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig' FirstStartMenuOptions='' MultiABI=y AppMinimumRAM=350 -AppVersionCode=08807 -AppVersionName="0.8.8.07" +AppVersionCode=08808 +AppVersionName="0.8.8.08" ResetSdlConfigForThisVersion=y DeleteFilesOnUpgrade="libsdl-DownloadFinished-10.flag .openarena/baseoa/q3config.cfg" CompiledLibraries="sdl_mixer sdl_image freetype curl vorbis ogg" diff --git a/project/jni/application/openarena/AndroidBuild.sh b/project/jni/application/openarena/AndroidBuild.sh index 988b554a0..009d1364b 100755 --- a/project/jni/application/openarena/AndroidBuild.sh +++ b/project/jni/application/openarena/AndroidBuild.sh @@ -8,10 +8,10 @@ mkdir -p AndroidData [ -e libapplication.so ] || ln -s libapplication-armeabi.so libapplication.so make -j8 -C vm BUILD_MISSIONPACK=0 || exit 1 cd vm/build/release-linux-`uname -m`/baseq3 -rm -f ../../../../AndroidData/binaries.zip ../../../../AndroidData/vm.zip -zip -r ../../../../AndroidData/vm.zip vm +#rm -f ../../../../AndroidData/binaries.zip ../../../../AndroidData/pak7-android.pk3 +zip -r ../../../../AndroidData/pak7-android.pk3 vm cd ../../../android -zip ../../AndroidData/vm.zip * +zip ../../AndroidData/pak7-android.pk3 * ln -sf ../engine/misc/quake3-tango.png ../../AndroidData/logo.png ) diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index 8c379de6a..951d3515a 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 8c379de6a68be814515c0198ce1db386fa7dd61c +Subproject commit 951d3515a9e42ad62bd33db2a814664d2881c5d4 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 7823c8afc..1efdd0036 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 7823c8afc75e476cbb243dcc00d0b50c47f10b05 +Subproject commit 1efdd0036e8c5e75f6709ac89b73de687f5d331a