AlexVinS d7c0c3759a Merge branch 'Zyx-develop' into develop ...

Conflicts:
	lib/filesystem/AdapterLoaders.h

2016-01-27 18:53:41 +03:00

..

CGameHandler.cpp

Add hardcodedFeature to switch winner's retreating with no troops

2016-01-27 16:42:17 +03:00

CGameHandler.h

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

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

CMakeLists.txt

Include ZLib headers for launcher and server

2014-10-12 16:33:38 +03:00

CQuery.cpp

Revert 5cd4e852d4 "Use portable cast in CTeleportDialogQuery also"

2016-01-18 10:45:09 +03:00

CQuery.h

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

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

CVCMIServer.cpp

Refactoring: avoid using namespace when it's not absolutely needed

2015-12-29 02:14:08 +03:00

CVCMIServer.h

…

NetPacksServer.cpp

Fix pthread_mutex_lock abort() in requestActionASAP impl

2015-10-31 18:04:06 +03:00

StdInc.cpp

…

StdInc.h

Fix pthread_mutex_lock abort() in requestActionASAP impl

2015-10-31 18:04:06 +03:00

VCMI_server.cbp

revert some project changes

2016-01-27 15:21:29 +03:00

VCMI_server.vcxproj

Migrating to MSVS 2013, which allows to delete inttypes.h file.

2014-08-31 19:08:39 +02:00