From fbaf44f09f40107b12e9749ec661d1088f28bedb Mon Sep 17 00:00:00 2001 From: pelya Date: Tue, 1 Feb 2011 13:21:07 +0000 Subject: [PATCH] Updated UfoAI project --- project/jni/application/src | 2 +- .../application/ufoai-lowmem/AndroidData/base.zip | Bin 0 -> 160 bytes .../jni/application/ufoai/AndroidData/base.zip | Bin 0 -> 160 bytes .../src/video/android/SDL_touchscreenkeyboard.c | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 project/jni/application/ufoai-lowmem/AndroidData/base.zip create mode 100644 project/jni/application/ufoai/AndroidData/base.zip diff --git a/project/jni/application/src b/project/jni/application/src index 5636e9d36..92362c4db 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -ufoai-lowmem \ No newline at end of file +ufoai \ No newline at end of file diff --git a/project/jni/application/ufoai-lowmem/AndroidData/base.zip b/project/jni/application/ufoai-lowmem/AndroidData/base.zip new file mode 100644 index 0000000000000000000000000000000000000000..990032ff2944a0700d76a369858a44262a827c97 GIT binary patch literal 160 zcmWIWW@h1H0D+J!M>`M=!>kN43`vQ_srsQIoD9qc93H-g93H-<72FJrEH9WD7{Ek; sHzSiAGcE%ppk@g$ymbUIp~kU7jKeUBl?|kbk%5uHn}LDB9>ie)09`~At^fc4 literal 0 HcmV?d00001 diff --git a/project/jni/application/ufoai/AndroidData/base.zip b/project/jni/application/ufoai/AndroidData/base.zip new file mode 100644 index 0000000000000000000000000000000000000000..990032ff2944a0700d76a369858a44262a827c97 GIT binary patch literal 160 zcmWIWW@h1H0D+J!M>`M=!>kN43`vQ_srsQIoD9qc93H-g93H-<72FJrEH9WD7{Ek; sHzSiAGcE%ppk@g$ymbUIp~kU7jKeUBl?|kbk%5uHn}LDB9>ie)09`~At^fc4 literal 0 HcmV?d00001 diff --git a/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c b/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c index f789a4e5e..e2ff7f6ef 100644 --- a/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c +++ b/project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c @@ -120,7 +120,7 @@ static inline void beginDrawingTex() glEnable(GL_TEXTURE_2D); - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);