From 02d7abe46c45ad46c9e86a7fecd41a437c8eace7 Mon Sep 17 00:00:00 2001 From: pelya Date: Sun, 25 Nov 2012 13:57:51 +0200 Subject: [PATCH] Updated OpenArena downloads --- .gitmodules | 2 +- project/jni/application/commandergenius/commandergenius | 2 +- project/jni/application/openarena/AndroidAppSettings.cfg | 6 ++++-- project/jni/application/openarena/engine | 2 +- project/jni/application/openarena/vm | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index ec5df34a4..d54ac076a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,4 +30,4 @@ url = https://github.com/pelya/openarena-vm [submodule "project/jni/application/teeworlds/src"] path = project/jni/application/teeworlds/src - url = git://github.com/pelya/teeworlds.git + url = https://github.com/pelya/teeworlds.git diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 841c578ad..d1b8a7ae0 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 841c578ada6903c49c35ea506e0077fa574bb9c3 +Subproject commit d1b8a7ae03b1a0960722abbab38bbb8fca98e7cd diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index 88674b135..21121453d 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|http://sourceforge.net/projects/libsdl-android/files/OpenArena/oa-0.8.8-1.zip/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 logic|:baseoa/pak7-android.pk3:vm.zip" VideoDepthBpp=24 NeedDepthBuffer=y NeedStencilBuffer=y @@ -16,6 +16,7 @@ SdlVideoResizeKeepAspect=n CompatibilityHacks=n CompatibilityHacksStaticInit=n CompatibilityHacksTextInputEmulatesHwKeyboard=n +CompatibilityHacksPreventAudioChopping=n AppUsesMouse=n AppNeedsTwoButtonMouse=n ShowMouseCursor=n @@ -34,6 +35,7 @@ StartupMenuButtonTimeout=3000 HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig' FirstStartMenuOptions='' MultiABI=y +AppMinimumRAM=350 AppVersionCode=08803 AppVersionName="0.8.8.03" ResetSdlConfigForThisVersion=y @@ -46,6 +48,6 @@ AppSubdirsBuild='' AppCmdline='' ReadmeText='^Readme text' MinimumScreenSize=n -AdmobPublisherId=n #a14fe4dd0ebe974 +AdmobPublisherId=n AdmobTestDeviceId=66133194946FB6C1CD0ED2EFCCB82539 AdmobBannerSize=BANNER diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index c98bcf9ee..687cdf8ab 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit c98bcf9eea63c3d875b55a0ca922a44b0a2ac0c8 +Subproject commit 687cdf8ab7e312bac6f5a9d77e31095c050b8a34 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 8ffdaa479..dc740d594 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 8ffdaa479dd5b9d1a86057c84801daac1ca412dd +Subproject commit dc740d594f429924d82815b08b68f449a5a233a6