1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-26 08:41:13 +02:00
Commit Graph

4432 Commits

Author SHA1 Message Date
ArseniyShestakov
6fd0f76547 Fix invisible save select when click on save name area 2014-11-23 08:51:48 +03: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 with those two IDs likely was typo. As result Fountain of Fortune +2 luck bonus was given to Treasury and Treasury's weekly bonus didn't worked at all.
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
Ivan Savenko
a3d4f9d22f Fixed conversion warnings caused by Qt 2014-11-12 22:46:36 +02:00
AlexVinS
24efb9b413 SpellHandler: add more error checking + cleanup. 2014-11-12 03:48:11 +03:00
AlexVinS
c4fdca45d9 Small cleanup 2014-11-12 03:48:10 +03:00
Ivan Savenko
356b6ab34a A bit delayed, but still - Linux version bump 2014-11-11 22:59:26 +02:00
Alexander Shishkin
0b1ee70e56 Merge pull request #54 from xyzz/fix_cgpregame_runlocked_crash
Fixed crash, "pure virtual method called", when calling doUpdate lambda from CGPreGame
2014-11-11 04:07:54 +03:00
Ivan Savenko
2692150efc Merge pull request #52 from josch/launcherNoAutoCheckRepositories
Launcher: do not automatically check remote repositories
2014-11-10 19:51:14 +02:00
Ilya Zhuravlev
b22973e717 Fixed crash, "pure virtual method called", when calling doUpdate lambda from CGPreGame. 2014-11-10 20:21:39 +03:00
josch
b962e11bd7 Launcher: add setting allowing not to automatically check remote repositories
- add a button to the launcher which allows manual downloading
 - add a configuration option autoCheckRepositories to launcher settings
 - add ui elements to settings dialog to change autoCheckRepositories
2014-11-10 08:21:47 +01:00
Ivan Savenko
176e029cd1 Merge pull request #53 from xyzz/fix_1907
Fixed "Hex grid" button crash, partially fixes 1907.
2014-11-09 16:00:54 +02:00
AlexVinS
53016300ca Restore files accidentely deleted in 01491f9f1e 2014-11-06 22:23:49 +03:00
AlexVinS
4e9cff3403 spelling fix 2014-11-06 15:06:16 +03:00
AlexVinS
34ffdb5981 small cleanup 2014-11-06 14:28:34 +03:00
AlexVinS
5e42fb8a2a [MinGW]FL build fix 2014-11-05 03:34:14 +03:00
Ilya Zhuravlev
62a3dfb086 Fixed "Hex grid" button crash, partially fixes 1907. 2014-11-04 15:34:30 +03:00
DjWarmonger
3e724bc564 Merge pull request #51 from Mixaill/fuzzylite-fix-3
Fix fuzzylite compilation, again
2014-11-03 17:41:30 +01:00
Mikhail Paulyshka
d0da88a515 define FL_CPP11 outside Fuzzylite source 2014-11-03 01:00:22 +03:00
Mikhail Paulyshka
7887a750cf suppress some warnings 2014-11-02 23:43:40 +03:00
Mikhail Paulyshka
941dcee0f5 Fix AI and VCAI CMakeLists.txt 2014-11-02 23:43:10 +03:00
Mikhail Paulyshka
a867faae1e use vanilla Fuzzylite 2014-11-02 23:41:41 +03:00
DjWarmonger
229ef66699 Fix for MSVS project. 2014-11-02 18:07:32 +01:00
DjWarmonger
fc2355f60a Merge pull request #50 from xyzz/android-build-fix
Looks like it can't break anything, feel free to sumbit Android pacthes since you have direct access ;)
2014-11-02 15:59:30 +01:00
Ilya Zhuravlev
3eb3996241 Fix android build. 2014-11-02 16:19:14 +03:00