[springlobby] 04/06: Merge tag 'upstream/0.226'
Markus Koschany
apo-guest at moszumanska.debian.org
Tue Aug 25 20:35:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository springlobby.
commit b6f386a95266f44ffb487a5af5beccd51167b5a5
Merge: 26c6a18 54d2004
Author: Markus Koschany <apo at gambaru.de>
Date: Tue Aug 25 21:57:34 2015 +0200
Merge tag 'upstream/0.226'
Upstream version 0.226
# gpg: Signature made Tue 25 Aug 2015 21:57:29 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]
ChangeLog | 9 +
VERSION | 2 +-
springlobby_config.h | 2 +-
src/CMakeLists.txt | 30 +-
src/battle.cpp | 4 +-
src/channel.cpp | 38 +-
src/channel.h | 12 +-
src/chatlog.cpp | 6 +-
src/contentdownloadrequest.cpp | 113 +++
src/contentdownloadrequest.h | 40 +
src/contentmanager.cpp | 231 +++++
src/contentmanager.h | 48 ++
src/downloader/downloaddataviewctrl.cpp | 60 ++
src/downloader/downloaddataviewctrl.h | 48 ++
src/downloader/downloaddataviewmodel.cpp | 86 ++
src/downloader/downloaddataviewmodel.h | 32 +
src/downloader/downloadlistctrl.cpp | 257 ------
src/downloader/downloadlistctrl.h | 73 --
src/downloader/downloadsobserver.cpp | 34 +-
src/downloader/downloadsobserver.h | 4 +-
src/downloader/lib/CMakeLists.txt | 12 +
src/downloader/lib/src/CMakeLists.txt | 6 +
src/downloader/lib/src/Downloader/CurlWrapper.cpp | 35 +-
src/downloader/lib/src/Downloader/CurlWrapper.h | 13 +-
.../lib/src/Downloader/Http/DownloadData.cpp | 8 +-
.../lib/src/Downloader/Http/DownloadData.h | 5 +-
.../lib/src/Downloader/Http/HttpDownloader.cpp | 54 +-
.../lib/src/Downloader/IDownloadsObserver.cpp | 4 +-
.../lib/src/Downloader/Plasma/PlasmaDownloader.cpp | 2 +-
.../lib/src/Downloader/Rapid/RapidDownloader.cpp | 5 +-
.../lib/src/Downloader/Rapid/RapidDownloader.h | 8 +-
src/downloader/lib/src/Downloader/Rapid/Repo.cpp | 5 +-
src/downloader/lib/src/Downloader/Rapid/Sdp.cpp | 78 +-
src/downloader/lib/src/FileSystem/File.cpp | 13 +-
src/downloader/lib/src/FileSystem/FileSystem.cpp | 105 ++-
src/downloader/lib/src/FileSystem/FileSystem.h | 15 +-
src/downloader/lib/src/icon.rc | 16 +
src/downloader/lib/src/pr-downloader.cpp | 7 +-
src/downloader/lib/src/pr-downloader.exe.manifest | 11 +
src/downloader/lib/src/pr-downloader.ico | Bin 0 -> 137524 bytes
src/downloader/prdownloader.cpp | 137 +--
src/downloadinfo.cpp | 71 ++
src/downloadinfo.h | 39 +
src/exception.cpp | 22 +
src/exception.h | 20 +
src/flagimagedata.h | 8 +-
src/gui/basedataviewctrl.h | 295 +++++++
src/gui/basedataviewmodel.h | 214 +++++
src/gui/battlelist/battledataviewcttrl.cpp | 156 ++++
src/gui/battlelist/battledataviewcttrl.h | 63 ++
src/gui/battlelist/battledataviewmodel.cpp | 295 +++++++
src/gui/battlelist/battledataviewmodel.h | 38 +
src/gui/battlelist/battlelistctrl.cpp | 449 ----------
src/gui/battlelist/battlelistctrl.h | 69 --
src/gui/battlelist/battlelistfilter.cpp | 45 +-
src/gui/battlelist/battlelisttab.cpp | 118 ++-
src/gui/battlelist/battlelisttab.h | 14 +-
src/gui/chatpanel.cpp | 118 ++-
src/gui/chatpanel.h | 12 +-
src/gui/chatpanelmenu.cpp | 5 +-
src/gui/contentdownloaddialog.cpp | 6 +-
src/gui/customvirtlistctrl.cpp | 4 +-
src/gui/dataviewctrlheadermenu.cpp | 75 ++
src/gui/dataviewvtrlheadermenu.h | 42 +
src/gui/hosting/addbotdialog.cpp | 4 +-
src/gui/hosting/battleoptionstab.cpp | 4 +-
src/gui/hosting/battleroomdataviewctrl.cpp | 364 ++++++++
src/gui/hosting/battleroomdataviewctrl.h | 101 +++
src/gui/hosting/battleroomdataviewmodel.cpp | 421 +++++++++
src/gui/hosting/battleroomdataviewmodel.h | 45 +
src/gui/hosting/battleroomdownloads.cpp | 2 +-
src/gui/hosting/battleroomlistctrl.cpp | 946 ---------------------
src/gui/hosting/battleroomlistctrl.h | 122 ---
src/gui/hosting/battleroommmoptionstab.cpp | 6 +-
src/gui/hosting/battleroomtab.cpp | 118 +--
src/gui/hosting/battleroomtab.h | 8 +-
src/gui/hosting/hostbattledialog.cpp | 6 +-
src/gui/iconscollection.cpp | 266 ++++++
src/gui/iconscollection.h | 224 +++++
src/gui/infodialog.cpp | 2 +-
src/gui/mainchattab.cpp | 6 +-
src/gui/mainchattab.h | 2 +-
src/gui/maindownloadtab.cpp | 75 +-
src/gui/maindownloadtab.h | 9 +-
src/gui/mainwindow.cpp | 2 +-
src/gui/mainwindow.h | 2 +-
src/gui/mapctrl.cpp | 43 +-
src/gui/mapselectdialog.cpp | 32 +-
src/gui/nickdataviewctrl.cpp | 209 +++++
src/gui/nickdataviewctrl.h | 71 ++
src/gui/nickdataviewmodel.cpp | 214 +++++
src/gui/nickdataviewmodel.h | 31 +
src/gui/nicklistctrl.cpp | 393 ---------
src/gui/nicklistctrl.h | 75 --
src/gui/notifications/toasterbox/ToasterBox.cpp | 6 +-
.../notifications/toasterbox/ToasterBoxWindow.cpp | 10 +-
src/gui/options/downloadoptionspanel.cpp | 37 +-
src/gui/options/downloadoptionspanel.h | 12 +-
src/gui/options/lobbyoptionstab.cpp | 2 +-
src/gui/playback/playbackdatamodel.cpp | 129 +++
src/gui/playback/playbackdatamodel.h | 34 +
src/gui/playback/playbackdataview.cpp | 160 ++++
src/gui/playback/playbackdataview.h | 60 ++
src/gui/playback/playbackfilter.cpp | 15 +-
src/gui/playback/playbacklistctrl.cpp | 299 -------
src/gui/playback/playbacklistctrl.h | 56 --
src/gui/playback/playbacktab.cpp | 111 ++-
src/gui/playback/playbacktab.h | 13 +-
src/gui/singleplayertab.cpp | 43 +-
src/gui/singleplayertab.h | 1 +
src/gui/ui.cpp | 254 ++----
src/gui/ui.h | 6 +-
src/gui/uiutils.cpp | 10 +-
src/httpfile.cpp | 17 +-
src/httpfile.h | 6 +-
src/ibattle.cpp | 95 ++-
src/ibattle.h | 28 +-
src/iconimagelist.cpp | 8 +-
src/iconimagelist.h | 2 +-
src/iserver.cpp | 10 +-
src/iserver.h | 11 +-
src/log.cpp | 21 +-
src/log.h | 2 +-
src/lsl/src/lsl/battle/battle.cpp | 4 +-
src/lsl/src/lsl/battle/battle.h | 2 +-
src/lsl/src/lsl/battle/ibattle.cpp | 56 +-
src/lsl/src/lsl/battle/ibattle.h | 16 +-
src/lsl/src/lsl/battle/offline.cpp | 6 +-
src/lsl/src/lsl/battle/singleplayer.cpp | 6 +-
src/lsl/src/lsl/networking/iserver.cpp | 2 +-
src/lsl/src/lsl/networking/iserver.h | 4 +-
src/lsl/src/lsl/networking/tasserver.cpp | 4 +-
src/lsl/src/lsl/spring/spring.cpp | 4 +-
src/lsl/src/lslunitsync/c_api.cpp | 26 +-
src/lsl/src/lslunitsync/c_api.h | 12 +-
src/lsl/src/lslunitsync/data.h | 8 +-
src/lsl/src/lslunitsync/optionswrapper.cpp | 179 +---
src/lsl/src/lslunitsync/optionswrapper.h | 50 +-
src/lsl/src/lslunitsync/unitsync.cpp | 85 +-
src/lsl/src/lslunitsync/unitsync.h | 26 +-
src/lsl/src/lslutils/config.h | 4 +-
src/lsl/src/lslutils/conversion.cpp | 29 +-
src/lsl/src/lslutils/conversion.h | 2 +-
src/lsl/src/lslutils/type_forwards.h | 2 +-
src/offlinebattle.cpp | 2 +-
src/replaylist.cpp | 4 +-
src/savegamelist.cpp | 2 +-
src/serverevents.cpp | 10 +-
src/servermanager.cpp | 15 +-
src/servermanager.h | 9 +-
src/settings.cpp | 35 +-
src/settings.h | 11 +-
src/singleplayerbattle.cpp | 12 +-
src/spring.cpp | 6 +-
src/springlobbyapp.cpp | 4 +-
src/springsettings/frame.cpp | 11 +-
src/springsettings/tab_abstract.cpp | 3 +-
src/springsettings/tab_quality_video.cpp | 2 +-
src/springsettings/tab_simple.cpp | 6 +-
src/storedgame.h | 4 +-
src/tasserver.cpp | 8 +-
src/tasserver.h | 8 +-
src/tests/CMakeLists.txt | 7 +-
src/tests/slpaths.cpp | 2 +-
src/updatehelper.cpp | 23 +-
src/updatehelper.h | 1 +
src/updater/CMakeLists.txt | 6 +-
src/updater/springlobby_updater.exe.manifest | 2 +-
src/updater/updater.rc | 4 +-
src/updater/updaterapp.cpp | 8 +-
src/user.cpp | 26 +-
src/user.h | 20 +-
src/useractions.cpp | 7 +-
src/userlist.cpp | 10 +-
src/userlist.h | 5 +-
src/utils/globalevents.cpp | 3 +-
src/utils/globalevents.h | 2 +-
src/utils/platform.cpp | 2 +-
src/utils/platform.h | 1 -
src/utils/slconfig.cpp | 2 +-
src/utils/slpaths.cpp | 80 +-
src/utils/slpaths.h | 5 +
182 files changed, 5844 insertions(+), 4158 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/springlobby.git
More information about the Pkg-games-commits
mailing list