Merge branch 'sdl_android' of /home/chris/Projects/android-crawl/commandergenius
authorChris West <therealchriswest@hotmail.com>
Sat, 29 Dec 2012 18:28:39 +0000 (18:28 +0000)
committerChris West <therealchriswest@hotmail.com>
Sat, 29 Dec 2012 18:28:39 +0000 (18:28 +0000)
commitdcc9cb3cefe508afa35a2fdf5fd84dd9b482c4c0
tree9464f9d49bdfb9d001bdfca5dab93c03e5c9c44b
parentcd53ab04cbfea7e57e9b3c14ea0f7d6882e66ea9
parentc03e52a4a5fcd3775ccfe45654ec7ee42fc903e6
Merge branch 'sdl_android' of /home/chris/Projects/android-crawl/commandergenius

Conflicts:
build.sh
project/java/Globals.java
project/java/Settings.java
project/jni/Application.mk
project/jni/application/ballfield/AndroidAppSettings.cfg
project/jni/application/ballfield/AndroidData/ballfield3.zip
project/jni/application/ballfield/ballfield.cpp
project/jni/application/commandergenius/AndroidAppSettings.cfg
project/jni/application/commandergenius/AndroidData/keen4.zip
project/jni/application/commandergenius/commandergenius
project/jni/application/dosbox/AndroidAppSettings.cfg
project/jni/application/dosbox/AndroidBuild.sh
project/jni/application/dosbox/AndroidData/dosbox-data.zip
project/jni/application/dosbox/dosbox-0.74-androidSDL.diff
project/jni/application/fheroes2/AndroidAppSettings.cfg
project/jni/application/freetype-config
project/jni/application/gemrb/AndroidAppSettings.cfg
project/jni/application/milkytracker/readme.txt
project/jni/application/openarena/AndroidAppSettings.cfg
project/jni/application/openarena/AndroidBuild.sh
project/jni/application/openarena/engine
project/jni/application/openarena/readme.txt
project/jni/application/openttd/AndroidAppSettings.cfg
project/jni/application/openttd/AndroidBuild.sh
project/jni/application/openttd/openttd-trunk-android.patch
project/jni/application/openttd/readme.txt
project/jni/application/pachi/AndroidAppSettings.cfg
project/jni/application/prefclub/AndroidAppSettings.cfg
project/jni/application/prefclub/AndroidBuild.sh
project/jni/application/prefclub/dosbox-0.74-androidSDL.diff
project/jni/application/sdl-config
project/jni/application/setEnvironment-armeabi-v7a.sh
project/jni/application/setEnvironment.sh
project/jni/application/teeworlds-0.5.2/AndroidData/teeworlds.zip
project/jni/application/teeworlds-0.5.2/license.txt
project/jni/application/teeworlds-0.5.2/src/base/detect.h
project/jni/application/teeworlds-0.5.2/src/base/math.hpp
project/jni/application/teeworlds-0.5.2/src/base/system.cpp
project/jni/application/teeworlds-0.5.2/src/base/system.h
project/jni/application/teeworlds-0.5.2/src/base/vmath.hpp
project/jni/application/teeworlds-0.5.2/src/engine/client/ec_client.cpp
project/jni/application/teeworlds-0.5.2/src/engine/client/ec_font.cpp
project/jni/application/teeworlds-0.5.2/src/engine/client/ec_font.h
project/jni/application/teeworlds-0.5.2/src/engine/client/ec_gfx.cpp
project/jni/application/teeworlds-0.5.2/src/engine/client/ec_gfx_text.cpp
project/jni/application/teeworlds-0.5.2/src/engine/client/ec_inp.cpp
project/jni/application/teeworlds-0.5.2/src/engine/client/ec_snd.cpp
project/jni/application/teeworlds-0.5.2/src/engine/client/ec_srvbrowse.cpp
project/jni/application/teeworlds-0.5.2/src/engine/docs/client_time.txt
project/jni/application/teeworlds-0.5.2/src/engine/docs/prediction.txt
project/jni/application/teeworlds-0.5.2/src/engine/docs/server_op.txt
project/jni/application/teeworlds-0.5.2/src/engine/docs/snapshots.txt
project/jni/application/teeworlds-0.5.2/src/engine/e_client_interface.h
project/jni/application/teeworlds-0.5.2/src/engine/e_common_interface.h
project/jni/application/teeworlds-0.5.2/src/engine/e_compression.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_compression.h
project/jni/application/teeworlds-0.5.2/src/engine/e_config.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_config.h
project/jni/application/teeworlds-0.5.2/src/engine/e_config_variables.h
project/jni/application/teeworlds-0.5.2/src/engine/e_console.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_console.h
project/jni/application/teeworlds-0.5.2/src/engine/e_datafile.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_datafile.h
project/jni/application/teeworlds-0.5.2/src/engine/e_demorec.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_demorec.h
project/jni/application/teeworlds-0.5.2/src/engine/e_engine.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_engine.h
project/jni/application/teeworlds-0.5.2/src/engine/e_huffman.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_huffman.h
project/jni/application/teeworlds-0.5.2/src/engine/e_if_client.h
project/jni/application/teeworlds-0.5.2/src/engine/e_if_gfx.h
project/jni/application/teeworlds-0.5.2/src/engine/e_if_inp.h
project/jni/application/teeworlds-0.5.2/src/engine/e_if_modc.h
project/jni/application/teeworlds-0.5.2/src/engine/e_if_mods.h
project/jni/application/teeworlds-0.5.2/src/engine/e_if_msg.h
project/jni/application/teeworlds-0.5.2/src/engine/e_if_other.h
project/jni/application/teeworlds-0.5.2/src/engine/e_if_server.h
project/jni/application/teeworlds-0.5.2/src/engine/e_if_snd.h
project/jni/application/teeworlds-0.5.2/src/engine/e_jobs.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_jobs.h
project/jni/application/teeworlds-0.5.2/src/engine/e_keynames.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_keys.h
project/jni/application/teeworlds-0.5.2/src/engine/e_linereader.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_linereader.h
project/jni/application/teeworlds-0.5.2/src/engine/e_map.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_memheap.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_memheap.h
project/jni/application/teeworlds-0.5.2/src/engine/e_msg.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_network.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_network.h
project/jni/application/teeworlds-0.5.2/src/engine/e_network_client.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_network_conn.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_network_internal.h
project/jni/application/teeworlds-0.5.2/src/engine/e_network_server.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_packer.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_packer.h
project/jni/application/teeworlds-0.5.2/src/engine/e_protocol.h
project/jni/application/teeworlds-0.5.2/src/engine/e_ringbuffer.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_ringbuffer.h
project/jni/application/teeworlds-0.5.2/src/engine/e_server_interface.h
project/jni/application/teeworlds-0.5.2/src/engine/e_snapshot.cpp
project/jni/application/teeworlds-0.5.2/src/engine/e_snapshot.h
project/jni/application/teeworlds-0.5.2/src/engine/external/important.txt
project/jni/application/teeworlds-0.5.2/src/engine/external/pnglite/pnglite.c
project/jni/application/teeworlds-0.5.2/src/engine/external/pnglite/pnglite.h
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/arm.S
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/arml.S
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/bits.c
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/coldfire.S
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/float.c
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/license.txt
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/metadata.c
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/readme.txt
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/unpack.c
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/wavpack.h
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/words.c
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/wputils.c
project/jni/application/teeworlds-0.5.2/src/engine/external/wavpack/wvfilter.c.no_compile
project/jni/application/teeworlds-0.5.2/src/engine/server/es_register.cpp
project/jni/application/teeworlds-0.5.2/src/engine/server/es_server.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/animstate.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/animstate.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/clienthooks.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/component.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/binds.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/binds.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/broadcast.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/broadcast.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/camera.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/camera.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/chat.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/chat.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/console.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/console.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/controls.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/controls.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/damageind.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/damageind.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/debughud.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/debughud.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/effects.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/effects.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/emoticon.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/emoticon.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/flow.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/flow.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/hud.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/hud.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/items.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/items.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/killmessages.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/killmessages.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/mapimages.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/mapimages.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/maplayers.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/maplayers.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/menus.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/menus.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/menus_browser.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/menus_demo.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/menus_ingame.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/menus_settings.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/motd.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/motd.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/nameplates.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/nameplates.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/particles.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/particles.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/players.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/players.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/scoreboard.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/scoreboard.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/skins.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/skins.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/sounds.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/sounds.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/voting.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/components/voting.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/gameclient.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/gameclient.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/lineinput.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/lineinput.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/render.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/render.hpp
project/jni/application/teeworlds-0.5.2/src/game/client/render_map.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/ui.cpp
project/jni/application/teeworlds-0.5.2/src/game/client/ui.hpp
project/jni/application/teeworlds-0.5.2/src/game/collision.cpp
project/jni/application/teeworlds-0.5.2/src/game/collision.hpp
project/jni/application/teeworlds-0.5.2/src/game/editor/array.hpp
project/jni/application/teeworlds-0.5.2/src/game/editor/ed_editor.cpp
project/jni/application/teeworlds-0.5.2/src/game/editor/ed_editor.hpp
project/jni/application/teeworlds-0.5.2/src/game/editor/ed_io.cpp
project/jni/application/teeworlds-0.5.2/src/game/editor/ed_layer_game.cpp
project/jni/application/teeworlds-0.5.2/src/game/editor/ed_layer_quads.cpp
project/jni/application/teeworlds-0.5.2/src/game/editor/ed_layer_tiles.cpp
project/jni/application/teeworlds-0.5.2/src/game/editor/ed_popups.cpp
project/jni/application/teeworlds-0.5.2/src/game/gamecore.cpp
project/jni/application/teeworlds-0.5.2/src/game/gamecore.hpp
project/jni/application/teeworlds-0.5.2/src/game/generated/g_protocol.cpp
project/jni/application/teeworlds-0.5.2/src/game/generated/g_protocol.hpp
project/jni/application/teeworlds-0.5.2/src/game/generated/gc_data.cpp
project/jni/application/teeworlds-0.5.2/src/game/generated/gc_data.hpp
project/jni/application/teeworlds-0.5.2/src/game/generated/gs_data.hpp
project/jni/application/teeworlds-0.5.2/src/game/generated/nethash.c
project/jni/application/teeworlds-0.5.2/src/game/layers.cpp
project/jni/application/teeworlds-0.5.2/src/game/layers.hpp
project/jni/application/teeworlds-0.5.2/src/game/mapitems.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/entities/character.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/entities/character.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/entities/laser.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/entities/laser.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/entities/pickup.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/entities/pickup.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/entities/projectile.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/entities/projectile.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/entity.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/entity.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/eventhandler.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/eventhandler.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/gamecontext.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/gamecontext.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/gamecontroller.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/gamecontroller.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/gamemodes/ctf.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/gamemodes/ctf.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/gamemodes/dm.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/gamemodes/dm.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/gamemodes/mod.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/gamemodes/mod.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/gamemodes/tdm.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/gamemodes/tdm.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/gameworld.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/gameworld.hpp
project/jni/application/teeworlds-0.5.2/src/game/server/hooks.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/player.cpp
project/jni/application/teeworlds-0.5.2/src/game/server/player.hpp
project/jni/application/teeworlds-0.5.2/src/game/tuning.hpp
project/jni/application/teeworlds-0.5.2/src/game/variables.hpp
project/jni/application/teeworlds-0.5.2/src/game/version.hpp
project/jni/application/teeworlds-0.5.2/src/mastersrv/mastersrv.h
project/jni/application/teeworlds-0.5.2/src/versionsrv/versionsrv.h
project/jni/application/teeworlds/AndroidAppSettings.cfg
project/jni/application/teeworlds/readme.txt
project/jni/application/test-advertisements/AndroidAppSettings.cfg
project/jni/application/test-advertisements/ballfield.cpp
project/jni/application/test-opengl/AndroidAppSettings.cfg
project/jni/application/test-opengl/AndroidData/data2.zip
project/jni/application/test-opengl/icon.png
project/jni/application/ufoai/icon.png
project/jni/application/ufoai/readme.txt
project/jni/application/vcmi/Android.mk-rename-me-back-if-you-wish-to-compile-VCMI
project/jni/application/vcmi/Makefile
project/jni/mxml/include/mxml.h
project/jni/mxml/src/config.h
project/jni/mxml/src/mxml-attr.c
project/jni/mxml/src/mxml-entity.c
project/jni/mxml/src/mxml-file.c
project/jni/mxml/src/mxml-index.c
project/jni/mxml/src/mxml-node.c
project/jni/mxml/src/mxml-private.c
project/jni/mxml/src/mxml-private.h
project/jni/mxml/src/mxml-search.c
project/jni/mxml/src/mxml-set.c
project/jni/mxml/src/mxml-string.c
project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
project/jni/sdl-1.3/src/video/android/SDL_androidinput.h
project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
project/jni/sdl-1.3/src/video/android/keymap.c
project/jni/xml2/trio.c
project/project.properties
.gitignore
build.sh
project/java/Globals.java
project/java/MainActivity.java
project/java/Settings.java
project/java/Video.java
project/jni/Application.mk
project/jni/SettingsTemplate.mk
project/jni/application/Android.mk