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
DjWarmonger
6463c33c26
Rewrite / update terms for TacticalAdvantage.
2014-11-28 14:17:17 +01:00
DjWarmonger
9ca991282a
Taken JCrada patch as it is.
2014-11-27 21:51:48 +01:00
ArseniyShestakov
f2aedabcb3
Fix slider remain enabled when not needed for changed label text
...
This one fix issue with map description label #1977
2014-11-24 16:18:10 +03:00
ArseniyShestakov
0e346a4f0d
Reset mapDescription scrolling position on change of map / save
...
This one fixes bug #1974
2014-11-24 15:56:33 +03:00
ArseniyShestakov
53c7a3cfcb
Added function CSlider::moveToMin
2014-11-24 15:24:03 +03:00
AlexVinS
bddf662178
Few tweaks to bonus descriptions
2014-11-24 12:44:46 +03:00
AlexVinS
85a4b725f5
[Creature window] 2-line bonus description
2014-11-24 12:44:45 +03:00
DjWarmonger
49c8137f6f
Merge pull request #60 from ArseniyShestakov/saveMenuListFix
...
Fix invisible save select when click on save name area #944
2014-11-23 10:42:17 +01:00
ArseniyShestakov
6fd0f76547
Fix invisible save select when click on save name area
2014-11-23 08:51:48 +03:00
DjWarmonger
b0cd4f4117
Added limits and assertions which show that fuzzy engine is completely bugged.
2014-11-22 18:57:17 +01:00
DjWarmonger
9e5cc2d1b1
Treasure piles will prefer to grow upwards to make space for object accessible from bottom.
2014-11-22 14:17:53 +01:00
DjWarmonger
91d89add7c
Reverted RMG bug introduced in 6da79d01d7
2014-11-22 13:01:28 +01:00
DjWarmonger
c094e70784
Replaced legacy sprintf with boost::format.
2014-11-22 12:45:13 +01:00
DjWarmonger
4b02af23e1
Merge pull request #55 from KroArtem/develop
...
Merging, thanks!
2014-11-20 16:00:38 +01:00
KroArtem
6da79d01d7
reverted changes back
2014-11-20 15:33:22 +03:00
KroArtem
305ce5b53d
fixed else statement
2014-11-20 15:14:16 +03:00
Ivan Savenko
7d429247ab
Merge pull request #57 from josch/includeFuzzyliteCPP11Headers
...
add FL_CPP11 preprocessor define independent of which fuzzylite is used
2014-11-18 19:25:05 +02:00
Ivan Savenko
ffd5867913
Merge pull request #58 from josch/kFreeBSDandHurdSupport
...
FreeBSD and HURD support
2014-11-18 19:24:50 +02:00
Ivan Savenko
b73edea856
Merge pull request #59 from adrianlang/patch-1
...
vcmibuilder: Support another root directory
2014-11-18 19:22:56 +02:00
Adrian Lang
a939518950
vcmibuilder: Support another root directory
...
On my disk (HoMM 3 Complete Version 4.0 September 2000), LangInde_Program_Files is the root directory.
2014-11-18 09:55:27 +01:00
KroArtem
82b278307f
fixed typo
2014-11-17 23:08:08 +03:00
DjWarmonger
2126939c98
Merge pull request #56 from ArseniyShestakov/develop
...
Simplest solutions are usually the best ;)
2014-11-17 17:14:57 +01:00
josch
5c356f4415
add support for the HURD
2014-11-17 16:43:26 +01:00
josch
a96b5e7905
add support for FreeBSD
2014-11-17 12:25:10 +01:00
josch
c36042f8c7
rename preprocessor variable VCMI_LINUX to VCMI_XDG
...
- the variable is only used to enable XDG support
- XDG is not exclusive to linux
2014-11-17 12:19:52 +01:00
josch
2812334de9
add FL_CPP11 preprocessor define independent of which fuzzylite is used
2014-11-17 11:42:30 +01:00
ArseniyShestakov
4dd1ca5e78
Fix bonuses of Rampart's Treasury and Fountain of Fortune
...
Change IDs of two special buildings in Rampart to make them identical with one in config files / game assets.
Original code was introduced in 0ca9f64
2014-11-17 03:26:18 +03:00
KroArtem
e73c60740c
corrected text in vcmibuilder, corrected errors and warnings from cppcheck
2014-11-16 20:48:29 +03:00
AlexVinS
885b495cf4
[Creature window] Fix creature art dismount possibility
2014-11-15 21:54:45 +03:00
AlexVinS
c43b218d64
Fix duplicate MR bonus display
2014-11-15 20:39:21 +03:00
AlexVinS
68d1105233
Fix creature window not showing bonus description
2014-11-15 20:22:50 +03:00
AlexVinS
4c5c83aa1f
Re add ERM to workspace
...
* To keep track of successful build
2014-11-14 07:48:56 +03:00
AlexVinS
b7ed11f582
Fix ERM build
...
(-) there is one regression, but ERM is unused yet
2014-11-14 07:45:44 +03:00
AlexVinS
81fb2ae584
Fix crash when casting firewall-like spells after creature casting
...
#1910
2014-11-14 04:12:50 +03:00
AlexVinS
7a429fc38b
Revert @24efb9b4
2014-11-14 03:29:11 +03:00
AlexVinS
8979de7960
Fix issue #1843 (teleport case)
2014-11-14 03:07:14 +03:00
Ivan Savenko
dce9880d16
Minor refactoring of FunctionList using variadic templates.
...
Please make sure that all supported compilers are OK with this code
2014-11-12 22:46:37 +02:00
