[trigger-rally] 04/14: Merge tag 'upstream/0.6.5+dfsg'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository trigger-rally.

commit 9e66451239fe4963a9aadf28db8246c3806f8cf6
Merge: 04b7ab6 1821951
Author: Markus Koschany <apo at debian.org>
Date:   Mon Dec 19 14:18:02 2016 +0100

    Merge tag 'upstream/0.6.5+dfsg'
    
    Upstream version 0.6.5+dfsg
    
    # gpg: Signatur vom Mo 19 Dez 2016 14:18:01 CET
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 bin/trigger-rally.config.defs                |  10 +-
 data/data.md5                                |   2 +-
 data/data.zip                                | Bin 69045256 -> 84336391 bytes
 data/defplayers/AB.player                    | Bin 21419 -> 0 bytes
 data/icon/trigger-128.png                    | Bin 14902 -> 14903 bytes
 data/icon/trigger-16.png                     | Bin 577 -> 503 bytes
 data/icon/trigger-192.png                    | Bin 24546 -> 24621 bytes
 data/icon/trigger-22.png                     | Bin 864 -> 790 bytes
 data/icon/trigger-24.png                     | Bin 1025 -> 951 bytes
 data/icon/trigger-256.png                    | Bin 34438 -> 34579 bytes
 data/icon/trigger-32.png                     | Bin 2123 -> 2049 bytes
 data/icon/trigger-36.png                     | Bin 2764 -> 2690 bytes
 data/icon/trigger-48.png                     | Bin 4147 -> 4074 bytes
 data/icon/trigger-64.png                     | Bin 6200 -> 6137 bytes
 data/icon/trigger-72.png                     | Bin 7281 -> 7224 bytes
 data/icon/trigger-96.png                     | Bin 10459 -> 10445 bytes
 doc/BUILDING.txt                             | 391 +++++------------------
 doc/DATA_AUTHORS.txt                         |  42 ++-
 src/GNUmakefile                              |  20 +-
 src/GNUmakefile.MSYS                         |  62 ++--
 src/{GNUmakefile.MSYS => GNUmakefile.MSYS64} |  79 ++---
 src/PEngine/app.cpp                          | 131 ++++++--
 src/PEngine/model.cpp                        |   2 +-
 src/PEngine/physfs_rw.cpp                    |  22 +-
 src/PEngine/terrain.cpp                      | 453 +++++++++++++++++++--------
 src/PEngine/texture.cpp                      |   2 +-
 src/PEngine/util.cpp                         | 170 +++++-----
 src/PSim/sim.cpp                             |  28 +-
 src/PSim/vehicle.cpp                         |  14 +-
 src/Trigger/game.cpp                         |   8 +-
 src/Trigger/main.cpp                         | 333 +++++++++++++-------
 src/Trigger/menu.cpp                         |   4 +-
 src/Trigger/render.cpp                       |   4 +-
 src/TriggerRally.dev                         | 442 --------------------------
 src/TriggerRally.mak                         |  46 ---
 src/_clean.cmd                               |   4 -
 src/include/app.h                            |  39 ++-
 src/include/codriver.h                       |   5 +-
 src/include/hiscore1.h                       |  19 +-
 src/include/main.h                           | 165 +++++-----
 src/include/pengine.h                        |  46 +--
 src/include/psim.h                           |  36 +--
 src/include/render.h                         | 142 ++++++---
 43 files changed, 1235 insertions(+), 1486 deletions(-)

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