Skip to content

Commit

Permalink
Teeworlds: updated
Browse files Browse the repository at this point in the history
  • Loading branch information
pelya committed Aug 18, 2015
1 parent 2c60296 commit 47df38f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 62 deletions.
12 changes: 6 additions & 6 deletions project/jni/application/teeworlds/AndroidAppSettings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ AppName="TeeWorlds"
AppFullName=com.teeworlds

# Application version code (integer)
AppVersionCode=06325
AppVersionCode=06327

# Application user-visible version name (string)
AppVersionName="0.6.3.25"
AppVersionName="0.6.3.27"

# Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
# If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
Expand All @@ -21,10 +21,10 @@ AppVersionName="0.6.3.25"
AppDataDownloadUrl="!!Game data|data.zip^!!Server config|:server-config.txt:server-config.txt"

# Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=y
ResetSdlConfigForThisVersion=n

# Delete application data files when upgrading (specify file/dir paths separated by spaces)
DeleteFilesOnUpgrade="%"
DeleteFilesOnUpgrade="libsdl-DownloadFinished-1.flag"

# Here you may type readme text, which will be shown during startup. Format is:
# Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/
Expand Down Expand Up @@ -143,10 +143,10 @@ AppUsesSecondJoystick=y
AppUsesThirdJoystick=y

# Application uses accelerometer (y) or (n), the accelerometer will be used as joystick 1 axes 0-1 and 5-7
AppUsesAccelerometer=n
AppUsesAccelerometer=y

# Application uses gyroscope (y) or (n), the gyroscope will be used as joystick 1 axes 2-4
AppUsesGyroscope=y
AppUsesGyroscope=n

# Application uses orientation sensor (y) or (n), reported as joystick 1 axes 8-10
AppUsesOrientationSensor=n
Expand Down
55 changes: 0 additions & 55 deletions project/jni/application/teeworlds/java.patch

This file was deleted.

4 changes: 4 additions & 0 deletions project/jni/application/teeworlds/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ then launch commands:
android update project -p project
./build.sh
That should do it.

Bot sources are not available, because of cheaters that use aimbot client.
They are available on request from here:
https://www.teeworlds.com/forum/viewtopic.php?id=11397
2 changes: 1 addition & 1 deletion project/jni/application/teeworlds/src
Submodule src updated 52 files
+1 −7 bam.lua
+ bin-armeabi-v7a/teebot
+ bin-mips/busybox
+ bin-mips/teebot
+ bin-x86/teebot
+23 −26 data/languages/italian.txt
+21 −21 data/languages/spanish.txt
+14 −10 readme.txt
+3 −0 server-config.txt
+9 −9 src/base/system.c
+3 −3 src/base/vmath.h
+11 −14 src/engine/client/client.cpp
+0 −16 src/engine/client/input.cpp
+0 −4 src/engine/client/input.h
+0 −16 src/engine/console-client/SDL.h
+0 −1 src/engine/console-client/client.cpp
+0 −1 src/engine/console-client/client.h
+0 −1 src/engine/console-client/friends.cpp
+0 −1 src/engine/console-client/friends.h
+0 −296 src/engine/console-client/graphics.cpp
+0 −91 src/engine/console-client/graphics.h
+0 −66 src/engine/console-client/input.cpp
+0 −30 src/engine/console-client/input.h
+0 −1 src/engine/console-client/keynames.h
+0 −1 src/engine/console-client/serverbrowser.cpp
+0 −1 src/engine/console-client/serverbrowser.h
+0 −82 src/engine/console-client/sound.cpp
+0 −37 src/engine/console-client/sound.h
+0 −95 src/engine/console-client/text.cpp
+0 −2 src/engine/input.h
+7 −7 src/engine/server/server.cpp
+1 −2 src/engine/shared/config.h
+1 −1 src/engine/shared/network.cpp
+0 −1 src/engine/shared/network.h
+2 −1 src/engine/shared/network_client.cpp
+7 −17 src/engine/shared/network_conn.cpp
+1 −0 src/game/client/components/chat.cpp
+49 −84 src/game/client/components/controls.cpp
+3 −3 src/game/client/components/controls.h
+13 −1 src/game/client/components/hud.cpp
+15 −1 src/game/client/components/menus.cpp
+1 −1 src/game/client/components/menus.h
+1 −1 src/game/client/components/menus_browser.cpp
+41 −21 src/game/client/components/menus_server.cpp
+17 −36 src/game/client/components/menus_settings.cpp
+27 −73 src/game/client/ui.cpp
+0 −8 src/game/client/ui.h
+3 −3 src/game/server/entities/character.cpp
+1 −5 src/game/server/gamecontext.cpp
+33 −2 src/game/server/gamecontroller.cpp
+2 −0 src/game/server/gamecontroller.h
+3 −2 src/game/variables.h

0 comments on commit 47df38f

Please sign in to comment.