[vcmi] 03/04: Merge tag 'upstream/0.98+dfsg'
Johannes Schauer
josch at moszumanska.debian.org
Wed Apr 29 10:12:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
josch pushed a commit to branch master
in repository vcmi.
commit 599215e7d53eeb3207e5605672cd05cda19d8fbb
Merge: bec08cb f047328
Author: josch <j.schauer at email.de>
Date: Wed Apr 29 11:29:04 2015 +0200
Merge tag 'upstream/0.98+dfsg'
Upstream version 0.98+dfsg
.gitignore | 1 +
.travis.yml | 2 +-
AI/BattleAI/BattleAI.cpp | 12 +-
AI/CMakeLists.txt | 20 +-
AI/EmptyAI/CEmptyAI.cpp | 5 +
AI/EmptyAI/CEmptyAI.h | 1 +
AI/StupidAI/StupidAI.cpp | 4 +-
AI/StupidAI/StupidAI.h | 4 +-
AI/VCAI/AIUtility.cpp | 11 +-
AI/VCAI/AIUtility.h | 2 +-
AI/VCAI/CMakeLists.txt | 10 +-
AI/VCAI/Fuzzy.cpp | 216 ++---
AI/VCAI/Fuzzy.h | 23 +-
AI/VCAI/Goals.cpp | 57 +-
AI/VCAI/VCAI.cpp | 193 +++-
AI/VCAI/VCAI.h | 21 +-
AUTHORS | 3 +
CCallback.cpp | 6 +-
CCallback.h | 4 +-
CMakeLists.txt | 4 +-
ChangeLog | 33 +
Global.h | 51 +-
Mods/vcmi/Data/questDialog.png | Bin 274719 -> 326427 bytes
Mods/vcmi/Data/stackWindow/info-panel-1.png | Bin 0 -> 88435 bytes
Mods/vcmi/Data/stackWindow/info-panel-2.png | Bin 0 -> 84481 bytes
README.linux | 2 +-
README.md | 2 +-
client/CMT.cpp | 10 +-
client/CMusicHandler.cpp | 85 +-
client/CMusicHandler.h | 7 +-
client/CPlayerInterface.cpp | 296 +++---
client/CPlayerInterface.h | 28 +-
client/CPreGame.cpp | 146 +--
client/CPreGame.h | 4 +-
client/CVideoHandler.cpp | 2 +-
client/CVideoHandler.h | 14 +-
client/Client.cpp | 62 +-
client/Client.h | 12 +-
client/Graphics.cpp | 2 +-
client/NetPacksClient.cpp | 20 +-
client/VCMI_client.vcxproj | 8 +-
client/battle/CBattleAnimations.cpp | 146 ++-
client/battle/CBattleAnimations.h | 7 +-
client/battle/CBattleInterface.cpp | 339 ++++---
client/battle/CBattleInterface.h | 7 +-
client/battle/CBattleInterfaceClasses.cpp | 15 +-
client/gui/CAnimation.cpp | 88 ++
client/gui/CAnimation.h | 29 +
client/gui/CGuiHandler.cpp | 10 +-
client/gui/CIntObject.cpp | 25 +-
client/gui/CIntObject.h | 14 +-
client/gui/SDL_Extensions.h | 25 +-
client/mapHandler.cpp | 1294 +++++++++++++++++++--------
client/mapHandler.h | 304 ++++++-
client/widgets/AdventureMapClasses.cpp | 187 +++-
client/widgets/AdventureMapClasses.h | 41 +-
client/widgets/Buttons.cpp | 14 +-
client/widgets/Buttons.h | 1 +
client/widgets/CArtifactHolder.cpp | 155 ++--
client/widgets/CArtifactHolder.h | 9 +-
client/widgets/CComponent.cpp | 6 +-
client/widgets/CComponent.h | 2 +-
client/widgets/CGarrisonInt.cpp | 35 +-
client/widgets/CGarrisonInt.h | 1 +
client/widgets/Images.cpp | 6 +-
client/widgets/MiscWidgets.cpp | 2 +-
client/widgets/TextControls.cpp | 12 +-
client/windows/CAdvmapInterface.cpp | 528 ++++++++---
client/windows/CAdvmapInterface.h | 69 +-
client/windows/CCastleInterface.cpp | 4 +-
client/windows/CCreatureWindow.cpp | 26 +-
client/windows/CHeroWindow.cpp | 14 +-
client/windows/CKingdomInterface.cpp | 47 +-
client/windows/CKingdomInterface.h | 4 +-
client/windows/CQuestLog.cpp | 189 +++-
client/windows/CQuestLog.h | 19 +-
client/windows/CSpellWindow.cpp | 239 ++---
client/windows/CSpellWindow.h | 2 -
client/windows/CTradeWindow.cpp | 58 +-
client/windows/GUIClasses.cpp | 176 ++--
client/windows/InfoWindows.cpp | 23 +-
cmake_modules/FindFuzzylite.cmake | 57 ++
config/battles_graphics.json | 104 +--
config/bonuses.json | 15 +
config/bonuses_texts.json | 18 +-
config/objects/generic.json | 4 +-
config/objects/moddables.json | 25 +-
config/resolutions.json | 3 +-
config/rmg.json | 227 ++++-
config/schemas/settings.json | 6 +-
config/schemas/spell.json | 76 +-
config/spells/ability.json | 71 +-
config/spells/adventure.json | 150 +++-
config/spells/offensive.json | 96 +-
config/spells/other.json | 83 +-
config/spells/timed.json | 213 ++++-
config/terrainViewPatterns.json | 16 +-
config/translate.json | 8 +
launcher/jsonutils.cpp | 4 +-
launcher/modManager/cmodlistview_moc.cpp | 15 +-
launcher/modManager/cmodlistview_moc.h | 2 +
launcher/modManager/cmodlistview_moc.ui | 19 +-
launcher/settingsView/csettingsview_moc.cpp | 7 +
launcher/settingsView/csettingsview_moc.h | 2 +
launcher/settingsView/csettingsview_moc.ui | 103 ++-
lib/BattleState.cpp | 50 +-
lib/BattleState.h | 3 +-
lib/CArtHandler.cpp | 25 +-
lib/CArtHandler.h | 2 +
lib/CBattleCallback.cpp | 531 +++--------
lib/CBattleCallback.h | 17 -
lib/CBonusTypeHandler.cpp | 6 +-
lib/CConfigHandler.cpp | 3 +
lib/CConfigHandler.h | 3 +
lib/CCreatureSet.cpp | 2 +-
lib/CGameInfoCallback.cpp | 195 +++-
lib/CGameInfoCallback.h | 15 +-
lib/CGameInterface.cpp | 8 +-
lib/CGameInterface.h | 17 +-
lib/CGameState.cpp | 169 +++-
lib/CGameState.h | 16 +-
lib/CMakeLists.txt | 12 +-
lib/CModHandler.cpp | 10 +-
lib/CModHandler.h | 2 +
lib/CObstacleInstance.cpp | 2 +-
lib/CSpellHandler.cpp | 894 ------------------
lib/CSpellHandler.h | 225 -----
lib/CThreadHelper.cpp | 2 +-
lib/CTownHandler.cpp | 2 +-
lib/Connection.cpp | 99 +-
lib/Connection.h | 569 ++++++------
lib/FunctionList.h | 60 +-
lib/GameConstants.cpp | 38 +-
lib/GameConstants.h | 46 +-
lib/HeroBonus.cpp | 2 +-
lib/HeroBonus.h | 5 +-
lib/IGameCallback.cpp | 18 +-
lib/IGameCallback.h | 4 +-
lib/IGameEventsReceiver.h | 1 +
lib/JsonDetail.cpp | 6 -
lib/JsonNode.cpp | 7 +
lib/NetPacks.h | 89 +-
lib/NetPacksLib.cpp | 59 +-
lib/VCMIDirs.cpp | 28 +-
lib/VCMI_Lib.cpp | 14 +-
lib/VCMI_lib.cbp | 16 +-
lib/VCMI_lib.vcxproj | 18 +-
lib/VCMI_lib.vcxproj.filters | 55 +-
lib/filesystem/CCompressedStream.cpp | 2 +-
lib/filesystem/ResourceID.cpp | 14 +-
lib/filesystem/ResourceID.h | 3 +-
lib/mapObjects/CBank.cpp | 2 +-
lib/mapObjects/CGHeroInstance.cpp | 87 +-
lib/mapObjects/CGHeroInstance.h | 2 +
lib/mapObjects/CGPandoraBox.cpp | 2 +-
lib/mapObjects/CObjectClassesHandler.cpp | 4 +-
lib/mapObjects/CQuest.cpp | 13 +-
lib/mapObjects/CQuest.h | 2 +-
lib/mapObjects/CRewardableObject.cpp | 8 +-
lib/mapObjects/CRewardableObject.h | 2 +-
lib/mapObjects/CommonConstructors.cpp | 23 +
lib/mapObjects/CommonConstructors.h | 8 +-
lib/mapObjects/JsonRandom.cpp | 2 +-
lib/mapObjects/MiscObjects.cpp | 562 ++++++++----
lib/mapObjects/MiscObjects.h | 96 +-
lib/mapObjects/ObjectTemplate.cpp | 10 +-
lib/mapping/CMap.cpp | 14 +-
lib/mapping/CMap.h | 9 +-
lib/mapping/CMapEditManager.cpp | 150 +++-
lib/mapping/CMapEditManager.h | 9 +
lib/mapping/MapFormatH3M.cpp | 4 +-
lib/registerTypes/RegisterTypes.cpp | 21 +-
lib/registerTypes/RegisterTypes.h | 22 +-
lib/registerTypes/TypesClientPacks1.cpp | 11 +-
lib/registerTypes/TypesClientPacks2.cpp | 13 +-
lib/registerTypes/TypesMapObjects1.cpp | 12 +-
lib/registerTypes/TypesMapObjects2.cpp | 11 +-
lib/registerTypes/TypesMapObjects3.cpp | 11 +-
lib/registerTypes/TypesPregamePacks.cpp | 12 +-
lib/registerTypes/TypesServerPacks.cpp | 11 +-
lib/rmg/CMapGenOptions.cpp | 17 +-
lib/rmg/CMapGenerator.cpp | 151 +++-
lib/rmg/CMapGenerator.h | 8 +
lib/rmg/CRmgTemplateStorage.cpp | 7 -
lib/rmg/CRmgTemplateZone.cpp | 789 ++++++++++------
lib/rmg/CRmgTemplateZone.h | 20 +-
lib/rmg/CZonePlacer.cpp | 205 ++++-
lib/spells/AdventureSpellMechanics.cpp | 290 ++++++
lib/spells/AdventureSpellMechanics.h | 75 ++
lib/spells/BattleSpellMechanics.cpp | 526 +++++++++++
lib/spells/BattleSpellMechanics.h | 125 +++
lib/spells/CDefaultSpellMechanics.cpp | 726 +++++++++++++++
lib/spells/CDefaultSpellMechanics.h | 54 ++
lib/spells/CSpellHandler.cpp | 1031 +++++++++++++++++++++
lib/spells/CSpellHandler.h | 391 ++++++++
lib/spells/CreatureSpellMechanics.cpp | 95 ++
lib/spells/CreatureSpellMechanics.h | 40 +
lib/spells/ISpellMechanics.cpp | 89 ++
lib/spells/ISpellMechanics.h | 53 ++
lib/spells/SpellMechanics.h | 19 +
lib/spells/ViewSpellInt.cpp | 27 +
lib/spells/ViewSpellInt.h | 32 +
scripting/erm/ERM.cbp | 4 +-
scripting/erm/ERMInterpreter.cpp | 20 +-
scripting/erm/ERMParser.cpp | 15 +
scripting/erm/ERMParser.h | 19 +-
scripting/erm/StdInc.h | 2 -
server/CGameHandler.cpp | 1108 ++++++-----------------
server/CGameHandler.h | 9 +-
server/CQuery.cpp | 12 +
server/CQuery.h | 10 +
server/CVCMIServer.cpp | 2 +-
server/NetPacksServer.cpp | 5 +-
test/CMapEditManagerTest.cpp | 45 +-
test/TerrainViewTest.h3m | Bin 4221 -> 4241 bytes
test/Test.vcxproj | 1 +
test/terrainViewMappings.json | 4 +
vcmi.workspace | 9 +-
vcmibuilder | 21 +-
219 files changed, 11657 insertions(+), 5775 deletions(-)
--
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