Ivan Savenko b551bdb725 Final part of the merge ...

Merging VCMI Dirs refactoring + GUI refactoring with current develop

2014-09-04 20:59:07 +03:00

..

CArmedInstance.cpp

Trying to sort out project changes and compile issues.

2014-06-23 19:58:19 +02:00

CArmedInstance.h

VCMIDirs update #4

2014-08-11 20:17:17 +02:00

CBank.cpp

Fixed missing names for dwellings and creature banks

2014-06-30 00:16:45 +03:00

CBank.h

VCMIDirs update #4

2014-08-11 20:17:17 +02:00

CGHeroInstance.cpp

Swapped skills on level-up screen

2014-08-19 13:15:40 +03:00

CGHeroInstance.h

VCMIDirs update #4

2014-08-11 20:17:17 +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

VCMIDirs update #4

2014-08-11 20:17:17 +02:00

CGTownInstance.cpp

Fixed crash on visiting multi-creature dwellings (1874)

2014-08-19 13:16:25 +03:00

CGTownInstance.h

Proper fix for #1712 - Building requirement tests are now fixed

2014-08-07 19:53:07 +03:00

CObjectClassesHandler.cpp

Fixed sound on object pickup with dialog

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

CObjectClassesHandler.h

Fixed sound on object pickup with dialog

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

CObjectHandler.cpp

Added workaround for random objects on water, fixes 1828

2014-08-09 13:48:38 +03:00

CObjectHandler.h

VCMIDirs update #4

2014-08-11 20:17:17 +02:00

CommonConstructors.cpp

Fixed crash on visiting multi-creature dwellings (1874)

2014-08-19 13:16:25 +03:00

CommonConstructors.h

Miscellaneous fixes to banks:

2014-08-09 12:31:43 +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 visitable objects resetting on day 7 (1847)

2014-08-08 15:53:04 +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

Merged GUI refactoring into develop, fixed conflicts

2014-08-09 15:01:55 +03: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

Fixed desync due to uninitialized objects. Added some logging. RMG maps don't work yet, though.

2014-07-27 19:30:17 +02:00

MiscObjects.h

Fixed desync due to uninitialized objects. Added some logging. RMG maps don't work yet, though.

2014-07-27 19:30:17 +02:00

ObjectTemplate.cpp

Corrected y-axis orientation, now object placement is correct.

2014-07-09 16:39:17 +02:00

ObjectTemplate.h

- Implemented object per zone limit

2014-07-15 22:33:51 +02:00