AlexVinS 0fab319c73 Merge remote-tracking branch 'remotes/origin/develop' into issue/2306 ...

s reverts commit fa8a2826963b3089a758beea6e61af0a660bdbf6.

Conflicts:
	AI/VCAI/VCAI.cpp

Conflicts:
	AI/VCAI/VCAI.cpp
	client/windows/CAdvmapInterface.cpp
	lib/CPathfinder.cpp
	lib/CPathfinder.h

2015-12-05 12:56:12 +03:00

..

filesystem

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

logging

Relaxed Mutex of Logger. Attempt to optimize format function.

2015-08-30 19:26:19 +02:00

mapObjects

Merge pull request #144 from vcmi/fix/teleportMultiExitPoints

2015-12-05 03:12:17 +03:00

mapping

Merge pull request #143 from vcmi/feature/patrolSupport

2015-12-05 03:11:07 +03:00

minizip

Added debug mingw64 build, minimum Windows version set to windows 7, SDL suffixes removed from Build Tagerts

2015-08-20 03:28:04 +03:00

registerTypes

removed few more includes from headers

2015-12-02 22:10:46 +02:00

rmg

Fixed gcc/clang warnings

2015-12-04 01:17:43 +02:00

spells

Fixed gcc/clang warnings

2015-12-04 01:17:43 +02:00

AI_Base.h

…

BattleAction.cpp

…

BattleAction.h

…

BattleHex.cpp

…

BattleHex.h

…

BattleState.cpp

Removed all #include's of CMap.h from headers.

2015-12-02 21:05:10 +02:00

BattleState.h

removed few more includes from headers

2015-12-02 22:10:46 +02:00

CArtHandler.cpp

Artifacts: use ArtifactID instead of ints

2015-11-06 21:54:51 +03:00

CArtHandler.h

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

CBattleCallback.cpp

Fixed another uninitialized field possiblity causing issues with StupidAI

2015-12-04 00:11:44 +02:00

CBattleCallback.h

Use ISpellCaster in battle callback

2015-09-29 17:26:52 +03:00

CBonusTypeHandler.cpp

Start spell-relatet files reorganisation

2015-02-26 08:39:48 +03:00

CBonusTypeHandler.h

…

CBuildingHandler.cpp

…

CBuildingHandler.h

…

CConfigHandler.cpp

Changed fading to be enabled by default (when entries are not present in config);

2015-02-09 20:41:03 +01:00

CConfigHandler.h

Added advmap config options to enable/disable fading;

2015-02-02 19:38:30 +01:00

CConsoleHandler.cpp

Fix header case for Linux to Windows cross compilation using MingGW

2015-11-03 14:40:36 +03:00

CConsoleHandler.h

…

CCreatureHandler.cpp

Introduced absolute specific spell immunity.

2015-09-29 17:26:44 +03:00

CCreatureHandler.h

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

CCreatureSet.cpp

Possible fix for #923

2015-04-11 07:18:40 +03:00

CCreatureSet.h

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

CGameInfoCallback.cpp

Merge pull request #145 from vcmi/feature/tavernRumors

2015-12-05 03:13:25 +03:00

CGameInfoCallback.h

Rumors: rename getTavernGossip to getTavernRumor for consistency

2015-11-30 17:51:28 +03:00

CGameInterface.cpp

Initial refactoring

2014-12-21 17:29:42 +03:00

CGameInterface.h

Move TTeleportExitsList to CObjectHandler.h

2015-12-05 01:14:03 +03:00

CGameState.cpp

Merge remote-tracking branch 'remotes/origin/develop' into issue/2306

2015-12-05 12:56:12 +03:00

CGameState.h

Merge branch 'develop' into feature/tavernRumors

2015-12-05 01:01:26 +03:00

CGameStateFwd.h

Removed includes of CGameState from headers

2015-12-02 21:39:53 +02:00

CGeneralTextHandler.cpp

Rumors: client-side proof of concept implementation

2015-11-30 20:52:15 +03:00

CGeneralTextHandler.h

Rumors: client-side proof of concept implementation

2015-11-30 20:52:15 +03:00

CHeroHandler.cpp

…

CHeroHandler.h

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

CMakeLists.txt

Removed includes of CGameState from headers

2015-12-02 21:39:53 +02:00

CModHandler.cpp

Fixed gcc/clang warnings

2015-12-04 01:17:43 +02:00

CModHandler.h

…

CObstacleInstance.cpp

Start spell-relatet files reorganisation

2015-02-26 08:39:48 +03:00

CObstacleInstance.h

…

CondSh.h

…

Connection.cpp

Merge remote-tracking branch 'remotes/origin/develop' into issue/2306

2015-12-05 12:56:12 +03:00

Connection.h

Merge remote-tracking branch 'remotes/origin/develop' into issue/2306

2015-12-05 12:56:12 +03:00

ConstTransitivePtr.h

…

CPathfinder.cpp

Merge pull request #143 from vcmi/feature/patrolSupport

2015-12-05 03:11:07 +03:00

CPathfinder.h

Merge pull request #143 from vcmi/feature/patrolSupport

2015-12-05 03:11:07 +03:00

CPlayerState.h

Removed includes of CGameState from headers

2015-12-02 21:39:53 +02:00

CRandomGenerator.cpp

…

CRandomGenerator.h

…

CScriptingModule.h

…

CSoundBase.h

…

CStopWatch.h

…

CThreadHelper.cpp

…

CThreadHelper.h

…

CTownHandler.cpp

Fixed gcc warnings

2015-12-02 20:59:38 +02:00

CTownHandler.h

…

FunctionList.h

…

GameConstants.cpp

GameConstants: move operators into header and always inline them

2015-11-22 07:24:12 +03:00

GameConstants.h

Removed all #include's of CMap.h from headers.

2015-12-02 21:05:10 +02:00

HeroBonus.cpp

addNewBonus: add turnsRemain check for N_TURNS, N_DAYS and ONE_WEEK

2015-11-20 14:37:57 +03:00

HeroBonus.h

Bonus system: use duration helpers in selecters

2015-11-20 13:24:48 +03:00

IBonusTypeHandler.h

…

IGameCallback.cpp

Merge pull request #143 from vcmi/feature/patrolSupport

2015-12-05 03:11:07 +03:00

IGameCallback.h

Patrol: use manhattan distance for getting tiles in radius

2015-12-04 21:08:09 +03:00

IGameEventsReceiver.h

World view impl -- initial;

2015-01-13 20:57:41 +01:00

IHandlerBase.cpp

…

IHandlerBase.h

…

int3.h

Merge pull request #143 from vcmi/feature/patrolSupport

2015-12-05 03:11:07 +03:00

Interprocess.h

…

JsonDetail.cpp

Move JsonNode operator<< to right plase

2015-02-10 14:43:26 +03:00

JsonDetail.h

…

JsonNode.cpp

Move JsonNode operator<< to right plase

2015-02-10 14:43:26 +03:00

JsonNode.h

…

LogicalExpression.cpp

…

LogicalExpression.h

…

NetPacks.h

Merge remote-tracking branch 'remotes/origin/develop' into issue/2306

2015-12-05 12:56:12 +03:00

NetPacksBase.h

Add "override" to virtual overriden methods

2015-10-13 21:05:36 +03:00

NetPacksLib.cpp

Merge branch 'develop' into feature/tavernRumors

2015-12-05 01:01:26 +03:00

ResourceSet.cpp

…

ResourceSet.h

…

ScopeGuard.h

…

StartInfo.h

Likely fixed duplicated random heroes

2015-12-05 01:40:23 +02:00

StdInc.cpp

…

StdInc.h

…

StringConstants.h

…

UnlockGuard.h

…

vcmi_endian.h

…

VCMI_lib.cbp

[c::b] update projects

2015-11-01 00:01:41 +03:00

VCMI_Lib.cpp

- VCMI will now read templates from mods

2015-05-26 18:19:41 +02:00

VCMI_Lib.h

…

VCMI_lib.vcxproj

Updated MSVS project.

2015-10-31 15:08:13 +01:00

VCMI_lib.vcxproj.filters

Updated MSVS project.

2015-10-31 15:08:13 +01:00

VCMIDirs.cpp

Fix header case for Linux to Windows cross compilation using MingGW

2015-11-03 14:40:36 +03:00

VCMIDirs.h

…