games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity
4,490 Commits 22 Branches 70 Tags
de6752c048723f49f166cb34d28116ed7fe9dc5e
Commit Graph

4490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 0.97 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
DjWarmonger
ce83db0f43 - Option to configure monster types spawning in a zone 
- 25% chance to get neutral faction in zone with no town
 2014-10-30 13:03:53 +01:00
DjWarmonger
530a3e69bf Option to allow / ban certain types of town in a template. 2014-10-30 10:00:29 +01:00
DjWarmonger
7289dbafa9 Fixed #1871 2014-10-29 16:40:52 +01:00
DjWarmonger
021eb4b5b5 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-10-28 19:06:09 +01:00
DjWarmonger
b518fd6ea6 Added graphics for GENERAL_DAMAGE_REDUCTION bonus. Files are now in vcmi mod. 2014-10-28 19:04:34 +01:00
AlexVinS
f16e859242 [C::B] update FL project 2 2014-10-27 15:17:40 +03:00
AlexVinS
49b1b6559d [C::B] update FL project 2014-10-27 14:46:20 +03:00
DjWarmonger
06983fc346 Fixed issue with empty mage guild on random maps. 2014-10-26 13:09:59 +01:00
DjWarmonger
c87f2cdaaf Updated build for MSVS. Some compile fixes to FuzzyLite source. 2014-10-26 12:32:19 +01:00
Mikhail Paulyshka
168bcf7c09 fix compilation with old glibc 2014-10-26 13:20:16 +03:00
DjWarmonger
8bf413e0c5 Restored Visual and Code::Blocks projects wiped by previous merge. 2014-10-26 10:49:05 +01:00
DjWarmonger
1f5643be55 Merge pull request #45 from josch/fuzzylite5.0_josch 
Ok, I will try to integrate this now.
 2014-10-26 10:32:18 +01:00
DjWarmonger
4dd1c7ff2c Merge pull request #46 from linuxrocks123/pleasepull 
Okay, looks good. I hope this one won't cause any new issues with save/load.
 2014-10-26 08:47:18 +01:00
Patrick Simmons
436272f00c Fix pathfinding bug. 2014-10-25 21:15:40 -04:00
Patrick Simmons
ec590b9428 Legion artifact bugfixes 2014-10-25 19:09:21 -04:00
Patrick Simmons
407755ee77 Minor multiplayer load bugfixes 2014-10-25 19:05:50 -04:00
Patrick Simmons
1dabdf7b3a Minor fixes to multiplayer load game support 2014-10-25 19:05:50 -04:00
Patrick Simmons
6aa3c11084 SUCCESS! 2014-10-25 19:05:49 -04:00
Patrick Simmons
7babdccd59 This is very wrong but works better than anything else I've tried. 2014-10-25 19:05:49 -04:00
Patrick Simmons
41da0ad2e6 multiplayerload changes (committing so I can revert...) 2014-10-25 19:05:49 -04:00
Patrick Simmons
3685e96042 Revert "multiplayer load changes" 
This reverts commit 368d2c8836cc6e3b5af9cf71e892bf4515f26bda.
 2014-10-25 19:05:49 -04:00
Patrick Simmons
99a63c4bbd multiplayer load changes 2014-10-25 19:05:49 -04:00
Patrick Simmons
cfa6f46d62 VERY buggy, unusable, but progress is being made... 2014-10-25 19:05:49 -04:00
Michael Pavlyshko
d0e82caaf3 fix package name 2014-10-25 19:05:49 -04:00
Michael Pavlyshko
a734ad072b fix Clang 3.4 launcher build and probably Clang 3.2 build 2014-10-25 19:05:49 -04:00
Ilya Pomaskin
ff12aca83a bind -> std::bind 2014-10-25 19:05:49 -04:00