[netpanzer] 76/118: Merge tag 'upstream/0.8.7'
Markus Koschany
apo at moszumanska.debian.org
Sun Jun 5 10:20:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository netpanzer.
commit 8c7cf07c5a10dfe1aa6a59dfe5a24498309329df
Merge: b2003c3 77c60d4
Author: Markus Koschany <apo at debian.org>
Date: Sun Jun 5 06:29:57 2016 +0200
Merge tag 'upstream/0.8.7'
Upstream version 0.8.7
# gpg: Signature made Sun 05 Jun 2016 06:29:50 CEST using RSA key ID 513B51E4
# gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
# gpg: aka "Markus Koschany <markus at koschany.net>" [ultimate]
# gpg: aka "Markus Koschany <apo at debian.org>" [ultimate]
.cvsignore | 5 -
0.8.7-RELEASE.txt | 117 ++++
CodeBlock.txt | 41 --
README | 400 +++++++++++---
README-SDL.txt | 13 +
README-SDL_mixer.txt | 7 +
RELEASE_VERSION | 1 -
SConstruct | 308 ++++-------
autogen.sh | 10 -
docs/Doxyfile | 205 -------
docs/docbook/serverhowto.xml | 224 --------
docs/netpanzer.6 | 72 ---
BUGS => docs/old/BUGS | 0
ChangeLog => docs/old/ChangeLog | 0
RELNOTES => docs/old/RELNOTES | 0
TODO => docs/old/TODO | 0
docs/{ => old}/serverhowto.html | 0
docs/tipofday.txt | 33 --
makerelease.sh | 74 ---
maps/Masters.npm | Bin 0 -> 361618 bytes
maps/Masters.opt | 19 +
maps/Masters.spn | 1 +
maps/Two clans (mod).npm | Bin 0 -> 308818 bytes
maps/Two clans (mod).opt | 19 +
maps/Two clans (mod).spn | 1 +
netpanzer.png | Bin 4796 -> 4690 bytes
pics/backgrounds/menus/buttons/default/page.bmp | Bin 4878 -> 4946 bytes
.../buttons/default/{page.bmp => page_green.bmp} | Bin
.../buttons/default/{page.bmp => page_old.bmp} | Bin 4878 -> 4946 bytes
.../buttons/default/{page.bmp => page_old2.bmp} | Bin 4878 -> 4946 bytes
.../buttons/default/{page.bmp => page_old3.bmp} | Bin 4878 -> 4946 bytes
.../buttons/default/{page.bmp => page_old4.bmp} | Bin 4878 -> 4946 bytes
pics/backgrounds/menus/menu/defaultMB.bmp | Bin 481078 -> 481146 bytes
pics/backgrounds/menus/menu/defaultMBstart.bmp | Bin 0 -> 481146 bytes
pics/cursors/n/allie.bmp | Bin 0 -> 2102 bytes
pics/cursors/n/breakallie.bmp | Bin 0 -> 2102 bytes
pics/cursors/n/default.bmp | Bin 0 -> 2102 bytes
pics/cursors/n/grey-target.bmp | Bin 0 -> 2102 bytes
pics/cursors/n/move.bmp | Bin 0 -> 2102 bytes
pics/cursors/n/noentry.bmp | Bin 0 -> 2102 bytes
pics/cursors/n/select.bmp | Bin 0 -> 2102 bytes
pics/cursors/n/target.bmp | Bin 0 -> 2102 bytes
pics/cursors/o/allie.bmp | Bin 0 -> 2102 bytes
pics/cursors/o/breakallie.bmp | Bin 0 -> 2102 bytes
pics/cursors/o/default.bmp | Bin 0 -> 2102 bytes
pics/cursors/o/grey-target.bmp | Bin 0 -> 2102 bytes
pics/cursors/o/move.bmp | Bin 0 -> 2102 bytes
pics/cursors/o/noentry.bmp | Bin 0 -> 2102 bytes
pics/cursors/o/select.bmp | Bin 0 -> 2102 bytes
pics/cursors/o/target.bmp | Bin 0 -> 2102 bytes
pics/flags/{algeria.bmp => afk.bmp} | Bin 1358 -> 1358 bytes
pics/flags/albania.bmp | Bin 1358 -> 1358 bytes
pics/flags/{angola.bmp => anarchy.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => android.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => anon.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => anonymous-face.bmp} | Bin 1358 -> 1360 bytes
pics/flags/{argentinia.bmp => argentina.bmp} | Bin
pics/flags/armenia.bmp | Bin 1358 -> 1358 bytes
pics/flags/bahrain.bmp | Bin 1358 -> 0 bytes
pics/flags/benin.bmp | Bin 1358 -> 0 bytes
pics/flags/bolivia.bmp | Bin 1358 -> 0 bytes
pics/flags/bosnia-herzigovina.bmp | Bin 1358 -> 0 bytes
pics/flags/botswana.bmp | Bin 1358 -> 0 bytes
pics/flags/{albania.bmp => brb.bmp} | Bin 1358 -> 1358 bytes
pics/flags/cameroon.bmp | Bin 1358 -> 0 bytes
pics/flags/{albania.bmp => confederate.bmp} | Bin 1358 -> 1358 bytes
pics/flags/croatia.bmp | Bin 1358 -> 0 bytes
pics/flags/{albania.bmp => cuba.bmp} | Bin 1358 -> 1358 bytes
pics/flags/czech-republic.bmp | Bin 1358 -> 0 bytes
pics/flags/{albania.bmp => datalove.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{bulgaria.bmp => doge.bmp} | Bin 1358 -> 1358 bytes
pics/flags/dominican-republic.bmp | Bin 1358 -> 0 bytes
pics/flags/england.bmp | Bin 1358 -> 0 bytes
pics/flags/{albania.bmp => eye.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => for-sale.bmp} | Bin 1358 -> 1358 bytes
pics/flags/georgia.bmp | Bin 1358 -> 0 bytes
pics/flags/guatemala.bmp | Bin 1358 -> 0 bytes
pics/flags/{albania.bmp => halloween.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => illuminati.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => india.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => japan-war.bmp} | Bin 1358 -> 1358 bytes
pics/flags/jordan.bmp | Bin 1358 -> 0 bytes
pics/flags/{albania.bmp => karmapa.bmp} | Bin 1358 -> 1360 bytes
pics/flags/{albania.bmp => kopimi.bmp} | Bin 1358 -> 1358 bytes
pics/flags/latvia.bmp | Bin 1358 -> 0 bytes
pics/flags/{albania.bmp => lgbt.bmp} | Bin 1358 -> 1358 bytes
pics/flags/libya.bmp | Bin 1358 -> 0 bytes
pics/flags/lithuania.bmp | Bin 1358 -> 0 bytes
pics/flags/{albania.bmp => lol.bmp} | Bin 1358 -> 1360 bytes
pics/flags/{albania.bmp => love-netpanzer.bmp} | Bin 1358 -> 1358 bytes
pics/flags/luxembourg.bmp | Bin 1358 -> 0 bytes
pics/flags/mauritania.bmp | Bin 1358 -> 0 bytes
pics/flags/nigeria.bmp | Bin 1358 -> 0 bytes
pics/flags/{argentinia.bmp => nyan.bmp} | Bin 1358 -> 1358 bytes
.../panam\303\241.bmp" => pics/flags/panama.bmp | Bin
pics/flags/paraguay.bmp | Bin 1358 -> 0 bytes
pics/flags/peru.bmp | Bin 1358 -> 0 bytes
pics/flags/{albania.bmp => phone.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => playboy.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => poker-face.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => red-cross.bmp} | Bin 1358 -> 1358 bytes
pics/flags/seychelles.bmp | Bin 1358 -> 0 bytes
pics/flags/slovakia.bmp | Bin 1358 -> 0 bytes
pics/flags/{albania.bmp => stop.bmp} | Bin 1358 -> 1358 bytes
pics/flags/tanzania.bmp | Bin 1358 -> 0 bytes
pics/flags/thailand.bmp | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => the-pirate-bay.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => tibet.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => trollface.bmp} | Bin 1358 -> 1358 bytes
pics/flags/tunisia.bmp | Bin 1358 -> 0 bytes
pics/flags/ukraine.bmp | Bin 1358 -> 0 bytes
pics/flags/{albania.bmp => v-for-vendetta.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => war.bmp} | Bin 1358 -> 1358 bytes
pics/flags/{albania.bmp => wwf.bmp} | Bin 1358 -> 1358 bytes
pics/flags/zaire.bmp | Bin 1358 -> 0 bytes
pics/menus/vehicleSelectionView/titan_danisch.bmp | Bin 0 -> 3384 bytes
pics/menus/vehicleSelectionView/titan_desert.bmp | Bin 0 -> 3384 bytes
pics/menus/vehicleSelectionView/titan_woodland.bmp | Bin 0 -> 3384 bytes
readme.html | 365 -------------
scripts/initialize.lua | 4 -
scripts/servercommands.lua | 57 +-
scripts/usercommands.lua | 89 +++-
src/.cvsignore | 5 -
src/Lib/2D/Color.hpp | 6 +-
src/Lib/2D/PackedSurface.cpp | 5 +
src/Lib/2D/Surface.cpp | 8 +
src/Lib/2D/Surface.hpp | 24 +-
src/Lib/ArrayUtil/ArrayTemplate.hpp | 12 +-
src/Lib/ArrayUtil/QueueTemplate.hpp | 20 +-
src/Lib/Network/Address.cpp | 97 +++-
src/Lib/Network/Address.hpp | 39 +-
src/Lib/Network/NetworkManager.cpp | 241 +++++++++
.../Network/NetworkManager.hpp} | 37 +-
src/Lib/Network/SocketBase.cpp | 417 +++++++++------
src/Lib/Network/SocketBase.hpp | 42 +-
src/Lib/Network/SocketHeaders.hpp | 10 +-
src/Lib/Network/SocketManager.cpp | 169 ++++--
src/Lib/Network/SocketManager.hpp | 31 +-
src/Lib/Network/TCPSocket.cpp | 32 ++
src/Lib/Network/TCPSocket.hpp | 4 +
src/Lib/Network/UDPSocket.cpp | 2 +-
src/Lib/Util/FileSystem.cpp | 10 +-
src/Lib/Util/Log.cpp | 1 +
src/Lib/Util/NTimer.hpp | 10 +-
src/NetPanzer/Bot/BotPlayer.cpp | 3 +-
src/NetPanzer/Classes/AI/Astar.cpp | 2 +-
.../Classes/Network/ClientConnectDaemon.cpp | 87 ++-
src/NetPanzer/Classes/Network/NetworkClient.cpp | 46 +-
src/NetPanzer/Classes/Network/NetworkClient.hpp | 3 -
src/NetPanzer/Classes/Network/NetworkInterface.cpp | 3 +-
src/NetPanzer/Classes/Network/NetworkServer.cpp | 42 +-
src/NetPanzer/Classes/Network/NetworkServer.hpp | 1 +
src/NetPanzer/Classes/Network/NetworkState.hpp | 8 +-
.../Classes/Network/ServerConnectDaemon.cpp | 72 ++-
src/NetPanzer/Classes/PlayerState.cpp | 29 +-
src/NetPanzer/Classes/PlayerUnitConfig.cpp | 2 +-
src/NetPanzer/Classes/SelectionBoxSprite.cpp | 2 +-
src/NetPanzer/Classes/SpawnList.cpp | 3 +-
src/NetPanzer/Classes/Sprite.hpp | 14 +-
src/NetPanzer/Classes/ViewCamera.cpp | 6 +-
src/NetPanzer/Classes/ViewCamera.hpp | 4 +-
src/NetPanzer/Classes/WorldInputCmdProcessor.cpp | 191 +++----
src/NetPanzer/Classes/WorldInputCmdProcessor.hpp | 2 +-
src/NetPanzer/Core/NetworkGlobals.cpp | 47 +-
src/NetPanzer/Core/NetworkGlobals.hpp | 10 +-
src/NetPanzer/Core/main.cpp | 39 +-
src/NetPanzer/Interfaces/BaseGameManager.cpp | 11 +-
src/NetPanzer/Interfaces/BotGameManager.cpp | 185 ++++++-
src/NetPanzer/Interfaces/BotGameManager.hpp | 33 +-
src/NetPanzer/Interfaces/ChatInterface.cpp | 26 +-
src/NetPanzer/Interfaces/Console.cpp | 3 +-
src/NetPanzer/Interfaces/ConsoleInterface.cpp | 15 +-
src/NetPanzer/Interfaces/ConsoleInterface.hpp | 4 +-
src/NetPanzer/Interfaces/DedicatedGameManager.cpp | 134 ++++-
src/NetPanzer/Interfaces/GameConfig.cpp | 589 +++++++++++----------
src/NetPanzer/Interfaces/GameConfig.hpp | 186 +++----
.../Interfaces/GameControlRulesDaemon.cpp | 140 ++++-
.../Interfaces/GameControlRulesDaemon.hpp | 11 +-
src/NetPanzer/Interfaces/GameManager.cpp | 108 ++--
src/NetPanzer/Interfaces/Heartbeat.cpp | 6 +-
src/NetPanzer/Interfaces/InfoSocket.cpp | 14 +-
src/NetPanzer/Interfaces/KeyboardInterface.cpp | 29 -
src/NetPanzer/Interfaces/KeyboardInterface.hpp | 43 +-
src/NetPanzer/Interfaces/MapInterface.cpp | 12 +-
src/NetPanzer/Interfaces/MapInterface.hpp | 103 +---
src/NetPanzer/Interfaces/MapsManager.cpp | 2 +-
src/NetPanzer/Interfaces/PathScheduler.cpp | 6 +-
src/NetPanzer/Interfaces/PlayerGameManager.cpp | 63 ++-
src/NetPanzer/Interfaces/PlayerInterface.cpp | 27 +-
src/NetPanzer/Network/ClientSocket.cpp | 252 ++++++++-
src/NetPanzer/Network/ClientSocket.hpp | 42 +-
src/NetPanzer/Objectives/Objective.cpp | 19 +-
src/NetPanzer/Objectives/ObjectiveInterface.cpp | 12 +-
src/NetPanzer/Particles/Particle2D.cpp | 8 +-
src/NetPanzer/Particles/ParticleInterface.cpp | 16 +-
src/NetPanzer/PowerUps/BonusUnitPowerUp.cpp | 13 +-
src/NetPanzer/PowerUps/PowerUp.cpp | 4 +-
src/NetPanzer/PowerUps/PowerUpInterface.cpp | 44 +-
src/NetPanzer/PowerUps/UnitPowerUp.cpp | 11 +-
src/NetPanzer/Scripts/NetPanzerModule.cpp | 19 +
src/NetPanzer/System/SDLEvents.cpp | 92 +++-
src/NetPanzer/System/SDLSound.cpp | 126 +++--
src/NetPanzer/System/SDLSound.hpp | 6 +-
src/NetPanzer/Units/UnitBase.hpp | 7 +
src/NetPanzer/Units/UnitBlackBoard.cpp | 10 -
src/NetPanzer/Units/UnitInterface.cpp | 2 +-
src/NetPanzer/Units/Vehicle.cpp | 61 +--
src/NetPanzer/Views/Components/Button.cpp | 30 +-
src/NetPanzer/Views/Components/Button.hpp | 1 -
src/NetPanzer/Views/Components/CheckBox.cpp | 29 +-
src/NetPanzer/Views/Components/CheckBox.hpp | 12 +-
src/NetPanzer/Views/Components/Choice.cpp | 19 +-
src/NetPanzer/Views/Components/InfoBar.cpp | 10 +-
src/NetPanzer/Views/Components/Label.hpp | 8 +-
src/NetPanzer/Views/Components/MiniMap.cpp | 15 +-
src/NetPanzer/Views/Components/ScrollBar.cpp | 16 +-
src/NetPanzer/Views/Components/ViewGlobals.hpp | 22 +-
src/NetPanzer/Views/Components/cInputField.cpp | 14 +-
src/NetPanzer/Views/Components/newButton.hpp | 9 +-
src/NetPanzer/Views/Game/AreYouSureExitView.cpp | 22 +-
src/NetPanzer/Views/Game/AreYouSureResignView.cpp | 25 +-
src/NetPanzer/Views/Game/CodeStatsView.cpp | 100 +---
src/NetPanzer/Views/Game/EndRoundView.cpp | 22 +-
src/NetPanzer/Views/Game/GFlagSelectionView.cpp | 3 +-
src/NetPanzer/Views/Game/GameTemplateView.cpp | 8 +-
src/NetPanzer/Views/Game/GameView.cpp | 22 +-
src/NetPanzer/Views/Game/HelpScrollView.cpp | 36 +-
src/NetPanzer/Views/Game/HelpScrollView.hpp | 8 +-
.../{HelpScrollView.cpp => HelpScrollViewAlt.cpp} | 43 +-
.../{HelpScrollView.hpp => HelpScrollViewAlt.hpp} | 16 +-
src/NetPanzer/Views/Game/LibView.cpp | 4 +-
src/NetPanzer/Views/Game/LoadingView.cpp | 144 ++++-
src/NetPanzer/Views/Game/LoadingView.hpp | 81 +--
src/NetPanzer/Views/Game/RankView.cpp | 8 +-
src/NetPanzer/Views/Game/VehicleSelectionView.cpp | 66 +--
src/NetPanzer/Views/GameViewGlobals.cpp | 24 +-
src/NetPanzer/Views/GameViewGlobals.hpp | 18 +-
.../MainMenu/{MainMenuView.cpp => CreditsView.cpp} | 73 ++-
.../MainMenu/{MainMenuView.hpp => CreditsView.hpp} | 22 +-
src/NetPanzer/Views/MainMenu/HelpView.cpp | 18 +-
src/NetPanzer/Views/MainMenu/MainMenuView.cpp | 40 +-
src/NetPanzer/Views/MainMenu/MainMenuView.hpp | 8 +-
src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp | 123 ++++-
src/NetPanzer/Views/MainMenu/MenuTemplateView.hpp | 9 +-
.../Views/MainMenu/Multi/GetSessionView.cpp | 8 +-
.../Views/MainMenu/Multi/HostJoinTemplateView.cpp | 13 +-
.../Views/MainMenu/Multi/HostOptionsView.cpp | 108 ++--
.../Views/MainMenu/Multi/HostOptionsView.hpp | 6 +-
.../Views/MainMenu/Multi/IPAddressView.cpp | 10 +-
.../Views/MainMenu/Multi/MapSelectionView.cpp | 6 +-
.../Multi/MasterServer/ServerQueryThread.cpp | 16 +-
.../Views/MainMenu/Multi/PlayerNameView.cpp | 6 +-
.../Views/MainMenu/Multi/PlayerNameView.hpp | 12 +-
.../Views/MainMenu/Multi/ServerListView.cpp | 8 +-
src/NetPanzer/Views/MainMenu/Multi/TipsView.cpp | 122 +++++
.../{MainMenuView.hpp => Multi/TipsView.hpp} | 28 +-
.../Views/MainMenu/OptionsTemplateView.cpp | 88 +--
netpanzer.xpm => support/icon/netpanzer.xpm | 0
support/icon/npicon.rc | 8 +-
support/scripts/crossmingw.py | 146 +++++
support/scripts/np-launcher | 90 ++++
support/static/netpanzer | 65 ---
support/tools/bmp2pak.cpp | 177 +++++++
support/tools/pak2bmp.cpp | 185 +++++++
.../win32/netpanzer.desktop | 0
265 files changed, 5158 insertions(+), 3469 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/netpanzer.git
More information about the Pkg-games-commits
mailing list