AlexVinS
a00dbd3dd1
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
...
Conflicts:
lib/CMakeLists.txt
lib/VCMI_lib.cbp
lib/filesystem/CFileInputStream.cpp
lib/filesystem/CZipLoader.cpp
lib/rmg/CRmgTemplateZone.cpp
vcmi.workspace
2016-02-08 10:17:25 +03:00
Zyx-2000
3a1a8e3d47
further refactoring-related changes
2016-01-29 15:16:14 +01:00
AlexVinS
b828f8fa9b
Added checks fro terrain
2015-12-05 12:36:32 +03:00
AlexVinS
877634b3a3
Define public interface of CDrawRoadsOperation
2015-04-03 05:46:14 +03:00
AlexVinS
4c5c83aa1f
Re add ERM to workspace
...
* To keep track of successful build
2014-11-14 07:48:56 +03:00
AlexVinS
2947bdedfc
[c::b] configure Test project dependencies
2014-04-30 22:09:26 +04:00
AlexVinS
0682c2fa60
add Test project to workspace
2014-04-07 08:58:21 +04:00
alexvins
d01b84b460
[mechanics] fix copy-paste errors in magic skill arrays
...
[c::b] few tweaks to configuration
2014-02-15 09:40:33 +00:00
alexvins
a740f7989c
[c::b] update projects, disable PHC for now, +few fixes (still wip)
2014-01-05 17:48:50 +00:00
alexvins
339e1cd98b
[c::b] project file for minizip, lib & client update (wip)
2014-01-03 15:43:54 +00:00
alexvins
5b2f176c27
compile fix
2013-01-21 18:27:00 +00:00
alexvins
4bc2fd5519
[c::b] renamed map subfolder to workaround dependency tracking bug
2013-01-03 12:19:20 +00:00
alexvins
9051731755
[c::b] reorganize workspace
2012-12-24 15:55:19 +00:00
alexvins
406d43dc27
[c::b] update workspace
2012-12-20 14:04:34 +00:00
alexvins
bdc373227e
[c::b] add BattleAI to workspace
2012-09-22 12:41:40 +00:00
alexvins
7087be1f02
C::B project files initial import
...
+ workspace file (not include ERM and Battle AI)
+ project files
* svn:ignore setup
2012-09-15 18:44:55 +00:00
beegee1
2f5d6f2684
* CHexField renamed to CBattleHex
...
* CHexFieldControl renamed to CClickableHex
* CCreatureAnimation.cpp/.h moved to BattleInterface/CCreatureAnimation.cpp/.h
* Removed unused project files
* Added VCMI_client filters file for VS 2010
* Gathered common parts of StdInc.h in Global.h
* Boost.Spirit has been included in PCH for ERM project
* StopWatch renamed to CStopWatch
* GuiBase.cpp split up in UIFramework/...
2011-12-17 18:59:59 +00:00
Michał W. Urbańczyk
a113a8d289
* patch update from Dikamilo
2009-02-08 16:36:53 +00:00
Michał W. Urbańczyk
dd36cfce50
Patch from Dikamilo:
...
* compatibility fixes for MinGW
* Code::Blocks project files
2009-02-08 15:39:26 +00:00
