Mikhail Paulyshka
275c35491b
Update FFmpeg ppa
2015-01-28 23:07:40 +03:00
Mikhail Paulyshka
201f1e6f2a
Update FFmpeg ppa
2015-01-28 23:06:03 +03:00
Mikhail Paulyshka
9b76ca0b27
Fix compilation with some versions of libavutil
2015-01-28 22:46:28 +03:00
AlexVinS
ba51de8b5f
Merge remote-tracking branch 'remotes/Fayth/mantis-2011' into develop
2015-01-28 09:41:09 +03:00
Fay
4b5b6edd44
Added space between both text entries;
2015-01-26 17:16:39 +01:00
Alexander Shishkin
cb348a266a
Merge pull request #78 from Fayth/mantis-1964
...
Mantis#1964: video looping fix.
2015-01-26 01:34:21 +03:00
Fay
413523956f
Fixed missing info about dealt damage in combat log when there were casualties;
...
Fixed blank row in combat log in the same case;
2015-01-25 18:03:34 +01:00
Fay
b03eb56706
Possibly fixes looping videos;
2015-01-25 14:28:11 +01:00
DjWarmonger
86fde2ba54
Merge pull request #76 from Fayth/mantis-2016
...
Looks much better now :)
2015-01-25 07:49:46 +01:00
Fay
551925b6d7
Added comments;
2015-01-24 23:12:17 +01:00
DjWarmonger
6120b2e72c
Merge pull request #77 from Fayth/mantis-1993
...
Good catch, thanks!
2015-01-24 22:31:19 +01:00
DjWarmonger
60932d9ed0
AI won't ignore owned objects taken by enemies.
2015-01-24 21:38:22 +01:00
Fay
ad8a6c55d7
Fixes #2016 (heroes not possible to be chosen in pregame after switching town selection);
...
Fixes skipping first hero selection when switching them with left arrow;
Fixes redrawing random hero portrait correctly after switching that player to AI;
2015-01-24 21:24:23 +01:00
Fay
72f34a7799
Fixes crash on dropping an artifact on an empty garrison slot;
2015-01-24 00:21:18 +01:00
AlexVinS
a90d603c16
fix modded spell effect not showing
2015-01-18 19:38:35 +03:00
DjWarmonger
0acae7a708
Additional adjustment of zone positions to ensure balanced zone sizes.
2015-01-16 19:28:27 +01:00
DjWarmonger
ba604f4e43
Implemented "junction" zone type.
2015-01-16 17:39:16 +01:00
DjWarmonger
b7386250e9
Fixed fractalized paths inside zones.
2015-01-16 09:40:11 +01:00
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
