AlexVinS 37d0dad70a Merge branch 'develop' into feature/VCMIMapFormat1 ...

Conflicts:
	lib/CArtHandler.cpp

2016-01-01 20:28:52 +03:00

..

filesystem

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +03:00

logging

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

mapObjects

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +03:00

mapping

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +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

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +03:00

spells

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +03:00

AI_Base.h

* Final commit

2011-12-13 21:35:28 +00:00

BattleAction.cpp

Fix filenames in file headers

2015-12-08 09:53:14 +03:00

BattleAction.h

- Compile fixes for MVS

2013-11-09 21:29:46 +00:00

BattleHex.cpp

Minor fixes.

2014-08-30 18:45:11 +02:00

BattleHex.h

Minor fixes.

2014-08-30 18:45:11 +02:00

BattleState.cpp

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

BattleState.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CArtHandler.cpp

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +03:00

CArtHandler.h

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +03:00

CBattleCallback.cpp

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CBattleCallback.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CBonusTypeHandler.cpp

Start spell-relatet files reorganisation

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

CBonusTypeHandler.h

Part 2 of new spell configuration

2014-03-07 13:21:09 +00:00

CBuildingHandler.cpp

get rid of boost::assign

2014-10-04 00:34:13 +04:00

CBuildingHandler.h

* refactoring

2013-02-11 19:11:34 +00:00

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

Fix filenames in file headers

2015-12-08 09:53:14 +03:00

CConsoleHandler.cpp

Fix header case for Linux to Windows cross compilation using MingGW

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

CConsoleHandler.h

VCMIDirs update #5 fix

2014-08-26 12:19:04 +02:00

CCreatureHandler.cpp

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +03:00

CCreatureHandler.h

post-merge fixes

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

CCreatureSet.cpp

CCeatureSet: add getArmyDescription for hover and InfoWindow texts

2015-12-24 21:03:51 +03:00

CCreatureSet.h

CCeatureSet: add getArmyDescription for hover and InfoWindow texts

2015-12-24 21:03:51 +03:00

CGameInfoCallback.cpp

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CGameInfoCallback.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CGameInterface.cpp

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CGameInterface.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CGameState.cpp

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +03:00

CGameState.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +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

Implemented (basic) object construction and placement

2015-12-05 12:36:42 +03:00

CHeroHandler.h

post-merge fixes

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

CMakeLists.txt

fix CMakeLists

2015-12-05 12:36:38 +03:00

CModHandler.cpp

Fix subObject identification

2015-12-05 12:38:36 +03:00

CModHandler.h

Fix subObject identification

2015-12-05 12:38:36 +03:00

CObstacleInstance.cpp

Start spell-relatet files reorganisation

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

CObstacleInstance.h

c++03 -> c++11 switch:

2013-06-26 11:18:27 +00:00

CondSh.h

Minor fixes.

2014-08-30 18:45:11 +02:00

Connection.cpp

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

Connection.h

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +03:00

ConstTransitivePtr.h

Fixed #1430, work-around to make #1435 non-crashing.

2013-09-11 21:57:08 +00:00

CPathfinder.cpp

Merge branch 'develop' into feature/VCMIMapFormat1

2016-01-01 20:28:52 +03:00

CPathfinder.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

CPlayerState.h

Removed includes of CGameState from headers

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

CRandomGenerator.cpp

- migrated boost::function/ref/bind to std:: variants

2014-08-04 20:33:59 +02:00

CRandomGenerator.h

- Fixed crash caused by randomShuffle

2014-07-09 14:27:12 +02:00

CScriptingModule.h

Clean up.

2014-04-20 12:40:15 +04:00

CSoundBase.h

Fixed sound effect when hero disappears

2014-08-06 17:19:53 +02:00

CStopWatch.h

Fix filenames in file headers

2015-12-08 09:53:14 +03:00

CThreadHelper.cpp

add support for the HURD

2014-11-17 16:43:26 +01:00

CThreadHelper.h

- migrated boost::function/ref/bind to std:: variants

2014-08-04 20:33:59 +02:00

CTownHandler.cpp

Save string identifiers for all game objects

2015-12-05 12:36:39 +03:00

CTownHandler.h

Save string identifiers for all game objects

2015-12-05 12:36:39 +03:00

FunctionList.h

Minor refactoring of FunctionList using variadic templates.

2014-11-12 22:46:37 +02:00

GameConstants.cpp

GameConstants: move operators into header and always inline them

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

GameConstants.h

Add hero gold cost to GameConstants

2015-12-07 00:13:58 +03:00

HeroBonus.cpp

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

HeroBonus.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

IBonusTypeHandler.h

* fixed crash related to cammander's SPELL_AFTER_ATTACK spell id not initialized properly (text id was resolved on copy of bonus)

2013-06-17 15:45:55 +00:00

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

Reduced number of #include's in headers. May break compilation on Win

2014-06-25 17:11:07 +03:00

IHandlerBase.h

Save string identifiers for all game objects

2015-12-05 12:36:39 +03:00

int3.h

Merge pull request #143 from vcmi/feature/patrolSupport

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

Interprocess.h

- fix for boost 1.49

2012-04-02 11:14:38 +00:00

JsonDetail.cpp

Another fix for JsonWriter::writeString

2015-12-05 12:06:46 +03:00

JsonDetail.h

Fixing spelling mistakes. Patch from josch, fixes #1759

2014-03-23 12:59:03 +00:00

JsonNode.cpp

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

JsonNode.h

More cleanup:

2014-06-05 23:51:24 +03:00

LogicalExpression.cpp

Extended building dependencies:

2013-12-02 11:58:02 +00:00

LogicalExpression.h

Advance triggered events serialization

2015-12-05 12:06:51 +03:00

NetPacks.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

NetPacksBase.h

Add "override" to virtual overriden methods

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

NetPacksLib.cpp

NewTurn::applyGs: update bonuses in beginning. Fix issue 2083

2015-12-25 01:48:53 +03:00

ResourceSet.cpp

Fixed all the issues with Quests, #828 and #1223.

2013-07-23 15:03:01 +00:00

ResourceSet.h

Added serializer-based class able to make deep copies of objects — CMemorySerializer.

2014-02-08 21:54:35 +00:00

ScopeGuard.h

- Improved json validation. Now it support most of features from latest json schema draft

2013-04-02 17:06:43 +00:00

StartInfo.h

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

2015-12-29 05:43:33 +03:00

StdInc.cpp

* Final commit

2011-12-13 21:35:28 +00:00

StdInc.h

* CHexField renamed to CBattleHex

2011-12-17 18:59:59 +00:00

StringConstants.h

Fix filenames in file headers

2015-12-08 09:53:14 +03:00

UnlockGuard.h

c++03 -> c++11 switch:

2013-06-26 11:18:27 +00:00

vcmi_endian.h

Replace defined(linux) with __linux__/__linux/linux in vcmi_endian.h

2014-05-14 09:49:25 +04:00

VCMI_lib.cbp

Start implementing map saver

2015-12-05 12:06:42 +03:00

VCMI_Lib.cpp

- VCMI will now read templates from mods

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

VCMI_Lib.h

Object class handler is now a proper "handler"

2014-05-24 01:56:51 +03:00

VCMI_lib.vcxproj

Compile fixes for MSVS

2015-12-23 15:23:56 +01:00

VCMI_lib.vcxproj.filters

Compile fixes for MSVS

2015-12-23 15:23:56 +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

VCMIDirs update #5

2014-08-21 22:26:28 +02:00