1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
vcmi/lib/mapObjects
AlexVinS 195eae48ca Merge branch 'develop' into SDL2
Conflicts:
	client/CPlayerInterface.cpp
2014-07-02 17:15:12 +04:00
..
CArmedInstance.cpp Trying to sort out project changes and compile issues. 2014-06-23 19:58:19 +02:00
CArmedInstance.h Something that compiles. 2014-06-26 22:05:27 +02:00
CBank.cpp Fixed missing names for dwellings and creature banks 2014-06-30 00:16:45 +03:00
CBank.h Something that compiles. 2014-06-26 22:05:27 +02:00
CGHeroInstance.cpp Bugfixing: 2014-06-28 17:21:38 +03:00
CGHeroInstance.h Something that compiles. 2014-06-26 22:05:27 +02:00
CGMarket.cpp Something that compiles. 2014-06-26 22:05:27 +02:00
CGMarket.h Trying to sort out project changes and compile issues. 2014-06-23 19:58:19 +02:00
CGPandoraBox.cpp Something that compiles. 2014-06-26 22:05:27 +02:00
CGPandoraBox.h Something that compiles. 2014-06-26 22:05:27 +02:00
CGTownInstance.cpp Workaround for hero & town issue. Game still crashes elsewhere, though. 2014-07-01 12:07:53 +02:00
CGTownInstance.h Something that compiles. 2014-06-26 22:05:27 +02:00
CObjectClassesHandler.cpp Modding-related bugfixes: 2014-06-30 17:13:01 +03:00
CObjectClassesHandler.h Fixed missing names for dwellings and creature banks 2014-06-30 00:16:45 +03:00
CObjectHandler.cpp Uploading misc tweaks. 2014-07-01 07:07:40 +02:00
CObjectHandler.h Something that compiles. 2014-06-26 22:05:27 +02:00
CommonConstructors.cpp Fixed missing names for dwellings and creature banks 2014-06-30 00:16:45 +03:00
CommonConstructors.h Banks now use new scheme as well 2014-06-22 13:39:40 +03:00
CQuest.cpp Reduced number of #include's in headers. May break compilation on Win 2014-06-25 17:11:07 +03:00
CQuest.h Reduced number of #include's in headers. May break compilation on Win 2014-06-25 17:11:07 +03:00
CRewardableConstructor.cpp Something that compiles. 2014-06-26 22:05:27 +02:00
CRewardableConstructor.h Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-26 20:12:37 +02:00
CRewardableObject.cpp Fixed Faerie Ring bonus, removed unused code 2014-07-01 18:19:51 +03:00
CRewardableObject.h Fixed #1820, better detection of object below cursor that uses same logic as renderer 2014-07-01 17:19:08 +03:00
JsonRandom.cpp Something that compiles. 2014-06-26 22:05:27 +02:00
JsonRandom.h Something that compiles. 2014-06-26 22:05:27 +02:00
MapObjects.h Cleanup: 2014-06-05 20:26:50 +03:00
MiscObjects.cpp Merge branch 'develop' into SDL2 2014-07-02 17:15:12 +04:00
MiscObjects.h Reduced number of #include's in headers. May break compilation on Win 2014-06-25 17:11:07 +03:00
ObjectTemplate.cpp Create random obstacles that match terrain. 2014-06-28 09:46:32 +02:00
ObjectTemplate.h Create random obstacles that match terrain. 2014-06-28 09:46:32 +02:00