[teeworlds] 03/07: Merge tag 'upstream/0.6.4+dfsg'

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository teeworlds.

commit 82379acfaa08e9954a914b8e67721f8cc0ba2212
Merge: 469c46e bf5e8e2
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Nov 14 21:37:52 2016 +0100

    Merge tag 'upstream/0.6.4+dfsg'
    
    Upstream version 0.6.4+dfsg
    
    # gpg: Signature made Mo 14 Nov 2016 21:37:50 CET
    # gpg:                using RSA key FE22C6FD83135D45
    # gpg: Good signature from "Felix Geyer <felix at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx-pkg at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx at kubuntu.org>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <debfx at ubuntu.com>" [ultimate]
    # gpg:                 aka "Felix Geyer <felix.geyer at fobos.de>" [ultimate]
    # gpg:                 aka "Felix Geyer <fgeyer at debian.org>" [ultimate]
    # Primary key fingerprint: 164C 7051 2F79 2947 6764  AB56 FE22 C6FD 8313 5D45

 bam.lua                                   |   2 +-
 data/languages/belarusian.txt             |  30 +-
 data/languages/bosnian.txt                |  12 +
 data/languages/brazilian_portuguese.txt   |  38 +-
 data/languages/bulgarian.txt              | 336 +++++++-------
 data/languages/chuvash.txt                | 700 ++++++++++++++++++++++++++++++
 data/languages/czech.txt                  |  12 +
 data/languages/danish.txt                 |  12 +
 data/languages/dutch.txt                  |  15 +-
 data/languages/finnish.txt                |  12 +
 data/languages/french.txt                 |  36 +-
 data/languages/german.txt                 |  36 +-
 data/languages/hungarian.txt              |  12 +
 data/languages/index.txt                  |   8 +
 data/languages/italian.txt                |  37 +-
 data/languages/kyrgyz.txt                 | 282 ++++++------
 data/languages/norwegian.txt              |  42 +-
 data/languages/polish.txt                 |  12 +
 data/languages/portuguese.txt             |  12 +
 data/languages/romanian.txt               |  78 ++--
 data/languages/russian.txt                |  30 +-
 data/languages/sakha.txt                  | 700 ++++++++++++++++++++++++++++++
 data/languages/serbian.txt                |  12 +
 data/languages/slovak.txt                 |  12 +
 data/languages/spanish.txt                |  30 +-
 data/languages/swedish.txt                |  12 +
 data/languages/turkish.txt                |  12 +
 data/languages/ukrainian.txt              |  12 +
 datasrc/datatypes.py                      |   2 +-
 license.txt                               |   2 +-
 other/freetype/VERSION                    |   2 +-
 other/sdl/README-SDL.txt                  |  13 +
 other/sdl/VERSION                         |   1 +
 readme.txt                                |   2 +-
 scripts/cmd5.py                           |   2 +-
 scripts/refactor_count.py                 |   2 +-
 src/base/math.h                           |   2 +-
 src/base/system.c                         |  75 ++--
 src/base/system.h                         |  11 +-
 src/base/tl/threading.h                   |   2 +-
 src/base/vmath.h                          |   8 +-
 src/engine/client/backend_sdl.cpp         |   4 +-
 src/engine/client/client.cpp              |  63 ++-
 src/engine/client/client.h                |   1 +
 src/engine/client/serverbrowser.cpp       |  31 +-
 src/engine/client/serverbrowser.h         |  13 +-
 src/engine/client/sound.cpp               |  10 +-
 src/engine/server/server.cpp              |  14 +-
 src/engine/shared/config_variables.h      |   4 +-
 src/engine/shared/econ.cpp                |   5 +-
 src/engine/shared/engine.cpp              |   2 +
 src/engine/shared/jobs.cpp                |   6 +-
 src/engine/shared/network.cpp             |   2 +-
 src/engine/shared/network.h               |   5 +-
 src/engine/shared/network_client.cpp      |   5 +-
 src/engine/shared/network_conn.cpp        |  24 +-
 src/engine/shared/network_server.cpp      |   9 +-
 src/engine/shared/snapshot.cpp            |   8 +-
 src/engine/shared/snapshot.h              |   7 +-
 src/game/client/components/chat.cpp       |   1 +
 src/game/client/components/hud.cpp        |  14 +-
 src/game/client/components/items.cpp      |  24 -
 src/game/client/components/items.h        |  11 -
 src/game/client/components/mapimages.cpp  |   5 +-
 src/game/client/components/menus_demo.cpp |   2 +-
 src/game/client/components/players.cpp    |   7 +-
 src/game/client/gameclient.cpp            |  20 +-
 src/game/collision.h                      |   4 +-
 src/game/editor/editor.cpp                |  55 ++-
 src/game/editor/io.cpp                    |  17 +-
 src/game/editor/layer_tiles.cpp           |   2 +-
 src/game/editor/popups.cpp                |   6 +
 src/game/gamecore.cpp                     |  16 +-
 src/game/mapitems.h                       |   8 +-
 src/game/server/entities/character.cpp    |  33 --
 src/game/server/entity.cpp                |   4 +-
 src/game/server/gamecontext.cpp           |   6 +-
 src/game/server/gamecontroller.cpp        |  35 +-
 src/game/server/gamecontroller.h          |   2 +
 src/game/variables.h                      |   1 +
 src/game/version.h                        |   4 +-
 src/mastersrv/mastersrv.cpp               |   2 +-
 src/tools/crapnet.cpp                     |   4 +-
 src/tools/packetgen.cpp                   |   2 +-
 84 files changed, 2470 insertions(+), 696 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/teeworlds.git