diff --git a/project/java/Globals.java b/project/java/Globals.java index def135c37..abcf2a527 100644 --- a/project/java/Globals.java +++ b/project/java/Globals.java @@ -69,7 +69,7 @@ class Globals { public static boolean UseTouchscreenKeyboard = true; public static int TouchscreenKeyboardSize = 0; public static int TouchscreenKeyboardDrawSize = 1; - public static int TouchscreenKeyboardTheme = 2; + public static int TouchscreenKeyboardTheme = 1; public static int TouchscreenKeyboardTransparency = 2; public static int AccelerometerSensitivity = 2; public static int AccelerometerCenterPos = 2; diff --git a/project/jni/application/quake/AndroidAppSettings.cfg b/project/jni/application/quake/AndroidAppSettings.cfg index 55dc247b1..f0ab70fc1 100644 --- a/project/jni/application/quake/AndroidAppSettings.cfg +++ b/project/jni/application/quake/AndroidAppSettings.cfg @@ -1,16 +1,24 @@ # The application settings for Android libSDL port -AppSettingVersion=16 +AppSettingVersion=17 LibSdlVersion=1.2 AppName="Quake r2tec" AppFullName=quake.r2tec.sdl ScreenOrientation=h InhibitSuspend=y AppDataDownloadUrl="Data size is 1 Mb|quake-data.zip" +VideoDepthBpp=16 +NeedDepthBuffer=n +NeedStencilBuffer=n +NeedGles2=n +SwVideoMode=y SdlVideoResize=y SdlVideoResizeKeepAspect=n -NeedDepthBuffer=n +CompatibilityHacks=n +CompatibilityHacksStaticInit=n AppUsesMouse=y AppNeedsTwoButtonMouse=n +ShowMouseCursor=n +ForceRelativeMouseMode=n AppNeedsArrowKeys=y AppNeedsTextInput=y AppUsesJoystick=n @@ -21,14 +29,18 @@ RedefinedKeys="LCTRL LCTRL INSERT LCTRL SPACE ESCAPE 7" AppTouchscreenKeyboardKeysAmount=4 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="LCTRL SLASH SPACE INSERT" +StartupMenuButtonTimeout=3000 +HiddenMenuOptions='' +FirstStartMenuOptions='' MultiABI=n AppVersionCode=2010090601 AppVersionName="2010.09.06.01" +ResetSdlConfigForThisVersion=n +DeleteFilesOnUpgrade="%" CompiledLibraries="jpeg png sdl_ttf sdl_image sdl_mixer" CustomBuildScript=n AppCflags='-D_inline=inline' AppLdflags='' AppSubdirsBuild='' -AppUseCrystaXToolchain=y AppCmdline='-winsize 480 320' ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/src b/project/jni/application/src index 7fa7b8f4e..0a7ca3edf 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -opentyrian \ No newline at end of file +gemrb-sdl-1.3 \ No newline at end of file diff --git a/project/jni/sdl-1.3/include/SDL b/project/jni/sdl-1.3/include/SDL new file mode 120000 index 000000000..945c9b46d --- /dev/null +++ b/project/jni/sdl-1.3/include/SDL @@ -0,0 +1 @@ +. \ No newline at end of file