 DjWarmonger
|
8f1fba9551
Merge pull request #146 from vcmi/feature/VCMIMapFormat1
|
9 vuotta sitten |
 Arseniy Shestakov
|
9428f865d3
CGTownInstance: erase all stacks when town is captured by enemy
|
9 vuotta sitten |
|
Arseniy Shestakov
|
d15106bf63
CGTownInstance: implement armies merging on siege. Fix issue 169
|
9 vuotta sitten |
 AlexVinS
|
dd1aabbe23
Use JsonSerializeFormat for map objects
|
9 vuotta sitten |
|
AlexVinS
|
6e205a58b4
Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1
|
9 vuotta sitten |
 Vadim Markovtsev
|
3926920103
Rename radious -> radius
|
9 vuotta sitten |
|
AlexVinS
|
f9d0b20234
CGMine, CGArtifact, CGGarrison serialization
|
9 vuotta sitten |
 Ivan Savenko
|
90dfe3e782
reduced visibility for members of Mine and Dwellings
|
10 vuotta sitten |
|
Vadim Markovtsev
|
e4b1ef1405
Add "override" to virtual overriden methods
|
10 vuotta sitten |
 AlexVinS
|
8f2da66a18
fix mantiss 1967 + some refactoring
|
10 vuotta sitten |
 Sandy Carter
|
bdee647525
CastleInterface: Exclude previous building upgrade in reqs
|
10 vuotta sitten |
|
DjWarmonger
|
9e7b459882
Partial solution to #2206
|
10 vuotta sitten |
|
AlexVinS
|
54453aee73
get rid of boost::assign
|
11 vuotta sitten |
|
Ivan Savenko
|
d1dd7eef48
Proper fix for #1712 - Building requirement tests are now fixed
|
11 vuotta sitten |
|
DjWarmonger
|
57fa905a2b
Something that compiles.
|
11 vuotta sitten |
|
Ivan Savenko
|
32240da34e
Reduced number of #include's in headers. May break compilation on Win
|
11 vuotta sitten |
|
Ivan Savenko
|
a0689fa377
Refactoring of hoverText from objects:
|
11 vuotta sitten |
|
Ivan Savenko
|
5ebc0e8614
First part of object instance API cleanup
|
11 vuotta sitten |
|
DjWarmonger
|
79036484dd
Trying to sort out project changes and compile issues.
|
11 vuotta sitten |
|
Ivan Savenko
|
b2e8c92383
Cleanup:
|
11 vuotta sitten |
|
Ivan Savenko
|
652ceb2bde
Finally shattered CObjectHandler.cpp into tiny bits
|
11 vuotta sitten |
