Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

2013-11-25 15:04:58 +01:00
parent 2803b9ad46 99cfbab6ed
commit c719603255
12 changed files with 1548 additions and 1553 deletions
--- a/project/jni/application/ballfield/AndroidAppSettings.cfg
+++ b/project/jni/application/ballfield/AndroidAppSettings.cfg
@@ -47,7 +47,7 @@ SwVideoMode=y
 SdlVideoResize=y

 # Application resizing will keep 4:3 aspect ratio, with black bars at sides (y)/(n)
-SdlVideoResizeKeepAspect=n
+SdlVideoResizeKeepAspect=y

 CompatibilityHacksProperUsageOfSDL_UpdateRects=y

--- a/project/jni/application/ballfield/ballfield.cpp
+++ b/project/jni/application/ballfield/ballfield.cpp
@@ -26,7 +26,7 @@
 ----------------------------------------------------------*/

 #define	SCREEN_W	640
-#define	SCREEN_H	480
+#define	SCREEN_H	256


 #define	BALLS	300
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
--- a/project/jni/application/teeworlds/src
+++ b/project/jni/application/teeworlds/src
--- a/project/jni/application/uqm-hd/AndroidAppSettings.cfg
+++ b/project/jni/application/uqm-hd/AndroidAppSettings.cfg
@@ -170,10 +170,10 @@ MultiABI=y
 AppMinimumRAM=0

 # Application version code (integer)
-AppVersionCode=07003
+AppVersionCode=07004

 # Application user-visible version name (string)
-AppVersionName="0.7.0.03"
+AppVersionName="0.7.0.04"

 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n
--- a/project/jni/application/uqm-hd/android.diff
+++ b/project/jni/application/uqm-hd/android.diff
--- a/project/jni/application/xserver/xserver
+++ b/project/jni/application/xserver/xserver