From 73207c44b4d5922984f08bcbb4bd53ae339939f9 Mon Sep 17 00:00:00 2001 From: pelya Date: Mon, 18 Jun 2012 16:49:08 +0300 Subject: [PATCH] Updated Commander Genius project --- .../commandergenius/AndroidAppSettings.cfg | 12 ++++++------ .../AndroidData/{data.zip => data2.zip} | Bin 963162 -> 956801 bytes .../commandergenius/AndroidData/logo.png | 2 +- .../commandergenius/commandergenius | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename project/jni/application/commandergenius/AndroidData/{data.zip => data2.zip} (96%) diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index 950aa3f3d..13f30deea 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg @@ -5,8 +5,8 @@ AppName="Commander Genius" AppFullName=net.sourceforge.clonekeenplus ScreenOrientation=h InhibitSuspend=n -AppDataDownloadUrl="!Data files|data.zip^High-quality GFX and music - 40 Mb|http://sourceforge.net/projects/libsdl-android/files/CommanderGenius/commandergenius-hqp-1.8.zip/download" -VideoDepthBpp=16 +AppDataDownloadUrl="!Game data|data2.zip^High-quality GFX and music - 40 Mb|http://sourceforge.net/projects/libsdl-android/files/CommanderGenius/commandergenius-hqp-1.8.zip/download" +VideoDepthBpp=24 NeedDepthBuffer=n NeedStencilBuffer=n NeedGles2=n @@ -26,15 +26,15 @@ AppHandlesJoystickSensitivity=n AppUsesMultitouch=n NonBlockingSwapBuffers=n RedefinedKeys="LCTRL LALT NO_REMAP NO_REMAP RETURN ESCAPE" -AppTouchscreenKeyboardKeysAmount=3 +AppTouchscreenKeyboardKeysAmount=4 AppTouchscreenKeyboardKeysAmountAutoFire=1 -RedefinedKeysScreenKb="LCTRL LALT SPACE" +RedefinedKeysScreenKb="LCTRL LALT SPACE RETURN" StartupMenuButtonTimeout=3000 HiddenMenuOptions='' FirstStartMenuOptions='' MultiABI=n -AppVersionCode=35009 -AppVersionName="0.3.5.0.09" +AppVersionCode=40010 +AppVersionName="0.4.0.10" ResetSdlConfigForThisVersion=y DeleteFilesOnUpgrade="%" CompiledLibraries="tremor ogg" diff --git a/project/jni/application/commandergenius/AndroidData/data.zip b/project/jni/application/commandergenius/AndroidData/data2.zip similarity index 96% rename from project/jni/application/commandergenius/AndroidData/data.zip rename to project/jni/application/commandergenius/AndroidData/data2.zip index 41f7f7edce702cd4c038840614fa504a3ef6585a..c93f41c87eef6f25fb923510a5add98e48096d4a 100644 GIT binary patch delta 4915 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 diff --git a/project/jni/application/commandergenius/AndroidData/logo.png b/project/jni/application/commandergenius/AndroidData/logo.png index 3d7020d50..b79b0cddb 120000 --- a/project/jni/application/commandergenius/AndroidData/logo.png +++ b/project/jni/application/commandergenius/AndroidData/logo.png @@ -1 +1 @@ -../commandergenius/CGLogo.png \ No newline at end of file +../commandergenius/vfsroot/cglogo512.png \ No newline at end of file diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index b7f4935c4..42e3b81c4 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit b7f4935c468c20999dd1aaf95c493ad9c722979d +Subproject commit 42e3b81c43ea3c2eab28c59774417f36141b569f