[vcmi] branch master updated (ab0f1e5 -> de8361b)

Johannes Schauer josch at moszumanska.debian.org
Tue Nov 8 13:11:24 UTC 2016


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

josch pushed a change to branch master
in repository vcmi.

      from  ab0f1e5   Upload to unstable, fix boost1.60 build failure, acknowledge NMU
       new  c2bef12   New upstream version 0.99+dfsg
       new  5684797   refresh patches
       new  96ea12d   debian/changelog: add entry for 0.99+dfsg-1
       new  5d85c48   remove patches that were included upstream
       new  76d4de4   Add Build-Depends on libboost-test-dev
       new  09b0954   add patch minizip_maxu32
       new  936b32b   Make Vcs fields use a secure uri
       new  448ad35   Bump Standards-Version to 3.9.8 (no changes required)
       new  72f920a   add patch fix-spelling
       new  de8361b   release 0.99+dfsg-1

The 10 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:
 .gitignore                                         |    8 +
 .travis.linux                                      |   26 +
 .travis.osx                                        |   17 +
 .travis.yml                                        |   62 +-
 AI/BattleAI/BattleAI.cbp                           |   33 +-
 AI/BattleAI/BattleAI.cpp                           |  183 +-
 AI/BattleAI/BattleAI.h                             |   20 +-
 AI/BattleAI/CMakeLists.txt                         |    6 +-
 AI/BattleAI/StdInc.cpp                             |    2 +-
 AI/BattleAI/main.cpp                               |    4 +-
 AI/CMakeLists.txt                                  |   12 +-
 AI/EmptyAI/CEmptyAI.cpp                            |    5 +-
 AI/EmptyAI/CEmptyAI.h                              |    6 +-
 AI/EmptyAI/CMakeLists.txt                          |    6 +-
 AI/EmptyAI/EmptyAI.cbp                             |   38 +-
 AI/EmptyAI/StdInc.cpp                              |    2 +-
 AI/EmptyAI/exp_funcs.cpp                           |    6 +-
 AI/StupidAI/CMakeLists.txt                         |    6 +-
 AI/StupidAI/StdInc.cpp                             |    2 +-
 AI/StupidAI/StupidAI.cbp                           |   34 +-
 AI/StupidAI/StupidAI.cpp                           |   22 +-
 AI/StupidAI/StupidAI.h                             |    8 +-
 AI/StupidAI/main.cpp                               |    4 +-
 AI/VCAI/AIUtility.cpp                              |   33 +-
 AI/VCAI/AIUtility.h                                |   18 +-
 AI/VCAI/CMakeLists.txt                             |   17 +-
 AI/VCAI/Fuzzy.cpp                                  |   35 +-
 AI/VCAI/Fuzzy.h                                    |    5 +-
 AI/VCAI/Goals.cpp                                  |  122 +-
 AI/VCAI/Goals.h                                    |   17 +-
 AI/VCAI/VCAI.cbp                                   |   43 +-
 AI/VCAI/VCAI.cpp                                   |  831 ++++--
 AI/VCAI/VCAI.h                                     |   53 +-
 AI/VCAI/main.cpp                                   |    4 +-
 AUTHORS                                            |    7 +-
 CCallback.cpp                                      |   35 +-
 CCallback.h                                        |   51 +-
 CMakeLists.txt                                     |   63 +-
 ChangeLog                                          |   37 +
 Global.h                                           |   56 +-
 Mods/vcmi/Sprites/ScSelC.json                      |    7 +
 Mods/vcmi/Sprites/mapFormatIcons/vcmi1.png         |  Bin 0 -> 2053 bytes
 README.linux                                       |   21 +-
 README.md                                          |    3 +-
 VCMI_global.props                                  |    2 +-
 Version.cpp.in                                     |    6 +
 Version.h                                          |    4 +
 client/CBitmapHandler.cpp                          |   24 +-
 client/CBitmapHandler.h                            |    5 +-
 client/CDefHandler.cpp                             |   34 +-
 client/CDefHandler.h                               |    8 +-
 client/CMT.cpp                                     |  596 ++--
 client/CMT.h                                       |    5 +-
 client/CMakeLists.txt                              |   10 +-
 client/CMessage.cpp                                |    3 +-
 client/CMusicHandler.cpp                           |   64 +-
 client/CMusicHandler.h                             |   25 +-
 client/CPlayerInterface.cpp                        |  724 ++---
 client/CPlayerInterface.h                          |   50 +-
 client/CPreGame.cpp                                |  258 +-
 client/CPreGame.h                                  |   93 +-
 client/CVideoHandler.cpp                           |   87 +-
 client/CVideoHandler.h                             |   48 +-
 client/Client.cpp                                  |  368 +--
 client/Client.h                                    |   65 +-
 client/Graphics.cpp                                |   88 +-
 client/Graphics.h                                  |   33 +-
 client/NetPacksClient.cpp                          |  241 +-
 client/SDLRWwrapper.cpp                            |   95 +
 lib/AI_Base.h => client/SDLRWwrapper.h             |   31 +-
 client/VCMI_client.cbp                             |   76 +-
 client/VCMI_client.vcxproj                         |    2 +
 client/battle/CBattleAnimations.cpp                |   16 +-
 client/battle/CBattleAnimations.h                  |   50 +-
 client/battle/CBattleInterface.cpp                 | 1451 +++++-----
 client/battle/CBattleInterface.h                   |  212 +-
 client/battle/CBattleInterfaceClasses.cpp          |   84 +-
 client/battle/CBattleInterfaceClasses.h            |   31 +-
 client/battle/CCreatureAnimation.cpp               |   31 +-
 client/battle/CCreatureAnimation.h                 |    2 +-
 client/gui/CAnimation.cpp                          |  224 +-
 client/gui/CAnimation.h                            |   30 +-
 client/gui/CCursorHandler.cpp                      |    2 -
 client/gui/CGuiHandler.cpp                         |  142 +-
 client/gui/CGuiHandler.h                           |   23 +-
 client/gui/CIntObject.h                            |   28 +-
 client/gui/Geometries.h                            |    7 -
 client/gui/SDL_Compat.h                            |   11 -
 client/gui/SDL_Extensions.cpp                      |   76 +-
 client/gui/SDL_Extensions.h                        |   52 +-
 client/gui/SDL_Pixels.h                            |    8 -
 client/mapHandler.cpp                              |  199 +-
 client/mapHandler.h                                |   36 +-
 client/widgets/AdventureMapClasses.cpp             |   56 +-
 client/widgets/AdventureMapClasses.h               |   69 +-
 client/widgets/Buttons.cpp                         |  106 +-
 client/widgets/Buttons.h                           |   59 +-
 client/widgets/CArtifactHolder.cpp                 |  153 +-
 client/widgets/CArtifactHolder.h                   |   23 +-
 client/widgets/CComponent.cpp                      |   35 +-
 client/widgets/CComponent.h                        |    6 +-
 client/widgets/CGarrisonInt.cpp                    |  317 ++-
 client/widgets/CGarrisonInt.h                      |   88 +-
 client/widgets/Images.cpp                          |   22 +-
 client/widgets/Images.h                            |   27 +-
 client/widgets/MiscWidgets.cpp                     |   44 +-
 client/widgets/MiscWidgets.h                       |   28 +-
 client/widgets/ObjectLists.h                       |    1 -
 client/widgets/TextControls.cpp                    |   53 +-
 client/widgets/TextControls.h                      |   12 +-
 client/windows/CAdvmapInterface.cpp                |  450 ++-
 client/windows/CAdvmapInterface.h                  |   59 +-
 client/windows/CCastleInterface.cpp                |   56 +-
 client/windows/CCastleInterface.h                  |   82 +-
 client/windows/CCreatureWindow.cpp                 |  196 +-
 client/windows/CCreatureWindow.h                   |   18 +-
 client/windows/CHeroWindow.cpp                     |   30 +-
 client/windows/CHeroWindow.h                       |    8 +-
 client/windows/CKingdomInterface.h                 |   68 +-
 client/windows/CQuestLog.cpp                       |   13 +-
 client/windows/CQuestLog.h                         |   20 +-
 client/windows/CSpellWindow.cpp                    |  600 ++--
 client/windows/CSpellWindow.h                      |  103 +-
 client/windows/CTradeWindow.cpp                    |   43 +-
 client/windows/CTradeWindow.h                      |   36 +-
 client/windows/CWindowObject.h                     |   14 +-
 client/windows/GUIClasses.cpp                      |  178 +-
 client/windows/GUIClasses.h                        |   75 +-
 client/windows/InfoWindows.h                       |   17 +-
 cmake_modules/GetGitRevisionDescription.cmake      |  130 +
 cmake_modules/GetGitRevisionDescription.cmake.in   |   41 +
 cmake_modules/cotire.cmake                         | 1562 +++++++----
 config/artifacts.json                              |   21 +-
 config/bonuses.json                                |  111 +-
 config/bonuses_texts.json                          |  144 +-
 config/creatures/dungeon.json                      |   12 +-
 config/creatures/inferno.json                      |    6 +-
 config/creatures/neutral.json                      |   38 +-
 config/creatures/special.json                      |    6 +-
 config/defaultMods.json                            |    3 +-
 config/factions/castle.json                        |    6 +-
 config/factions/conflux.json                       |    3 +
 config/factions/dungeon.json                       |    3 +
 config/factions/fortress.json                      |    6 +-
 config/factions/inferno.json                       |    3 +
 config/factions/necropolis.json                    |    5 +-
 config/factions/rampart.json                       |    3 +
 config/factions/stronghold.json                    |    5 +-
 config/factions/tower.json                         |    3 +
 config/heroClasses.json                            |   36 +-
 config/heroes/fortress.json                        |   20 +-
 config/objects/dwellings.json                      |   72 +-
 config/objects/generic.json                        |   16 +-
 config/objects/moddables.json                      |   20 +-
 config/objects/rewardable.json                     |    3 +
 config/resolutions.json                            |    2 +-
 config/rmg.json                                    |  542 ----
 config/schemas/faction.json                        |    5 +
 config/schemas/mod.json                            |    6 +
 config/schemas/objectTemplate.json                 |    5 +
 config/schemas/settings.json                       |   76 +-
 config/schemas/spell.json                          |    4 +
 config/schemas/template.json                       |   79 +
 config/spells/ability.json                         |   95 +-
 config/spells/adventure.json                       |   18 +-
 config/spells/offensive.json                       |    4 +-
 config/spells/other.json                           |  105 +-
 config/spells/timed.json                           |  270 +-
 debian/changelog                                   |   13 +
 debian/control                                     |    7 +-
 debian/patches/boost1.60.diff                      |   71 -
 debian/patches/build_with_boost_1.58               |   39 -
 debian/patches/disable-privacy-breach              |    2 +-
 debian/patches/ffmpeg_2.9.patch                    |   64 -
 debian/patches/fix-spelling                        |   25 +
 debian/patches/minizip_maxu32                      |   20 +
 debian/patches/series                              |    5 +-
 editor/CMakeLists.txt                              |    2 +-
 editor/Editor.vcxproj                              |    2 +-
 include/vstd/CLoggerBase.h                         |  134 +
 launcher/CMakeLists.txt                            |   44 +-
 launcher/StdInc.h                                  |   11 +-
 launcher/VCMI_launcher.cbp                         |  110 +
 launcher/VCMI_launcher.vcxproj                     |    2 +-
 launcher/icons/menu-game.png                       |  Bin 5482 -> 47461 bytes
 launcher/jsonutils.cpp                             |    4 +-
 launcher/main.cpp                                  |    4 +-
 launcher/mainwindow_moc.cpp                        |   20 +-
 launcher/mainwindow_moc.h                          |    5 +-
 launcher/mainwindow_moc.ui                         |    6 +-
 launcher/modManager/cmodlist.h                     |    1 +
 launcher/modManager/cmodlistmodel_moc.h            |    2 +-
 launcher/modManager/cmodlistview_moc.cpp           |    4 +
 launcher/modManager/cmodlistview_moc.h             |    4 +-
 launcher/modManager/cmodlistview_moc.ui            |   10 +-
 launcher/modManager/cmodmanager.cpp                |   10 +-
 launcher/sdldisplayquery.cpp                       |   33 +
 launcher/sdldisplayquery.h                         |    5 +
 launcher/settingsView/csettingsview_moc.cpp        |   22 +-
 launcher/settingsView/csettingsview_moc.h          |    9 +-
 launcher/settingsView/csettingsview_moc.ui         |   54 +-
 lib/BattleAction.cpp                               |    2 +-
 lib/BattleState.cpp                                |  273 +-
 lib/BattleState.h                                  |  107 +-
 lib/CArtHandler.cpp                                |  313 ++-
 lib/CArtHandler.h                                  |   67 +-
 lib/CBattleCallback.cpp                            |  616 ++--
 lib/CBattleCallback.h                              |   73 +-
 lib/CBonusTypeHandler.cpp                          |   12 +-
 lib/CBonusTypeHandler.h                            |    4 +-
 lib/CConfigHandler.cpp                             |   11 +-
 lib/CConfigHandler.h                               |    2 +-
 lib/CConsoleHandler.cpp                            |   70 +-
 lib/CCreatureHandler.cpp                           |  158 +-
 lib/CCreatureHandler.h                             |   18 +-
 lib/CCreatureSet.cpp                               |  121 +-
 lib/CCreatureSet.h                                 |   38 +-
 lib/CGameInfoCallback.cpp                          |  263 +-
 lib/CGameInfoCallback.h                            |    8 +-
 lib/CGameInterface.cpp                             |   47 +-
 lib/CGameInterface.h                               |   73 +-
 lib/CGameState.cpp                                 | 1055 +++----
 lib/CGameState.h                                   |  202 +-
 lib/CGameStateFwd.h                                |  128 +-
 lib/CGeneralTextHandler.cpp                        |   31 +-
 lib/CGeneralTextHandler.h                          |   20 +-
 lib/CHeroHandler.cpp                               |   52 +-
 lib/CHeroHandler.h                                 |   29 +-
 lib/CMakeLists.txt                                 |   36 +-
 lib/CModHandler.cpp                                |  116 +-
 lib/CModHandler.h                                  |   25 +-
 lib/CObstacleInstance.cpp                          |    6 +-
 lib/CPathfinder.cpp                                | 1235 +++++++++
 lib/CPathfinder.h                                  |  283 ++
 lib/CPlayerState.h                                 |   76 +
 lib/CStopWatch.h                                   |    2 +-
 lib/CThreadHelper.h                                |   15 -
 lib/CTownHandler.cpp                               |   50 +-
 lib/CTownHandler.h                                 |   30 +-
 lib/Connection.cpp                                 |  647 -----
 lib/Connection.h                                   | 1740 ------------
 lib/GameConstants.cpp                              |  126 +-
 lib/GameConstants.h                                |  215 +-
 lib/HeroBonus.cpp                                  |  481 ++--
 lib/HeroBonus.h                                    |  298 +-
 lib/IBonusTypeHandler.h                            |    4 +-
 lib/IGameCallback.cpp                              |   69 +-
 lib/IGameCallback.h                                |    7 +-
 lib/IGameEventsReceiver.h                          |    1 +
 lib/IHandlerBase.cpp                               |    5 +
 lib/IHandlerBase.h                                 |    7 +-
 lib/Interprocess.h                                 |    2 +-
 lib/JsonDetail.cpp                                 |   27 +-
 lib/JsonNode.cpp                                   |   77 +-
 lib/JsonNode.h                                     |   32 +-
 lib/LogicalExpression.h                            |  149 +-
 lib/NetPacks.h                                     |  132 +-
 lib/NetPacksBase.h                                 |   11 +-
 lib/NetPacksLib.cpp                                |  573 ++--
 lib/ResourceSet.cpp                                |   10 +-
 lib/ResourceSet.h                                  |    3 +-
 lib/StartInfo.h                                    |   22 +-
 lib/StdInc.cpp                                     |    2 +-
 lib/StdInc.h                                       |    2 +-
 lib/StringConstants.h                              |   18 +-
 lib/VCMIDirs.cpp                                   |   28 +-
 lib/VCMIDirs.h                                     |    2 +-
 lib/VCMI_Lib.cpp                                   |   12 +-
 lib/VCMI_lib.cbp                                   |  146 +-
 lib/VCMI_lib.vcxproj                               |   52 +-
 lib/VCMI_lib.vcxproj.filters                       |  111 +-
 lib/filesystem/AdapterLoaders.cpp                  |   29 +-
 lib/filesystem/AdapterLoaders.h                    |   21 +-
 lib/filesystem/CArchiveLoader.cpp                  |    7 +-
 lib/filesystem/CArchiveLoader.h                    |    4 +-
 lib/filesystem/CCompressedStream.cpp               |    4 +-
 lib/filesystem/CCompressedStream.h                 |    4 +-
 lib/filesystem/CFileInfo.cpp                       |   96 -
 lib/filesystem/CFileInfo.h                         |  113 -
 lib/filesystem/CFileInputStream.cpp                |   28 +-
 lib/filesystem/CFileInputStream.h                  |   34 +-
 lib/filesystem/CFilesystemLoader.cpp               |   24 +-
 lib/filesystem/CFilesystemLoader.h                 |    6 +-
 lib/filesystem/CInputOutputStream.h                |    9 +
 lib/filesystem/CInputStream.h                      |   34 +-
 lib/filesystem/CMemoryBuffer.cpp                   |   73 +
 .../{CMemoryStream.h => CMemoryBuffer.h}           |   39 +-
 lib/filesystem/CMemoryStream.h                     |    3 +-
 lib/filesystem/COutputStream.h                     |   34 +
 lib/filesystem/CStream.h                           |   50 +
 lib/filesystem/CZipLoader.cpp                      |   68 +-
 lib/filesystem/CZipLoader.h                        |   28 +-
 lib/filesystem/CZipSaver.cpp                       |  120 +
 lib/filesystem/CZipSaver.h                         |   57 +
 lib/filesystem/FileInfo.cpp                        |   56 +
 lib/filesystem/FileInfo.h                          |   53 +
 lib/filesystem/FileStream.cpp                      |  314 +++
 lib/filesystem/FileStream.h                        |   53 +
 lib/filesystem/Filesystem.cpp                      |    2 -
 lib/filesystem/ISimpleResourceLoader.h             |   29 +-
 lib/filesystem/MinizipExtensions.cpp               |  254 ++
 lib/filesystem/MinizipExtensions.h                 |   88 +
 lib/filesystem/ResourceID.cpp                      |   69 +-
 lib/filesystem/ResourceID.h                        |   16 +-
 lib/int3.h                                         |   16 +-
 lib/logging/CBasicLogConfigurator.cpp              |   15 +-
 lib/logging/CLogger.cpp                            |   44 +-
 lib/logging/CLogger.h                              |   49 +-
 lib/mapObjects/CArmedInstance.cpp                  |   20 +-
 lib/mapObjects/CBank.cpp                           |   39 +-
 lib/mapObjects/CBank.h                             |    4 +-
 lib/mapObjects/CGHeroInstance.cpp                  |  519 +++-
 lib/mapObjects/CGHeroInstance.h                    |  113 +-
 lib/mapObjects/CGMarket.cpp                        |   15 +-
 lib/mapObjects/CGMarket.h                          |    6 +-
 lib/mapObjects/CGPandoraBox.cpp                    |  133 +-
 lib/mapObjects/CGPandoraBox.h                      |    6 +-
 lib/mapObjects/CGTownInstance.cpp                  |  295 +-
 lib/mapObjects/CGTownInstance.h                    |   47 +-
 lib/mapObjects/CObjectClassesHandler.cpp           |  100 +-
 lib/mapObjects/CObjectClassesHandler.h             |   47 +-
 lib/mapObjects/CObjectHandler.cpp                  |   93 +-
 lib/mapObjects/CObjectHandler.h                    |   37 +-
 lib/mapObjects/CQuest.cpp                          |  203 +-
 lib/mapObjects/CQuest.h                            |   42 +-
 lib/mapObjects/CRewardableConstructor.cpp          |    5 +-
 lib/mapObjects/CRewardableConstructor.h            |    4 +-
 lib/mapObjects/CRewardableObject.cpp               |  345 ++-
 lib/mapObjects/CRewardableObject.h                 |   50 +-
 lib/mapObjects/CommonConstructors.cpp              |   60 +-
 lib/mapObjects/CommonConstructors.h                |   66 +-
 lib/mapObjects/JsonRandom.cpp                      |    9 +-
 lib/mapObjects/JsonRandom.h                        |    4 +-
 lib/mapObjects/MiscObjects.cpp                     |  658 +++--
 lib/mapObjects/MiscObjects.h                       |  117 +-
 lib/mapObjects/ObjectTemplate.cpp                  |  146 +-
 lib/mapObjects/ObjectTemplate.h                    |    7 +-
 lib/mapping/CCampaignHandler.cpp                   |   14 +-
 lib/mapping/CCampaignHandler.h                     |    6 +-
 lib/mapping/CDrawRoadsOperation.cpp                |  355 +++
 lib/mapping/CDrawRoadsOperation.h                  |   58 +
 lib/mapping/CMap.cpp                               |  123 +-
 lib/mapping/CMap.h                                 |  174 +-
 lib/mapping/CMapDefines.h                          |   98 +
 lib/mapping/CMapEditManager.cpp                    |  224 +-
 lib/mapping/CMapEditManager.h                      |   94 +-
 lib/mapping/CMapInfo.cpp                           |   12 +-
 lib/mapping/CMapInfo.h                             |    9 +-
 lib/mapping/CMapService.cpp                        |   49 +-
 lib/mapping/CMapService.h                          |   15 +-
 lib/mapping/MapFormatH3M.cpp                       |  110 +-
 lib/mapping/MapFormatH3M.h                         |   15 +-
 lib/mapping/MapFormatJson.cpp                      | 1032 ++++++-
 lib/mapping/MapFormatJson.h                        |  227 +-
 lib/registerTypes/RegisterTypes.cpp                |   19 +-
 lib/registerTypes/RegisterTypes.h                  |   14 +-
 lib/registerTypes/TypesClientPacks1.cpp            |    8 +-
 lib/registerTypes/TypesClientPacks2.cpp            |    8 +-
 lib/registerTypes/TypesMapObjects1.cpp             |    8 +-
 lib/registerTypes/TypesMapObjects2.cpp             |    8 +-
 lib/registerTypes/TypesMapObjects3.cpp             |    8 +-
 lib/registerTypes/TypesPregamePacks.cpp            |    9 +-
 lib/registerTypes/TypesServerPacks.cpp             |    8 +-
 lib/rmg/CMapGenOptions.cpp                         |  133 +-
 lib/rmg/CMapGenOptions.h                           |    9 +-
 lib/rmg/CMapGenerator.cpp                          |  419 ++-
 lib/rmg/CMapGenerator.h                            |   22 +-
 lib/rmg/CRmgTemplateStorage.cpp                    |  364 +--
 lib/rmg/CRmgTemplateStorage.h                      |   38 +-
 lib/rmg/CRmgTemplateZone.cpp                       | 1037 +++++--
 lib/rmg/CRmgTemplateZone.h                         |   44 +-
 lib/rmg/CZoneGraphGenerator.cpp                    |    2 +-
 lib/rmg/CZoneGraphGenerator.h                      |    4 +-
 lib/rmg/CZonePlacer.cpp                            |  525 ++--
 lib/rmg/CZonePlacer.h                              |   20 +-
 lib/serializer/BinaryDeserializer.cpp              |  105 +
 lib/serializer/BinaryDeserializer.h                |  535 ++++
 lib/serializer/BinarySerializer.cpp                |   75 +
 lib/serializer/BinarySerializer.h                  |  373 +++
 lib/serializer/CLoadIntegrityValidator.cpp         |   65 +
 lib/serializer/CLoadIntegrityValidator.h           |   31 +
 lib/serializer/CMemorySerializer.cpp               |   41 +
 lib/serializer/CMemorySerializer.h                 |   43 +
 lib/serializer/CSerializer.cpp                     |   49 +
 lib/serializer/CSerializer.h                       |  201 ++
 lib/serializer/CTypeList.cpp                       |  123 +
 lib/serializer/CTypeList.h                         |  231 ++
 lib/serializer/Connection.cpp                      |  281 ++
 lib/serializer/Connection.h                        |  110 +
 lib/serializer/JsonDeserializer.cpp                |  163 ++
 lib/serializer/JsonDeserializer.h                  |   34 +
 lib/serializer/JsonSerializeFormat.cpp             |   90 +
 lib/serializer/JsonSerializeFormat.h               |  148 +
 lib/serializer/JsonSerializer.cpp                  |   94 +
 lib/serializer/JsonSerializer.h                    |   35 +
 lib/spells/AdventureSpellMechanics.cpp             |  178 +-
 lib/spells/AdventureSpellMechanics.h               |   51 +-
 lib/spells/BattleSpellMechanics.cpp                |  802 ++++--
 lib/spells/BattleSpellMechanics.h                  |  155 +-
 lib/spells/CDefaultSpellMechanics.cpp              |  825 +++---
 lib/spells/CDefaultSpellMechanics.h                |   87 +-
 lib/spells/CSpellHandler.cpp                       |  397 +--
 lib/spells/CSpellHandler.h                         |  118 +-
 lib/spells/CreatureSpellMechanics.cpp              |   77 +-
 lib/spells/CreatureSpellMechanics.h                |   11 +-
 lib/spells/ISpellMechanics.cpp                     |  153 +-
 lib/spells/ISpellMechanics.h                       |  137 +-
 lib/spells/Magic.h                                 |   55 +
 lib/spells/SpellMechanics.h                        |    2 +-
 lib/spells/ViewSpellInt.cpp                        |    4 +-
 scripting/erm/CMakeLists.txt                       |    2 +-
 scripting/erm/ERM.cbp                              |   35 +-
 scripting/erm/ERMInterpreter.cpp                   |  161 +-
 scripting/erm/ERMParser.cpp                        |   18 +-
 scripting/erm/ERMScriptModule.cpp                  |    4 +-
 scripting/erm/ERMScriptModule.h                    |    4 +-
 server/CGameHandler.cpp                            | 2929 ++++++++++++--------
 server/CGameHandler.h                              |   59 +-
 server/CMakeLists.txt                              |    2 +-
 server/CQuery.cpp                                  |   77 +-
 server/CQuery.h                                    |    8 +-
 server/CVCMIServer.cpp                             |  118 +-
 server/CVCMIServer.h                               |    2 +-
 server/NetPacksServer.cpp                          |   28 +-
 server/StdInc.cpp                                  |    2 +-
 server/StdInc.h                                    |   28 +
 server/VCMI_server.cbp                             |   50 +-
 test/CMakeLists.txt                                |    4 +-
 test/CMapEditManagerTest.cpp                       |   43 +-
 test/CMapFormatTest.cpp                            |   98 +
 test/CMemoryBufferTest.cpp                         |   52 +
 test/CVcmiTestConfig.cpp                           |   10 +-
 test/MapComparer.cpp                               |  274 ++
 test/MapComparer.h                                 |   31 +
 test/Test.cbp                                      |   32 +-
 vcmi.workspace                                     |    5 +-
 vcmibuilder                                        |   27 +-
 437 files changed, 28809 insertions(+), 17434 deletions(-)
 create mode 100644 .travis.linux
 create mode 100644 .travis.osx
 create mode 100644 Mods/vcmi/Sprites/ScSelC.json
 create mode 100644 Mods/vcmi/Sprites/mapFormatIcons/vcmi1.png
 create mode 100644 Version.cpp.in
 create mode 100644 Version.h
 create mode 100644 client/SDLRWwrapper.cpp
 copy lib/AI_Base.h => client/SDLRWwrapper.h (60%)
 create mode 100644 cmake_modules/GetGitRevisionDescription.cmake
 create mode 100644 cmake_modules/GetGitRevisionDescription.cmake.in
 delete mode 100644 config/rmg.json
 create mode 100644 config/schemas/template.json
 delete mode 100644 debian/patches/boost1.60.diff
 delete mode 100644 debian/patches/build_with_boost_1.58
 delete mode 100644 debian/patches/ffmpeg_2.9.patch
 create mode 100644 debian/patches/fix-spelling
 create mode 100644 debian/patches/minizip_maxu32
 create mode 100644 include/vstd/CLoggerBase.h
 create mode 100644 launcher/VCMI_launcher.cbp
 create mode 100644 launcher/sdldisplayquery.cpp
 create mode 100644 launcher/sdldisplayquery.h
 create mode 100644 lib/CPathfinder.cpp
 create mode 100644 lib/CPathfinder.h
 create mode 100644 lib/CPlayerState.h
 delete mode 100644 lib/Connection.cpp
 delete mode 100644 lib/Connection.h
 delete mode 100644 lib/filesystem/CFileInfo.cpp
 delete mode 100644 lib/filesystem/CFileInfo.h
 create mode 100644 lib/filesystem/CInputOutputStream.h
 create mode 100644 lib/filesystem/CMemoryBuffer.cpp
 copy lib/filesystem/{CMemoryStream.h => CMemoryBuffer.h} (67%)
 create mode 100644 lib/filesystem/COutputStream.h
 create mode 100644 lib/filesystem/CStream.h
 create mode 100644 lib/filesystem/CZipSaver.cpp
 create mode 100644 lib/filesystem/CZipSaver.h
 create mode 100644 lib/filesystem/FileInfo.cpp
 create mode 100644 lib/filesystem/FileInfo.h
 create mode 100644 lib/filesystem/FileStream.cpp
 create mode 100644 lib/filesystem/FileStream.h
 create mode 100644 lib/filesystem/MinizipExtensions.cpp
 create mode 100644 lib/filesystem/MinizipExtensions.h
 create mode 100644 lib/mapping/CDrawRoadsOperation.cpp
 create mode 100644 lib/mapping/CDrawRoadsOperation.h
 create mode 100644 lib/mapping/CMapDefines.h
 create mode 100644 lib/serializer/BinaryDeserializer.cpp
 create mode 100644 lib/serializer/BinaryDeserializer.h
 create mode 100644 lib/serializer/BinarySerializer.cpp
 create mode 100644 lib/serializer/BinarySerializer.h
 create mode 100644 lib/serializer/CLoadIntegrityValidator.cpp
 create mode 100644 lib/serializer/CLoadIntegrityValidator.h
 create mode 100644 lib/serializer/CMemorySerializer.cpp
 create mode 100644 lib/serializer/CMemorySerializer.h
 create mode 100644 lib/serializer/CSerializer.cpp
 create mode 100644 lib/serializer/CSerializer.h
 create mode 100644 lib/serializer/CTypeList.cpp
 create mode 100644 lib/serializer/CTypeList.h
 create mode 100644 lib/serializer/Connection.cpp
 create mode 100644 lib/serializer/Connection.h
 create mode 100644 lib/serializer/JsonDeserializer.cpp
 create mode 100644 lib/serializer/JsonDeserializer.h
 create mode 100644 lib/serializer/JsonSerializeFormat.cpp
 create mode 100644 lib/serializer/JsonSerializeFormat.h
 create mode 100644 lib/serializer/JsonSerializer.cpp
 create mode 100644 lib/serializer/JsonSerializer.h
 create mode 100644 lib/spells/Magic.h
 create mode 100644 test/CMapFormatTest.cpp
 create mode 100644 test/CMemoryBufferTest.cpp
 create mode 100644 test/MapComparer.cpp
 create mode 100644 test/MapComparer.h

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



More information about the Pkg-games-commits mailing list