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

Updated TeeWorlds

Browse Source
This commit is contained in:
Sergii Pylypenko
2013-06-04 21:32:58 +03:00
parent e54de4d5f5
commit 93be285d54
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/jni/application/teeworlds/AndroidAppSettings.cfg
View File

@@ -127,13 +127,13 @@ NonBlockingSwapBuffers=n
RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP" RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP"
# Number of virtual keyboard keys (currently 6 is maximum) # Number of virtual keyboard keys (currently 6 is maximum)
AppTouchscreenKeyboardKeysAmount=3 AppTouchscreenKeyboardKeysAmount=4
# Number of virtual keyboard keys that support autofire (currently 2 is maximum) # Number of virtual keyboard keys that support autofire (currently 2 is maximum)
AppTouchscreenKeyboardKeysAmountAutoFire=0 AppTouchscreenKeyboardKeysAmountAutoFire=0
# Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right)
RedefinedKeysScreenKb="SPACE PAGEUP PAGEDOWN TAB" RedefinedKeysScreenKb="SPACE PAGEDOWN PAGEUP TAB"
# Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu
RedefinedKeysScreenKbNames="Jump Next_weapon Previous_weapon Show_scores" RedefinedKeysScreenKbNames="Jump Next_weapon Previous_weapon Show_scores"

10
project/jni/application/teeworlds/AndroidPreBuild.sh
View File

@@ -3,10 +3,12 @@
LOCAL_PATH=`dirname $0` LOCAL_PATH=`dirname $0`
LOCAL_PATH=`cd $LOCAL_PATH && pwd` LOCAL_PATH=`cd $LOCAL_PATH && pwd`
cd $LOCAL_PATH/src
[ -n "`find datasrc/*.py -cnewer src/game/generated/protocol.cpp 2>&1`" ] && {
echo "Building autogenerated files" echo "Building autogenerated files"
python --version > /dev/null 2>&1 || { echo "Error: no Python installed" ; exit 1 ; } python --version > /dev/null 2>&1 || { echo "Error: no Python installed" ; exit 1 ; }
cd $LOCAL_PATH/src
python datasrc/compile.py network_source > src/game/generated/protocol.cpp python datasrc/compile.py network_source > src/game/generated/protocol.cpp
python datasrc/compile.py network_header > src/game/generated/protocol.h python datasrc/compile.py network_header > src/game/generated/protocol.h
python datasrc/compile.py client_content_source > src/game/generated/client_data.cpp python datasrc/compile.py client_content_source > src/game/generated/client_data.cpp
@@ -15,10 +17,12 @@ python datasrc/compile.py server_content_source > src/game/generated/server_data
python datasrc/compile.py server_content_header > src/game/generated/server_data.h python datasrc/compile.py server_content_header > src/game/generated/server_data.h
python scripts/cmd5.py src/engine/shared/protocol.h src/game/generated/protocol.h src/game/tuning.h src/game/gamecore.cpp src/game/generated/protocol.h > src/game/generated/nethash.cpp python scripts/cmd5.py src/engine/shared/protocol.h src/game/generated/protocol.h src/game/tuning.h src/game/gamecore.cpp src/game/generated/protocol.h > src/game/generated/nethash.cpp
}
[ -n "`find data *.txt *.cfg -cnewer ../AndroidData/data.zip 2>&1`" ] && {
echo "Archiving data" echo "Archiving data"
mkdir -p ../AndroidData mkdir -p ../AndroidData
zip -r data.zip data *.txt *.cfg >/dev/null zip -r ../AndroidData/data.zip data *.txt *.cfg >/dev/null
mv -f data.zip ../AndroidData/ }
exit 0 exit 0

2
project/jni/application/teeworlds/src

Submodule project/jni/application/teeworlds/src updated: c2586fa2aa...a4abb1f56b