games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity
4,594 Commits 20 Branches 62 Tags 110 MiB
fe180335de
Commit Graph

4594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DjWarmonger
fe180335de Important fix that prevents treasures from sealing off, adding too many blocked tiles. 2015-01-15 11:21:29 +01:00
DjWarmonger
9f05f53e65 Corrected monster agressiveness #2034 2015-01-10 10:23:58 +01:00
DjWarmonger
c22c3cdd80 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2015-01-08 07:15:26 +01:00
ArseniyShestakov
af8b030810 Fix skills learning in Universities 
This one fixes 1945 and 1991
 2015-01-07 18:33:09 +03:00
DjWarmonger
a6bf55227d Merge pull request #74 from ArseniyShestakov/fixHillFortCrashIssue1899 
Thanks :) WIll grant you direct access since you know what you're doing.
 2015-01-07 12:51:12 +01:00
ArseniyShestakov
3466457d69 Fix crash on opening of Hill Fort window and attempt to upgrade one stack 
This one fixes issue 1899
 2015-01-07 13:10:48 +03:00
AlexVinS
8deee7610c CMapGenerator.cpp: remove unused variables 2015-01-03 01:04:42 +03:00
DjWarmonger
7055357996 Fixed spell scroll generation #2024 2015-01-02 23:01:14 +01:00
DjWarmonger
8e99e803c1 Post-release version bump. 2014-12-27 10:34:16 +01:00
DjWarmonger
850350e402 Savegame bump. To be released as 0.97b. 2014-12-27 09:48:16 +01:00
Alexander Shishkin
4967403998 Merge pull request #73 from ArseniyShestakov/fixCreatureInfoCrash 
Fix crash in battle I introduced in 8a697f2
 2014-12-27 06:57:24 +03:00
ArseniyShestakov
ceb5da44d1 This fixes crash in battle I introduced in 8a697f2 
dismissInfo do not present when createButtonPanel used inside the battle.
 2014-12-27 06:29:09 +03:00
DjWarmonger
fdd392e47c Add some space around unguarded treasures. 2014-12-26 21:13:13 +01:00
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