[springlobby] branch master updated (b42af46 -> 6624f86)
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Jun 24 22:34:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a change to branch master
in repository springlobby.
from b42af46 Update changelog for 0.224-2
new fb955c8 Start new changelog entry.
new 0b8b445 Imported Upstream version 0.225
new e4014a6 Merge tag 'upstream/0.225'
new a2aacbd Drop revert-test-for-hash-conversion.patch. Fixed upstream.
new 6624f86 Update changelog for 0.225-1. Do not upload.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog | 5 +
VERSION | 2 +-
debian/changelog | 6 +
.../patches/revert-test-for-hash-conversion.patch | 50 ------
debian/patches/series | 1 -
po/ru.po | 16 ++
springlobby_config.h | 2 +-
src/CMakeLists.txt | 3 +
src/battle.cpp | 28 +--
src/battle.h | 4 +-
src/battlelist.cpp | 4 +-
src/battlelist.h | 4 +-
src/channellist.cpp | 4 +-
src/channellist.h | 4 +-
src/downloader/prdownloader.cpp | 12 +-
src/downloader/prdownloader.h | 4 +-
src/gui/battlelist/battlelistctrl.cpp | 7 +-
src/gui/battlelist/battlelisttab.cpp | 57 +++++--
src/gui/battlelist/battlelisttab.h | 3 +-
src/gui/channel/channellistctrl.cpp | 4 +-
src/gui/chatpanel.cpp | 135 +++++++++++++--
src/gui/chatpanel.h | 45 +++--
src/gui/chatpanelmenu.cpp | 4 +-
src/gui/chatpanelmenu.h | 1 +
src/gui/connectwindow.cpp | 5 +-
src/gui/contentdownloaddialog.cpp | 5 +-
src/gui/customvirtlistctrl.cpp | 31 ++--
src/gui/hosting/addbotdialog.cpp | 2 +-
src/gui/hosting/battlemaptab.cpp | 10 +-
src/gui/hosting/battlemaptab.h | 3 +-
src/gui/hosting/battleroommmoptionstab.cpp | 4 +-
src/gui/hosting/battleroomtab.cpp | 8 +-
src/gui/hosting/battleroomtab.h | 3 +-
src/gui/mainwindow.cpp | 32 +++-
src/gui/mainwindow.h | 3 +
src/gui/mapctrl.cpp | 19 ++-
src/gui/mapselectdialog.cpp | 10 +-
src/gui/mapselectdialog.h | 3 +-
src/gui/nicklistctrl.cpp | 190 ++++++++++++---------
src/gui/nicklistctrl.h | 46 ++---
src/gui/notifications/notificationmanager.cpp | 5 +-
src/gui/notifications/notificationmanager.h | 3 +-
src/gui/notifications/toasterbox/ToasterBox.cpp | 27 ++-
src/gui/notifications/toasterbox/ToasterBox.h | 8 +-
.../notifications/toasterbox/ToasterBoxWindow.cpp | 34 +++-
.../notifications/toasterbox/ToasterBoxWindow.h | 5 +-
src/gui/notifications/toasternotification.cpp | 5 +-
src/gui/options/downloadoptionspanel.cpp | 10 +-
src/gui/options/downloadoptionspanel.h | 6 +-
src/gui/options/lobbyoptionstab.cpp | 26 ++-
src/gui/options/lobbyoptionstab.h | 1 +
src/gui/options/mainoptionstab.cpp | 11 +-
src/gui/options/mainoptionstab.h | 4 +-
src/gui/playback/playbacklistctrl.cpp | 6 +-
src/gui/playback/playbacktab.cpp | 11 +-
src/gui/playback/playbacktab.h | 3 +-
src/gui/selectusersdialog.cpp | 4 +-
src/gui/singleplayertab.cpp | 38 ++---
src/gui/singleplayertab.h | 5 +-
src/gui/ui.cpp | 177 ++++---------------
src/gui/ui.h | 19 +--
src/ibattle.cpp | 50 ++++--
src/ibattle.h | 10 +-
src/lsl/src/lsl/battle/battle.cpp | 2 +-
src/lsl/src/lsl/battle/ibattle.cpp | 40 ++---
src/lsl/src/lsl/battle/tdfcontainer.cpp | 21 ++-
src/lsl/src/lsl/battle/tdfcontainer.h | 26 +--
src/lsl/src/lsl/networking/commands.h | 2 +-
src/lsl/src/lsl/networking/iserver.cpp | 20 +--
src/lsl/src/lsl/networking/socket.cpp | 2 +-
src/lsl/src/lsl/networking/tasserver.cpp | 34 ++--
src/lsl/src/lsl/spring/spring.cpp | 139 ++++++++-------
src/lsl/src/lsl/user/common.cpp | 2 +-
src/lsl/src/lslunitsync/optionswrapper.cpp | 24 ++-
src/lsl/src/lslunitsync/unitsync.cpp | 54 +++---
src/lsl/src/lslutils/conversion.cpp | 66 ++++++-
src/lsl/src/lslutils/conversion.h | 46 ++---
src/lsl/src/lslutils/misc.cpp | 25 +--
src/lsl/src/lslutils/misc.h | 3 +-
src/serverevents.cpp | 41 +++--
src/servermanager.cpp | 158 +++++++++++++++++
src/servermanager.h | 37 ++++
src/settings.cpp | 8 -
src/settings.h | 1 -
src/singleplayerbattle.cpp | 22 +--
src/singleplayerbattle.h | 2 -
src/socket.cpp | 4 +-
src/socket.h | 4 +-
src/spring.cpp | 141 ++++++++-------
src/spring.h | 6 +-
src/springlobbyapp.cpp | 11 +-
src/springprocess.cpp | 4 +-
src/springprocess.h | 4 +-
src/tasserver.cpp | 32 ++--
src/tasserver.h | 6 +-
src/tests/CMakeLists.txt | 7 +-
src/tests/lslconversion.cpp | 87 ++++++++--
src/user.cpp | 4 +-
src/user.h | 4 +-
src/userlist.cpp | 4 +-
src/userlist.h | 8 +-
src/utils/globalevents.cpp | 130 ++++++++------
src/utils/globalevents.h | 47 +++--
src/utils/uievents.h | 3 +-
104 files changed, 1502 insertions(+), 1026 deletions(-)
delete mode 100644 debian/patches/revert-test-for-hash-conversion.patch
delete mode 100644 debian/patches/series
create mode 100644 src/servermanager.cpp
create mode 100644 src/servermanager.h
--
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