KroArtem
305ce5b53d
fixed else statement
2014-11-20 15:14:16 +03:00
KroArtem
82b278307f
fixed typo
2014-11-17 23:08:08 +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
DjWarmonger
dc9082d88c
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2014-11-02 08:21:25 +01:00
DjWarmonger
e2a6008aa4
Removed unnecessary MSVS settings.
2014-11-02 08:20:58 +01:00
DjWarmonger
708d2add51
Merge pull request #49 from Mixaill/fuzzylite-fix-3
...
Fix compilation on non-MSVC compilators (Global.h not found)
2014-11-02 07:40:59 +01:00
Mikhail Paulyshka
53298c1fd1
ad FL_Windows prepocessor definition
2014-11-02 00:44:00 +03:00
Mikhail Paulyshka
f2ed40f0de
fix compilation on non-MSVC compilators (Global.h not found)
2014-11-01 23:40:33 +03:00
DjWarmonger
7374b8a355
Merge pull request #47 from Mixaill/fuzzylite-fix
...
fix fuzzylite compilation with old glibc
2014-11-01 17:05:03 +01:00
DjWarmonger
040fcd30e1
Merged https://github.com/vcmi/vcmi/pull/47
2014-11-01 17:04:51 +01:00
DjWarmonger
333d740aba
Post-release version bump.
2014-11-01 13:57:37 +01:00
DjWarmonger
41acc944a0
Version 0.97. Updated changelog.
2014-11-01 12:57:17 +01:00
DjWarmonger
d280b0ac9f
Cleaned some logs.
2014-11-01 09:52:56 +01:00
DjWarmonger
b61b79b458
For 0.97 release: generate full underground to avoid many issues
2014-10-31 18:47:10 +01:00
DjWarmonger
dd0033b5a4
Zones will now not bounce off map edges too much, should allow more space in the middle of a map.
2014-10-31 17:55:47 +01:00
DjWarmonger
9eeea7299a
- Removed unecessary includes
...
- Fixed town types configured from RMG templates
2014-10-31 17:09:34 +01:00
DjWarmonger
afaf74a05b
Improved zone sizes for two-level maps.
2014-10-31 13:37:23 +01:00
DjWarmonger
7ac3713d32
Significantly improved zone graph placement.
2014-10-31 12:58:55 +01:00
DjWarmonger
697e42dd24
- Fixed several legacy issues with map templates
...
- Added Clash of Dragons 1.2 template
- Temporarily disabled exception when RMG runs out of two-way monoliths (exception was not handled anyway)
2014-10-30 21:23:25 +01:00
