From 16ef311bc2f9eaa418f782a0361b6e28700e4117 Mon Sep 17 00:00:00 2001 From: pelya Date: Wed, 29 Sep 2010 18:52:59 +0300 Subject: [PATCH] Updated UQM and readme --- project/AndroidManifest.xml | 6 ++--- project/jni/Android.mk | 12 +++++----- project/jni/Application.mk | 2 +- .../application/sc2/AndroidAppSettings.cfg | 4 ++-- .../sc2/src/libs/graphics/sdl/sdl_common.c | 22 +++++++++++++++++++ project/jni/application/src | 2 +- project/res/values/strings.xml | 2 +- project/src/Accelerometer.java | 2 +- project/src/AssetExtract.java | 2 +- project/src/Audio.java | 2 +- project/src/DataDownloader.java | 2 +- project/src/GLSurfaceView_SDL.java | 2 +- project/src/Globals.java | 14 ++++++------ project/src/MainActivity.java | 2 +- project/src/Settings.java | 2 +- project/src/Video.java | 2 +- readme.txt | 6 +++-- 17 files changed, 55 insertions(+), 31 deletions(-) diff --git a/project/AndroidManifest.xml b/project/AndroidManifest.xml index 725c6a77f..ddc078cbb 100644 --- a/project/AndroidManifest.xml +++ b/project/AndroidManifest.xml @@ -1,8 +1,8 @@ - OpenTyrian + Ur-Quan Masters diff --git a/project/src/Accelerometer.java b/project/src/Accelerometer.java index b46b829e0..8fa80d363 100644 --- a/project/src/Accelerometer.java +++ b/project/src/Accelerometer.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import android.app.Activity; import android.content.Context; diff --git a/project/src/AssetExtract.java b/project/src/AssetExtract.java index e664c297d..def4a9179 100644 --- a/project/src/AssetExtract.java +++ b/project/src/AssetExtract.java @@ -1,6 +1,6 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change // spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import java.util.zip.*; import java.io.*; diff --git a/project/src/Audio.java b/project/src/Audio.java index 9f29bfcb5..e0ded530d 100644 --- a/project/src/Audio.java +++ b/project/src/Audio.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import android.app.Activity; diff --git a/project/src/DataDownloader.java b/project/src/DataDownloader.java index 5fb78f0d4..973ab3d38 100644 --- a/project/src/DataDownloader.java +++ b/project/src/DataDownloader.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import android.app.Activity; import android.content.Context; diff --git a/project/src/GLSurfaceView_SDL.java b/project/src/GLSurfaceView_SDL.java index 888acc3f2..0a386f23e 100644 --- a/project/src/GLSurfaceView_SDL.java +++ b/project/src/GLSurfaceView_SDL.java @@ -18,7 +18,7 @@ fixed with a hammer and rasp to work with libSDL port */ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import java.io.Writer; import java.util.ArrayList; diff --git a/project/src/Globals.java b/project/src/Globals.java index 57eb31bdd..75fdf8e57 100644 --- a/project/src/Globals.java +++ b/project/src/Globals.java @@ -1,14 +1,14 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import android.app.Activity; import android.content.Context; class Globals { - public static String ApplicationName = "OpenTyrian"; + public static String ApplicationName = "Ur-QuanMasters"; // Should be zip file - public static String DataDownloadUrl = "Data files size is 11 Mb|http://sites.google.com/site/xpelyax/Home/tyrian21-data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/tyrian21-data.zip"; + public static String DataDownloadUrl = "Game data is 14 Mb|https://sites.google.com/site/xpelyax/Home/sc2-data.zip?attredirects=0%26d=1|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/sc2-data.zip/download|http://sitesproxy.goapk.com/site/xpelyax/Home/sc2-data.zip^3DO remixed music (19 Mb) - enable it in Setup->Sound Options->3DO Remixes|:addons/3domusic/3domusic.zip:https://sites.google.com/site/xpelyax/Home/3domusic.zip?attredirects=0%26d=1|:addons/3domusic/3domusic.zip:https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3domusic.zip/download|:addons/3domusic/3domusic.zip:http://sitesproxy.goapk.com/site/xpelyax/Home/3domusic.zip^UQM music remix pack (150 Mb) - enable it in Setup->Sound Options->UQM Remixes|:addons/remix/remix.zip:https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/remix.zip/download^3DO voice (115 Mb) - go to Setup->Sound Options and increase Voice volume from zero|:addons/3dovoice/3dovoice.zip:https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovoice.zip/download^3DO video support - after installing this pack copy all files from|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^your 3DO Star Control II game CD from 'duckart' dir to the SD card to dir|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^'app-data/com.sourceforge.sc2/addons/3dovideo', to extract files from 3DO disk use|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^'3DO Commander' or 'uncd-rom' apps from http://madroms.free.fr/3do/|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^Then from the game change 'Setup->PC/3DO compat->Cutscenes' to Movies, and restart game|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download"; // Set this value to true if you're planning to render 3D using OpenGL - it eats some GFX resources, so disabled for 2D public static boolean NeedDepthBuffer = false; @@ -19,7 +19,7 @@ class Globals { // Readme text to be shown on download page public static String ReadmeText = "^You may press \"Home\" now - the data will be downloaded in background".replace("^","\n"); - public static boolean AppUsesMouse = true; + public static boolean AppUsesMouse = false; public static boolean AppNeedsArrowKeys = true; @@ -27,9 +27,9 @@ class Globals { public static boolean AppUsesMultitouch = false; - public static int AppTouchscreenKeyboardKeysAmount = 4; + public static int AppTouchscreenKeyboardKeysAmount = 2; - public static int AppTouchscreenKeyboardKeysAmountAutoFire = 1; + public static int AppTouchscreenKeyboardKeysAmountAutoFire = 2; // Phone-specific config // It will download app data to /sdcard/alienblaster if set to true, @@ -48,5 +48,5 @@ class Globals { } class LoadLibrary { - public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_net"); }; + public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_image"); }; } diff --git a/project/src/MainActivity.java b/project/src/MainActivity.java index 1c5a7f3d4..fd8e9ac34 100644 --- a/project/src/MainActivity.java +++ b/project/src/MainActivity.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import android.app.Activity; import android.content.Context; diff --git a/project/src/Settings.java b/project/src/Settings.java index 5e57ff068..6edc278c2 100644 --- a/project/src/Settings.java +++ b/project/src/Settings.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import android.app.Activity; import android.content.Context; diff --git a/project/src/Video.java b/project/src/Video.java index 5008d5997..19f1cd062 100644 --- a/project/src/Video.java +++ b/project/src/Video.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import javax.microedition.khronos.opengles.GL10; diff --git a/readme.txt b/readme.txt index e2f939ac7..cd68a16a2 100644 --- a/readme.txt +++ b/readme.txt @@ -187,14 +187,16 @@ Also it's a good practice to pause any application audio, especially if the user and if you won't set your own callbacks the default callbacks will do exactly that. There are circumstances when you want to avoid that, for example if the application is audio player, or if application gets some notification over network (for example you're running a game server, -and want a beep when someone connects to you) - you may unpause audio for some short time then. +and want a beep when someone connects to you) - you may unpause audio for some short time then, +that will require another thread to watch the network, because main thread will be blocked inside SDL_Flip(). The application is not allowed to do any GFX output without OpenGL context (or it will crash), that's why SDL_Flip() call will block until we're re-acquired context, and the callbacks will be called from inside SDL_Flip(). so you won't receive SDL_WINDOWEVENT_HIDDEN / SDL_WINDOWEVENT_SHOWN, because if SDL sends them the application will get them only after SDL_Flip() successfully re-acquired GL context, and it's too late to pause audio and save application state, -so please use callbacks instead of SDL window events on Android OS. +so please use callbacks instead of SDL window events on Android OS (also if your application +is single-threaded you don't need any mutexes inside callbacks). The whole idea behind callbacks is that the existing application should not be modified to operate correctly - the whole time in background will just look to app as one very long SDL_Flip(),