miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gerhard Stein
2013-11-25 15:04:58 +01:00
parent 2803b9ad46 99cfbab6ed
commit c719603255
12 changed files with 1548 additions and 1553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/jni/application/ballfield/AndroidAppSettings.cfg
View File

@@ -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

2
project/jni/application/ballfield/ballfield.cpp
View File

@@ -26,7 +26,7 @@
----------------------------------------------------------*/
#define SCREEN_W 640
#define SCREEN_H 480
#define SCREEN_H 256
#define BALLS 300

2
project/jni/application/openarena/engine

Submodule project/jni/application/openarena/engine updated: 07c011b6cc...30e98be358

2
project/jni/application/openarena/vm

Submodule project/jni/application/openarena/vm updated: 4b83db91ab...278f045202

2
project/jni/application/teeworlds/src

Submodule project/jni/application/teeworlds/src updated: 34b64249c4...e5489c8c08

4
project/jni/application/uqm-hd/AndroidAppSettings.cfg
View File

@@ -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

3031
project/jni/application/uqm-hd/android.diff
View File

File diff suppressed because it is too large Load Diff

2
project/jni/application/xserver/xserver

Submodule project/jni/application/xserver/xserver updated: 0669077a6d...fe78614169

9
project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
View File

@@ -390,7 +390,14 @@ SDL_Surface *ANDROID_SetVideoMode(_THIS, SDL_Surface *current,
SDL_ANDROID_ForceClearScreenRectAmount = 0;
if( SDL_ANDROID_ScreenKeep43Ratio )
{
SDL_ANDROID_sWindowWidth = (SDL_ANDROID_sFakeWindowWidth * SDL_ANDROID_sRealWindowHeight) / SDL_ANDROID_sFakeWindowHeight;
if( (float)width / (float)height < (float)SDL_ANDROID_sWindowWidth / (float)SDL_ANDROID_sWindowHeight )
SDL_ANDROID_sWindowWidth = (SDL_ANDROID_sFakeWindowWidth * SDL_ANDROID_sRealWindowHeight) / SDL_ANDROID_sFakeWindowHeight;
else
// Force 4:3 ratio, with black borders at the left/right,
// this is needede for Uae4all2, which has 640x256 video mode,
// and expects those 256 pixels to stretch 2x height like on a TV interlaced display.
SDL_ANDROID_sWindowWidth = SDL_ANDROID_sWindowHeight * 4 / 3;
SDL_ANDROID_TouchscreenCalibrationWidth = SDL_ANDROID_sWindowWidth;
SDL_ANDROID_ForceClearScreenRectAmount = 2;
}