[springlobby] 02/06: Merge tag 'upstream/0.217'
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Apr 16 14:54:42 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 ad3353997b0b0e88872d3fff9f0f9e3a0ae83c20
Merge: 05df0db 6509039
Author: Markus Koschany <apo at gambaru.de>
Date: Thu Apr 16 12:11:16 2015 +0200
Merge tag 'upstream/0.217'
Upstream version 0.217
# gpg: Signature made Thu 16 Apr 2015 12:11:12 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]
.clang-format | 17 +-
.travis.yml | 7 +-
CMakeLists.txt | 37 +-
ChangeLog | 37 +
README.md | 1 +
VERSION | 2 +-
buildbot/create-build-dirs.sh | 12 +-
buildbot/master.cfg | 22 +-
cmake/Toolchain-mingw32.cmake | 59 -
cmake/Toolchain-mingw32_debug.cmake | 41 -
cmake/Toolchain-mingw32_new.cmake | 62 -
cmake/Toolchain-mingw32_static.cmake | 8 -
git-hooks/pre-commit | 13 +-
po/ru.po | 61 +-
springlobby_config.h | 2 +-
src/CMakeLists.txt | 72 +-
src/aui/auimanager.cpp | 6 +-
src/aui/auimanager.h | 10 +-
src/autohost.cpp | 363 +-
src/autohost.h | 27 +-
src/autohostmanager.cpp | 93 +-
src/autohostmanager.h | 130 +-
src/battle.cpp | 1604 +-
src/battle.h | 84 +-
src/battlelist.cpp | 51 +-
src/battlelist.h | 50 +-
src/battlelistfiltervalues.h | 83 +-
src/channel.cpp | 299 +-
src/channel.h | 107 +-
src/channellist.cpp | 50 +-
src/channellist.h | 29 +-
src/chatlog.cpp | 91 +-
src/chatlog.h | 3 +-
src/contentsearchresult.cpp | 10 +-
src/contentsearchresult.h | 14 +-
src/countrycodes.cpp | 8 +-
src/countrycodes.h | 2 +-
src/crashreport.cpp | 146 +-
src/crashreport.h | 49 +-
src/defines.h | 16 -
src/downloader/downloadlistctrl.cpp | 205 +-
src/downloader/downloadlistctrl.h | 42 +-
src/downloader/downloadsobserver.cpp | 100 +-
src/downloader/downloadsobserver.h | 89 +-
src/downloader/lib/src/CMakeLists.txt | 4 +-
src/downloader/lib/src/Downloader/IDownloader.cpp | 10 +-
src/downloader/lib/src/Downloader/IDownloader.h | 4 +-
src/downloader/lib/src/lib/CMakeLists.txt | 2 +-
src/downloader/lib/src/lib/soap/Makefile.generate | 2 +-
src/downloader/lib/src/pr-downloader.cpp | 7 +-
src/downloader/lib/src/pr-downloader.h | 2 +-
src/downloader/prdownloader.cpp | 97 +-
src/downloader/prdownloader.h | 10 +-
src/flagimagedata.h | 983 +-
src/flagimages.cpp | 23 +-
src/flagimages.h | 6 +-
src/gui/aboutbox.cpp | 18 +-
src/gui/aboutbox.h | 4 +-
src/gui/activitynotice.cpp | 90 +-
src/gui/activitynotice.h | 54 +-
src/gui/agreementdialog.cpp | 50 +-
src/gui/agreementdialog.h | 29 +-
src/gui/battlelist/battlelistctrl.cpp | 632 +-
src/gui/battlelist/battlelistctrl.h | 62 +-
src/gui/battlelist/battlelistfilter.cpp | 892 +-
src/gui/battlelist/battlelistfilter.h | 254 +-
src/gui/battlelist/battlelisttab.cpp | 397 +-
src/gui/battlelist/battlelisttab.h | 124 +-
src/gui/channel/autojoinchanneldialog.cpp | 72 +-
src/gui/channel/autojoinchanneldialog.h | 20 +-
src/gui/channel/channelchooser.cpp | 58 +-
src/gui/channel/channelchooser.h | 43 +-
src/gui/channel/channelchooserdialog.cpp | 29 +-
src/gui/channel/channelchooserdialog.h | 18 +-
src/gui/channel/channellistctrl.cpp | 186 +-
src/gui/channel/channellistctrl.h | 85 +-
src/gui/chatpanel.cpp | 1004 +-
src/gui/chatpanel.h | 130 +-
src/gui/chatpanelmenu.cpp | 1000 +-
src/gui/chatpanelmenu.h | 264 +-
src/gui/colorbutton.cpp | 89 +-
src/gui/colorbutton.h | 23 +-
src/gui/connectwindow.cpp | 248 +-
src/gui/connectwindow.h | 53 +-
src/gui/contentdownloaddialog.cpp | 196 +-
src/gui/contentdownloaddialog.h | 18 +-
src/gui/contentsearchresultslistctrl.cpp | 108 +-
src/gui/contentsearchresultslistctrl.h | 13 +-
src/gui/controls.cpp | 13 +-
src/gui/controls.h | 15 +-
src/gui/customdialogs.cpp | 505 +-
src/gui/customdialogs.h | 103 +-
src/gui/customlistctrl.cpp | 392 +-
src/gui/customlistctrl.h | 217 +-
src/gui/customvirtlistctrl.cpp | 492 +-
src/gui/customvirtlistctrl.h | 161 +-
src/gui/globalauimanager.h | 1 -
src/gui/hosting/addbotdialog.cpp | 326 +-
src/gui/hosting/addbotdialog.h | 87 +-
src/gui/hosting/autobalancedialog.cpp | 76 +-
src/gui/hosting/autobalancedialog.h | 81 +-
src/gui/hosting/battlemaptab.cpp | 276 +-
src/gui/hosting/battlemaptab.h | 57 +-
src/gui/hosting/battleoptionstab.cpp | 268 +-
src/gui/hosting/battleoptionstab.h | 105 +-
src/gui/hosting/battleroomdownloads.cpp | 164 +-
src/gui/hosting/battleroomdownloads.h | 23 +-
src/gui/hosting/battleroomlistctrl.cpp | 1101 +-
src/gui/hosting/battleroomlistctrl.h | 130 +-
src/gui/hosting/battleroommmoptionstab.cpp | 760 +-
src/gui/hosting/battleroommmoptionstab.h | 167 +-
src/gui/hosting/battleroomtab.cpp | 1210 +-
src/gui/hosting/battleroomtab.h | 376 +-
src/gui/hosting/hostbattledialog.cpp | 568 +-
src/gui/hosting/hostbattledialog.h | 26 +-
src/gui/hosting/hostbattledialog_public.h | 7 +-
src/gui/hosting/mainjoinbattletab.cpp | 139 +-
src/gui/hosting/mainjoinbattletab.h | 62 +-
src/gui/hosting/mainsingleplayertab.cpp | 106 +-
src/gui/hosting/mainsingleplayertab.h | 40 +-
src/gui/hosting/mmoptionwindows.cpp | 199 +-
src/gui/hosting/mmoptionwindows.h | 34 +-
src/gui/infodialog.cpp | 72 +-
src/gui/libnotify.h | 49 -
src/gui/mainchattab.cpp | 291 +-
src/gui/mainchattab.h | 37 +-
src/gui/maindownloadtab.cpp | 99 +-
src/gui/maindownloadtab.h | 78 +-
src/gui/mainwindow.cpp | 542 +-
src/gui/mainwindow.h | 225 +-
src/gui/mapctrl.cpp | 2607 +-
src/gui/mapctrl.h | 224 +-
src/gui/mapgridctrl.cpp | 384 +-
src/gui/mapgridctrl.h | 315 +-
src/gui/mapselectdialog.cpp | 340 +-
src/gui/mapselectdialog.h | 153 +-
src/gui/nicklistctrl.cpp | 253 +-
src/gui/nicklistctrl.h | 71 +-
src/gui/notificationmanager.cpp | 106 -
src/gui/notificationmanager.h | 47 -
src/gui/{ => notifications}/inotification.h | 14 +-
src/gui/notifications/libnotify.cpp | 44 +
src/gui/notifications/libnotify.h | 11 +
src/gui/notifications/notificationmanager.cpp | 100 +
src/gui/notifications/notificationmanager.h | 46 +
src/gui/notifications/toasterbox/ToasterBox.cpp | 231 +
src/gui/notifications/toasterbox/ToasterBox.h | 87 +
.../notifications/toasterbox/ToasterBoxWindow.cpp | 263 +
.../notifications/toasterbox/ToasterBoxWindow.h | 81 +
.../toasterbox/ToasterBoxWindowList.cpp | 0
.../toasterbox/ToasterBoxWindowList.h | 2 +-
src/gui/notifications/toasternotification.cpp | 64 +
src/gui/notifications/toasternotification.h | 22 +
src/gui/options/chatoptionstab.cpp | 580 +-
src/gui/options/chatoptionstab.h | 163 +-
src/gui/options/downloadoptionspanel.cpp | 43 +-
src/gui/options/downloadoptionspanel.h | 49 +-
src/gui/options/groupoptionspanel.cpp | 354 +-
src/gui/options/groupoptionspanel.h | 111 +-
src/gui/options/lobbyoptionstab.cpp | 405 +-
src/gui/options/lobbyoptionstab.h | 121 +-
src/gui/options/mainoptionstab.cpp | 137 +-
src/gui/options/mainoptionstab.h | 68 +-
src/gui/options/springoptionstab.cpp | 267 +-
src/gui/options/springoptionstab.h | 32 +-
src/gui/pastedialog.cpp | 65 +-
src/gui/pastedialog.h | 5 +-
src/gui/playback/playbackfilter.cpp | 498 +-
src/gui/playback/playbackfilter.h | 138 +-
src/gui/playback/playbacklistctrl.cpp | 363 +-
src/gui/playback/playbacklistctrl.h | 56 +-
src/gui/playback/playbacktab.cpp | 329 +-
src/gui/playback/playbacktab.h | 150 +-
src/gui/selectusersdialog.cpp | 403 +-
src/gui/selectusersdialog.h | 107 +-
src/gui/singleplayertab.cpp | 449 +-
src/gui/singleplayertab.h | 112 +-
src/gui/slbook.cpp | 641 +-
src/gui/slbook.h | 53 +-
src/gui/sltipwin.cpp | 11 +-
src/gui/sltipwin.h | 11 +-
src/gui/snarl/SnarlInterface.cpp | 837 -
src/gui/snarl/SnarlInterface.h | 229 -
src/gui/snarl/_License.txt | 7 -
src/gui/snarl/_Readme.txt | 38 -
src/gui/snarlnotification.cpp | 20 -
src/gui/snarlnotification.h | 27 -
src/gui/spinctl/generic/spinctlg.cpp | 512 -
src/gui/spinctl/generic/spinctlg.h | 252 -
src/gui/spinctl/generic/spinctrldouble.cpp | 25 -
src/gui/spinctl/generic/spinctrldouble.h | 43 -
src/gui/spinctl/spinctrl.h | 123 -
src/gui/statusbar.cpp | 34 +-
src/gui/statusbar.h | 10 +-
src/gui/taskbar.cpp | 122 +-
src/gui/taskbar.h | 2 +-
src/gui/textentrydialog.h | 26 +-
src/gui/toasterbox/ToasterBox.cpp | 241 -
src/gui/toasterbox/ToasterBox.h | 66 -
src/gui/toasterbox/ToasterBoxWindow.cpp | 287 -
src/gui/toasterbox/ToasterBoxWindow.h | 69 -
src/gui/toasternotification.cpp | 66 -
src/gui/toasternotification.h | 21 -
src/gui/ui.cpp | 804 +-
src/gui/ui.h | 96 +-
src/gui/uiutils.cpp | 545 +-
src/gui/uiutils.h | 39 +-
src/gui/usermenu.h | 168 +-
src/gui/windowattributespickle.cpp | 132 +-
src/gui/windowattributespickle.h | 35 +-
src/gui/wxbackgroundimage.cpp | 74 -
src/gui/wxbackgroundimage.h | 30 -
src/gui/wxtextctrlhist.cpp | 135 +-
src/gui/wxtextctrlhist.h | 31 +-
src/httpfile.cpp | 96 +
src/{versionchecker.h => httpfile.h} | 5 +-
src/ibattle.cpp | 881 +-
src/ibattle.h | 472 +-
src/iconimagelist.cpp | 479 +-
src/iconimagelist.h | 179 +-
src/images/admin.png.h | 170 +-
src/images/admin_away.png.h | 255 +-
src/images/admin_broom.png.h | 258 +-
src/images/admin_ingame.png.h | 270 +-
src/images/arrow_refresh.png.h | 174 +-
src/images/away.png.h | 216 +-
src/images/bot_broom.png.h | 250 +-
src/images/bot_ingame.png.h | 266 +-
src/images/broom.png.h | 170 +-
src/images/broom_tab_icon.png.h | 478 +-
src/images/chat_icon.png.h | 1070 +-
src/images/chat_icon_text.png.h | 1070 +-
src/images/closed_full_game.png.h | 218 +-
src/images/closed_full_pw_game.png.h | 226 +-
src/images/closed_game.png.h | 194 +-
src/images/closed_pw_game.png.h | 210 +-
src/images/download_man_icon.png.h | 1470 +-
src/images/downloads_icon.png.h | 588 +-
src/images/downloads_icon_text.png.h | 352 +-
src/images/floppy.png.h | 226 +-
src/images/floppy_icon.png.h | 226 +-
src/images/ingame.png.h | 218 +-
src/images/join_icon.png.h | 634 +-
src/images/join_icon_text.png.h | 382 +-
src/images/map_select_1.png.h | 172 +-
src/images/map_select_2.png.h | 222 +-
src/images/no1_icon.png.h | 108 +-
src/images/no2_icon.png.h | 110 +-
src/images/notif_bg.png.h | 5856 +--
src/images/open_full_game.png.h | 214 +-
src/images/open_full_pw_game.png.h | 224 +-
src/images/open_game.png.h | 184 +-
src/images/open_pw_game.png.h | 203 +-
src/images/options_icon.png.h | 528 +-
src/images/options_icon_text.png.h | 316 +-
src/images/replay_icon.png.h | 1070 +-
src/images/replay_icon_text.png.h | 380 +-
src/images/s44.png.h | 36190 -------------------
src/images/single_player_icon.png.h | 446 +-
src/images/single_player_icon_text.png.h | 448 +-
src/images/spectator.png.h | 186 +-
src/images/springlobby_64.png.h | 1272 +-
src/images/torrentoptionspanel_icon.png.h | 190 +-
src/images/warning_small.png.h | 214 +-
src/inetclass.h | 32 +-
src/iplaybacklist.cpp | 41 +-
src/iplaybacklist.h | 42 +-
src/iserver.cpp | 192 +-
src/iserver.h | 408 +-
src/iserverevents.h | 145 -
src/json/jsonreader.cpp | 2489 +-
src/json/jsonval.cpp | 3089 +-
src/json/jsonwriter.cpp | 1499 +-
src/json/wx/json_defs.h | 113 +-
src/json/wx/jsonreader.h | 204 +-
src/json/wx/jsonval.h | 577 +-
src/json/wx/jsonwriter.h | 122 +-
src/log.cpp | 147 +-
src/log.h | 33 +-
src/lsl/cmake/compat_flags.cmake | 67 +-
src/lsl/lib/boost/extension/common.hpp | 30 -
src/lsl/lib/boost/extension/impl/library_impl.hpp | 73 -
.../lib/boost/extension/impl/shared_library.hpp | 23 -
src/lsl/lib/boost/extension/shared_library.hpp | 151 -
src/lsl/src/lslunitsync/c_api.h | 6 -
src/lsl/src/lslunitsync/loader.cpp | 1 -
src/lsl/src/lslunitsync/mru_cache.h | 5 +
src/lsl/src/lslunitsync/optionswrapper.cpp | 11 +-
src/lsl/src/lslunitsync/unitsync.cpp | 5 +-
src/lsl/src/lslunitsync/unitsync.h | 2 +-
src/lsl/src/lslutils/conversion.h | 2 +-
src/lsl/src/lslutils/logging.h | 7 +-
src/lsl/src/lslutils/misc.cpp | 12 +
src/lsl/src/lslutils/misc.h | 19 +
src/lsl/src/lslutils/type_forwards.h | 2 +
src/lsl/test/usync.cpp | 7 +-
src/offlinebattle.cpp | 67 +-
src/offlinebattle.h | 24 +-
src/playbackfiltervalues.h | 35 +-
src/playbackthread.cpp | 48 +-
src/playbackthread.h | 38 +-
src/replaylist.cpp | 106 +-
src/replaylist.h | 11 +-
src/savegamelist.cpp | 71 +-
src/savegamelist.h | 11 +-
src/serverevents.cpp | 1157 +-
src/serverevents.h | 173 +-
src/serverselector.cpp | 15 +-
src/serverselector.h | 4 +-
src/settings.cpp | 989 +-
src/settings.h | 626 +-
src/singleplayerbattle.cpp | 97 +-
src/singleplayerbattle.h | 21 +-
src/socket.cpp | 294 +-
src/socket.h | 107 +-
src/sound/CMakeLists.txt | 4 +
src/sound/alsound.cpp | 53 +-
src/sound/alsound.h | 3 +-
src/sound/nosound.cpp | 1 -
src/sound/pm_sound.h | 4 +-
src/sound/ring_sound.h | 16387 +++++----
src/sound/winsound.cpp | 31 +
src/spring.cpp | 350 +-
src/spring.h | 10 +-
src/springlobby.rc | 3 +-
src/springlobbyapp.cpp | 222 +-
src/springlobbyapp.h | 36 +-
src/springprocess.cpp | 15 +-
src/springprocess.h | 16 +-
src/springsettings/CMakeLists.txt | 59 -
src/springsettings/ctrlconstants.h | 405 +-
src/springsettings/frame.cpp | 305 +-
src/springsettings/frame.h | 109 +-
src/springsettings/hotkeys/AddSelectionCmdDlg.cpp | 533 -
src/springsettings/hotkeys/AddSelectionCmdDlg.h | 67 -
src/springsettings/hotkeys/ChangeMetaDlg.cpp | 36 -
src/springsettings/hotkeys/ChangeMetaDlg.h | 27 -
src/springsettings/hotkeys/CommandOrderDlg.cpp | 140 -
src/springsettings/hotkeys/CommandOrderDlg.h | 48 -
src/springsettings/hotkeys/HotkeyException.h | 25 -
src/springsettings/hotkeys/HotkeyForms.cpp | 596 -
src/springsettings/hotkeys/HotkeyForms.h | 219 -
src/springsettings/hotkeys/HotkeyTypes.cpp | 424 -
src/springsettings/hotkeys/HotkeyTypes.h | 99 -
src/springsettings/hotkeys/KeynameConverter.cpp | 244 -
src/springsettings/hotkeys/KeynameConverter.h | 54 -
.../hotkeys/SpringDefaultProfile.cpp | 187 -
src/springsettings/hotkeys/SpringDefaultProfile.h | 28 -
src/springsettings/hotkeys/commandlist.cpp | 185 -
src/springsettings/hotkeys/commandlist.h | 121 -
src/springsettings/hotkeys/hotkey_panel.cpp | 685 -
src/springsettings/hotkeys/hotkey_panel.h | 84 -
src/springsettings/hotkeys/hotkey_parser.cpp | 267 -
src/springsettings/hotkeys/hotkey_parser.h | 39 -
src/springsettings/hotkeys/hotkeypanel.fbp | 4903 ---
src/springsettings/hotkeys/todo.txt | 10 -
src/springsettings/hotkeys/wxSpringCommand.cpp | 30 -
src/springsettings/hotkeys/wxSpringCommand.h | 23 -
src/springsettings/main.cpp | 185 -
src/springsettings/main.h | 36 -
src/springsettings/panel_pathoption.cpp | 120 -
src/springsettings/panel_pathoption.h | 44 -
src/springsettings/presets.h | 158 +-
src/springsettings/se_utils.cpp | 35 -
src/springsettings/se_utils.h | 27 -
src/springsettings/tab_abstract.cpp | 599 +-
src/springsettings/tab_abstract.h | 91 +-
src/springsettings/tab_audio.cpp | 61 +-
src/springsettings/tab_audio.h | 27 +-
src/springsettings/tab_quality_video.cpp | 324 +-
src/springsettings/tab_quality_video.h | 90 +-
src/springsettings/tab_render_detail.cpp | 60 +-
src/springsettings/tab_render_detail.h | 31 +-
src/springsettings/tab_simple.cpp | 114 +-
src/springsettings/tab_simple.h | 73 +-
src/springsettings/tab_ui.cpp | 140 +-
src/springsettings/tab_ui.h | 67 +-
src/springsettings/wxkeybinder/keybinder.cpp | 2601 --
src/springsettings/wxkeybinder/keybinder.h | 1670 -
src/springsettings/wxkeybinder/menuutils.h | 85 -
.../wxkeybinder/wxKeyMonitorTextCtrl.cpp | 51 -
.../wxkeybinder/wxKeyMonitorTextCtrl.h | 52 -
src/stacktrace.cpp | 73 +-
src/stacktrace.h | 20 +-
src/storedgame.h | 78 +-
src/tasserver.cpp | 2138 +-
src/tasserver.h | 206 +-
src/tests/CMakeLists.txt | 19 +-
src/tests/chatlog.cpp | 20 +-
src/tests/config.cpp | 22 +-
src/tests/lobbyid.cpp | 25 +-
src/tests/lslconversion.cpp | 35 +-
src/tests/slpaths.cpp | 31 +
src/updatehelper.cpp | 2 +-
src/updatehelper.h | 2 +-
src/updater/updaterapp.cpp | 30 +-
src/updater/updaterapp.h | 4 +-
src/user.cpp | 291 +-
src/user.h | 399 +-
src/useractions.cpp | 313 +-
src/useractions.h | 123 +-
src/userlist.cpp | 62 +-
src/userlist.h | 47 +-
src/utils/TextCompletionDatabase.cpp | 56 +-
src/utils/TextCompletionDatabase.h | 12 +-
src/utils/base64.cpp | 27 +-
src/utils/base64.h | 2 +-
src/utils/battleevents.cpp | 13 +-
src/utils/battleevents.h | 20 +-
src/utils/conversion.cpp | 42 +-
src/utils/conversion.h | 113 +-
src/utils/crc.cpp | 9 +-
src/utils/crc.h | 5 +-
src/utils/curlhelper.cpp | 116 +-
src/utils/curlhelper.h | 29 +-
src/utils/events.h | 399 +-
src/utils/globalevents.cpp | 38 +-
src/utils/globalevents.h | 5 +-
src/utils/lslconversion.cpp | 4 +-
src/utils/lslconversion.h | 7 +-
src/utils/md5.h | 24 +-
src/utils/misc.cpp | 77 +-
src/utils/misc.h | 5 +-
src/utils/mixins.h | 5 +-
src/utils/platform.cpp | 116 +-
src/utils/platform.h | 12 +-
src/utils/slconfig.cpp | 137 +-
src/utils/slconfig.h | 141 +-
src/utils/slpaths.cpp | 180 +-
src/utils/slpaths.h | 23 +-
src/utils/sortutil.h | 42 +-
src/utils/tasutil.cpp | 53 +-
src/utils/tasutil.h | 12 +-
src/utils/uievents.cpp | 98 +-
src/utils/uievents.h | 119 +-
src/utils/version.cpp | 14 +-
src/utils/wxTranslationHelper.cpp | 64 +-
src/utils/wxTranslationHelper.h | 9 +-
src/versionchecker.cpp | 89 -
439 files changed, 49238 insertions(+), 101972 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