f71cfdf173
Check if slot locked before pick on Artifact Merchants
...
This one is fixes issue 2007
2014-12-25 19:24:28 +03:00
5001fee1c7
Update F21 dependency
...
Added Fedora 21 dependency `qt5-qtbase-devel`
2014-12-25 16:14:03 +01:00
04d15174e7
Use switch for CArtHandler::isTradableArtifact
2014-12-25 17:18:37 +03:00
0d2879158b
Merge pull request #67 from ArseniyShestakov/fixIssue1912
...
Okay, let's do this.
2014-12-25 14:23:26 +01:00
5b8180e327
Cleaning logs.
2014-12-25 12:58:15 +01:00
51495381ef
Better obstacle shapes inside zones.
2014-12-25 10:24:48 +01:00
e46f03fabe
Upgrades, stack splitting. Results now are identical to OH3.
2014-12-25 10:21:39 +01:00
54437a3b19
Fix check of locked artifacts for Altar of Sacrifice
...
This one is explained in issue 2001
2014-12-25 06:27:39 +03:00
046a6fc45a
Visible blocked button for good and evil heroes on Altar of Sacrifice
...
This is expected behaviour as explained in issue 558
2014-12-25 06:20:40 +03:00
3371cd36c9
Fix check of 22 artifacts limit on Altar of Sacrifice
...
Partially fix for issue 558
2014-12-25 06:17:26 +03:00
3c39ef477f
Implemented original stack splitting algorithms proposed by AlexSpl. Save format changed.
2014-12-24 23:53:56 +01:00
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
de6752c048
Implement CArtHandler::isBigArtifact and CArtifact::isTradable
2014-12-24 20:43:35 +03:00
937ef0227b
Use ArtifactID instead of int when possible
2014-12-24 18:49:12 +03:00
6f7bda65b4
Better obstacle shapes inside zones.
2014-12-24 15:07:20 +01:00
b208ebbee9
Increase treasure density to match OH3.
2014-12-24 14:01:05 +01:00
5995c975d3
Merge pull request #68 from ArseniyShestakov/smallFixesGUI
...
This looks innocent enought to be pulled. Thanks!
2014-12-24 08:50:54 +01:00
edccd60564
Tiny improvement for resources selection boxes
...
This one is related to issue 562
2014-12-24 03:22:48 +03:00
36e05402d8
Fix text label and location on sell articacts windows
...
This one fixes issue 1998
2014-12-24 03:21:28 +03:00
150c8425f5
Fix town income on View Towns screen
...
This is fix issue 1996
2014-12-24 00:39:48 +03:00
eebf65e88f
Merge branch 'develop' into SpellsRefactoring4
2014-12-24 00:15:27 +03:00
75d407b59a
Last improvements - zones on simpler maps should not be smashed.
2014-12-23 18:16:53 +01:00
53b3ea8d97
Final update for zone placer.
2014-12-23 14:26:14 +01:00
0dbfee0edb
Final shape of algorithm
2014-12-23 13:49:07 +01:00
990e38e961
Fixes for placement.
2014-12-23 12:42:59 +01:00
868d2f61ee
New zone placement algorithm
2014-12-23 11:39:41 +01:00
0e34775770
Important fix.
2014-12-23 10:42:01 +01:00
94d0e5486a
CSplitWindow: added input check
...
This one fixes issue 1952
2014-12-23 07:38:58 +03:00
8a697f2ba3
Fix disabling of dismiss button for last troop
...
Fix issue 1994
2014-12-23 07:12:42 +03:00
79cdabe3aa
CCreatureWindow: correct caption for "Ok" button
...
This one is fixes issue 1396
2014-12-23 07:10:33 +03:00
875bfb025e
Better fitness function(s)
2014-12-22 23:35:19 +01:00
b52eeb2263
Remember "best" placement at right moment.
2014-12-22 21:47:19 +01:00
067b56dda4
Zone placer will remember the best solution, not the last generated.
2014-12-22 21:33:37 +01:00
208ca224a1
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2014-12-22 19:45:05 +01:00
94c0d5896f
[MVS] Added /LTCG option to improve linker performance.
2014-12-22 19:44:15 +01:00
083c80c98b
Merge pull request #66 from vcmi/experimental/serializerrefactoring
...
Works with MVS, merging.
2014-12-22 19:28:43 +01:00
7735e193f0
Merge branch 'develop' into experimental/serializerrefactoring
2014-12-22 19:17:40 +01:00
5d59bbc0d4
Fix CGBonusingObject serialization
...
Now state of adventure map objects that use this handler will be saved properly and they'll work as indended after save loaded. Affect following objects: Buoy, Swan Pond, Faerie Ring, etc.
2014-12-22 11:56:53 +03:00
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
74161198c4
More refactoring
2014-12-21 21:47:02 +03:00
b86938de5e
More rafactoring
2014-12-21 18:22:12 +03:00
c57b2403e1
Refactor metaprogramming-helper structs
2014-12-21 17:53:51 +03:00
3bca68fd2d
Initial refactoring
...
* reduce registerTypes* templtates instantiation
2014-12-21 17:29:42 +03:00
da76a2f227
Fixed AI trying to visit tile already occupied by different hero, including #1902 .
2014-12-21 14:50:26 +01:00
c538370c5d
Players will be always able to see their owned heroes and other objects. Fixes #1959 .
2014-12-21 13:56:32 +01:00
af02655b30
Fixed #1962
2014-12-21 11:33:53 +01:00
fee2184996
Wood & ore mines will be placed close to zone center.
2014-12-20 22:13:10 +01:00
485b2ac688
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2014-12-20 15:17:22 +01:00
50dc22fa1b
Tuned density.
2014-12-20 14:52:01 +01:00
3886a19771
More balanced treasure pile distribution.
2014-12-20 14:01:48 +01:00
