DjWarmonger
53c39f7d05
Treasure density and quality now matches OH3.
2014-12-26 19:35:45 +01:00
DjWarmonger
f5f0f61076
Density does not depend on zone size.
2014-12-26 17:13:41 +01:00
DjWarmonger
5fbd856a4c
New rule for placement of unguarded treasures
2014-12-26 16:17:39 +01:00
DjWarmonger
121c39a994
Fixed Jebus and CoD templates.
2014-12-26 15:14:22 +01:00
DjWarmonger
0e3e85bfc1
Updated changelog
2014-12-26 15:07:24 +01:00
DjWarmonger
9962623220
Merge pull request #72 from ArseniyShestakov/fixTradeWindow
...
Small fixes for CTradeWindow
2014-12-26 09:57:40 +01:00
DjWarmonger
4a41d138cc
Update Visual projects.
2014-12-26 09:56:11 +01:00
DjWarmonger
84b2510aa4
Merge pull request #62 from vcmi/SpellsRefactoring4
...
OK
2014-12-26 08:46:29 +01:00
ArseniyShestakov
6ab807f694
Put artifact in different slot if selected is used
...
This one fixes issue 2002.
2014-12-26 01:42:50 +03:00
ArseniyShestakov
27705e1ac6
Fix removal of fully sacrificed stacks from heroes garrison slots
...
This one fixes issue 2010. Though CAltarWindow need proper refactoring.
2014-12-26 01:18:58 +03:00
DjWarmonger
8c471f6359
Merge pull request #69 from ArseniyShestakov/artifactsImprovements
...
Thanks, looks great now.
2014-12-25 20:24:08 +01:00
ArseniyShestakov
aca0eeed86
Fix position of selected unit count in Freelancer's Guild
...
This one fixes issue 2009
2014-12-25 22:03:19 +03:00
DjWarmonger
5271ca156b
Merge pull request #70 from vcmi/StackSplitting
...
Stack splitting
2014-12-25 19:59:02 +01:00
ArseniyShestakov
f71cfdf173
Check if slot locked before pick on Artifact Merchants
...
This one is fixes issue 2007
2014-12-25 19:24:28 +03:00
ArseniyShestakov
04d15174e7
Use switch for CArtHandler::isTradableArtifact
2014-12-25 17:18:37 +03:00
DjWarmonger
0d2879158b
Merge pull request #67 from ArseniyShestakov/fixIssue1912
...
Okay, let's do this.
2014-12-25 14:23:26 +01:00
DjWarmonger
5b8180e327
Cleaning logs.
2014-12-25 12:58:15 +01:00
DjWarmonger
51495381ef
Better obstacle shapes inside zones.
2014-12-25 10:24:48 +01:00
DjWarmonger
e46f03fabe
Upgrades, stack splitting. Results now are identical to OH3.
2014-12-25 10:21:39 +01:00
ArseniyShestakov
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
ArseniyShestakov
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
ArseniyShestakov
3371cd36c9
Fix check of 22 artifacts limit on Altar of Sacrifice
...
Partially fix for issue 558
2014-12-25 06:17:26 +03:00
DjWarmonger
3c39ef477f
Implemented original stack splitting algorithms proposed by AlexSpl. Save format changed.
2014-12-24 23:53:56 +01:00
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
6f7bda65b4
Better obstacle shapes inside zones.
2014-12-24 15:07:20 +01:00
DjWarmonger
b208ebbee9
Increase treasure density to match OH3.
2014-12-24 14:01:05 +01: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
AlexVinS
eebf65e88f
Merge branch 'develop' into SpellsRefactoring4
2014-12-24 00:15:27 +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
ArseniyShestakov
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
