1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Commit Graph

4491 Commits

Author SHA1 Message Date
ArseniyShestakov
4cb98e7e8d Use isTradable and fix issue 1392
This change make it possible to sell spell scrolls in Artifacts Merchant.
2014-12-24 20:48:37 +03:00
ArseniyShestakov
de6752c048 Implement CArtHandler::isBigArtifact and CArtifact::isTradable 2014-12-24 20:43:35 +03:00
ArseniyShestakov
937ef0227b Use ArtifactID instead of int when possible 2014-12-24 18:49:12 +03:00
DjWarmonger
5995c975d3 Merge pull request #68 from ArseniyShestakov/smallFixesGUI
This looks innocent enought to be pulled. Thanks!
2014-12-24 08:50:54 +01:00
ArseniyShestakov
edccd60564 Tiny improvement for resources selection boxes
This one is related to issue 562
2014-12-24 03:22:48 +03:00
ArseniyShestakov
36e05402d8 Fix text label and location on sell articacts windows
This one fixes issue 1998
2014-12-24 03:21:28 +03:00
ArseniyShestakov
150c8425f5 Fix town income on View Towns screen
This is fix issue 1996
2014-12-24 00:39:48 +03:00
DjWarmonger
75d407b59a Last improvements - zones on simpler maps should not be smashed. 2014-12-23 18:16:53 +01:00
DjWarmonger
53b3ea8d97 Final update for zone placer. 2014-12-23 14:26:14 +01:00
DjWarmonger
0dbfee0edb Final shape of algorithm 2014-12-23 13:49:07 +01:00
DjWarmonger
990e38e961 Fixes for placement. 2014-12-23 12:42:59 +01:00
DjWarmonger
868d2f61ee New zone placement algorithm 2014-12-23 11:39:41 +01:00
DjWarmonger
0e34775770 Important fix. 2014-12-23 10:42:01 +01:00
ArseniyShestakov
94d0e5486a CSplitWindow: added input check
This one fixes issue 1952
2014-12-23 07:38:58 +03:00
ArseniyShestakov
8a697f2ba3 Fix disabling of dismiss button for last troop
Fix issue 1994
2014-12-23 07:12:42 +03:00
ArseniyShestakov
79cdabe3aa CCreatureWindow: correct caption for "Ok" button
This one is fixes issue 1396
2014-12-23 07:10:33 +03:00
DjWarmonger
875bfb025e Better fitness function(s) 2014-12-22 23:35:19 +01:00
DjWarmonger
b52eeb2263 Remember "best" placement at right moment. 2014-12-22 21:47:19 +01:00
DjWarmonger
067b56dda4 Zone placer will remember the best solution, not the last generated. 2014-12-22 21:33:37 +01:00
DjWarmonger
208ca224a1 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-12-22 19:45:05 +01:00
DjWarmonger
94c0d5896f [MVS] Added /LTCG option to improve linker performance. 2014-12-22 19:44:15 +01:00
DjWarmonger
083c80c98b Merge pull request #66 from vcmi/experimental/serializerrefactoring
Works with MVS, merging.
2014-12-22 19:28:43 +01:00
DjWarmonger
7735e193f0 Merge branch 'develop' into experimental/serializerrefactoring 2014-12-22 19:17:40 +01:00
AlexVinS
2b88a914ff Fix client build
* use regular overloaded methods for client serialization.
(serialize template not needed if connection.h already included and save/load code is different)
2014-12-21 22:33:20 +03:00
AlexVinS
74161198c4 More refactoring 2014-12-21 21:47:02 +03:00
AlexVinS
b86938de5e More rafactoring 2014-12-21 18:22:12 +03:00
AlexVinS
c57b2403e1 Refactor metaprogramming-helper structs 2014-12-21 17:53:51 +03:00
AlexVinS
3bca68fd2d Initial refactoring
* reduce registerTypes* templtates instantiation
2014-12-21 17:29:42 +03:00
DjWarmonger
da76a2f227 Fixed AI trying to visit tile already occupied by different hero, including #1902. 2014-12-21 14:50:26 +01:00
DjWarmonger
c538370c5d Players will be always able to see their owned heroes and other objects. Fixes #1959. 2014-12-21 13:56:32 +01:00
DjWarmonger
af02655b30 Fixed #1962 2014-12-21 11:33:53 +01:00
DjWarmonger
fee2184996 Wood & ore mines will be placed close to zone center. 2014-12-20 22:13:10 +01:00
DjWarmonger
485b2ac688 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-12-20 15:17:22 +01:00
DjWarmonger
50dc22fa1b Tuned density. 2014-12-20 14:52:01 +01:00
DjWarmonger
3886a19771 More balanced treasure pile distribution. 2014-12-20 14:01:48 +01:00
DjWarmonger
df8289eee4 Merge pull request #65 from vcmi/fuzzyFix
Fuzzy fix
2014-12-19 20:25:34 +01:00
DjWarmonger
a823fae822 Fixed NaNs in FuzzyHelper::getTacticalAdvantage 2014-12-19 19:15:41 +01:00
DjWarmonger
a3a42ae144 Merge branch 'develop' of https://github.com/vcmi/vcmi into fuzzyFix 2014-12-19 14:21:44 +01:00
DjWarmonger
6fc873dcd5 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-12-19 14:14:18 +01:00
DjWarmonger
cb5a3c0f73 Fixed shortage of Prisons on random maps. 2014-12-19 14:04:59 +01:00
DjWarmonger
cd060c00c5 Each fuzzy set of rules will use separate fuzzy engine. 2014-12-19 10:52:41 +01:00
DjWarmonger
a1e42caddd Banks won't use fuzzy engine at all, only center of mass. 2014-12-10 12:29:51 +01:00
DjWarmonger
5beaf42ebc Merge pull request #64 from ArseniyShestakov/fixCartographerCrash
Fix crash on stalagmite Cartographer if there is no underground level
2014-12-09 12:58:46 +01:00
ArseniyShestakov
6391f0f85a Fix crash on Cartographer if there is no underground level
Show "already visited" text for stalagmite cartographer if map don't have underground level.
This one fixes bug #1985
2014-12-09 14:01:32 +03:00
DjWarmonger
7adb0fd600 Fuzzy engine fix by Jcrada. 2014-12-05 09:28:58 +01:00
Ivan Savenko
2dd5145796 Merge pull request #61 from ArseniyShestakov/fixMapDescription
Fixes for two visual map description bugs
2014-12-02 22:55:57 +02:00
Ivan Savenko
a472199812 Merge pull request #63 from josch/vcmibuilder_case_insensitive
let data, maps and mp3 directory be truly case insensitive
2014-12-02 22:54:27 +02:00
AlexVinS
499a281dfe Disallow rising spells for genie 2014-11-28 21:08:34 +03:00
AlexVinS
e583f4e44d Fix #1928
* disallow geneie to cast teleport
2014-11-28 20:39:23 +03:00
josch
e946769b42 let data, maps and mp3 directory be truly case insensitive 2014-11-28 17:43:16 +01:00