games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Code Issues Releases Activity
4,363 Commits 19 Branches 63 Tags 113 MiB
7289dbafa9
Commit Graph

4363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
jcrada
a4f98a9ebd Upgraded to FuzzyLite version 5.0 2014-10-25 16:13:20 +02:00
josch
101ac04c13 Replaced embedded copy of fuzzylite with fuzzylite 5.0 
- retrieved from
   https://github.com/fuzzylite/fuzzylite/archive/v5.0.tar.gz
 - only modification to tarball content was the removal of the examples
   directory
 - fuzzylite release 5.0 tags fuzzylite git commit c11556f
 2014-10-25 16:00:44 +02:00
josch
fab31642d9 prepare for update to fuzzylite 5.0 
- use system version of fuzzylite if available
 - adapt include paths
 2014-10-25 16:00:44 +02:00
DjWarmonger
77684a9435 Merge pull request #43 from Mixaill/travis-test 
Merged for Ivan's request.
 2014-10-19 21:33:07 +02:00
DjWarmonger
a7c16fb275 Merge pull request #42 from IlyaPomaskin/patch-2 
Merged for Ivan's request.
 2014-10-19 21:32:57 +02:00
DjWarmonger
41e93a66ce Merge pull request #44 from Mixaill/cmake-msvc 
I don't have time to test it any soon, but most certainly it looks great if works. Very clear and simple guide. Good job.
 2014-10-12 21:09:47 +02:00
Mikhail Paulyshka
e5db7de37d replace CMake ppa 2014-10-12 18:07:44 +03:00
Mikhail Paulyshka
2047a66bd9 install MSVC runtime 
copy libEGL and libGLESv2 only for MSVC
 2014-10-12 18:03:47 +03:00
Mikhail Paulyshka
7d3079e5e7 travis: update CMake 2014-10-12 17:38:29 +03:00
Mikhail Paulyshka
dcba7a6316 move minizip detection to module 2014-10-12 16:50:39 +03:00
Mikhail Paulyshka
0541b544c4 fix minizip build error for MSVC 2014-10-12 16:41:05 +03:00
Mikhail Paulyshka
7b7282f52e fix launcher linking problem for MSVC 2014-10-12 16:40:49 +03:00
Mikhail Paulyshka
fff8e10a63 copy libEGL and libGLESv2 for MSVC build 
copy debug version of Qt libraries when build type is debug for MinGW
 2014-10-12 16:40:24 +03:00
Mikhail Paulyshka
514045b259 add settings for MSVC 
small reorganizing in /CMakeLists.txt
 2014-10-12 16:38:53 +03:00
Mikhail Paulyshka
53e2719ca4 update cotire 2014-10-12 16:37:10 +03:00
Mikhail Paulyshka
b8f5a57c64 Include ZLib headers for launcher and server 2014-10-12 16:33:38 +03:00
Mikhail Paulyshka
f5f254f9ba FFMpeg: also find libs in x64/x86 subfolders 2014-10-12 16:32:50 +03:00
Mikhail Paulyshka
ab5e1f9109 don't use separate .rc files for MSVC and MinGW 2014-10-12 16:32:02 +03:00
Michael Pavlyshko
a6f544f009 fix package name 2014-10-11 13:29:30 +03:00
Michael Pavlyshko
2ff557e3b2 fix Clang 3.4 launcher build and probably Clang 3.2 build 2014-10-11 13:21:45 +03:00
Ilya Pomaskin
447979d051 bind -> std::bind 2014-10-10 14:36:35 +04:00
Ivan Savenko
7eff144a9f Replaced Qt5 PPA 
Previous PPA seems to be no longer available. Replacing it with PPA from Canonical.
 2014-10-05 11:48:56 +03:00
DjWarmonger
775d6c41b4 Merge pull request #41 from vcmi/refactoring/initializers 
Works under Visual, merging.
 2014-10-04 08:29:21 +02:00
AlexVinS
54453aee73 get rid of boost::assign 2014-10-04 00:34:13 +04:00
Ivan Savenko
7c70d2e493 Merge pull request #40 from IlyaPomaskin/patch-1 
Fixing Mac OS building issues
 2014-10-03 22:02:21 +03:00
AlexVinS
66b022f93e initializer lists part1 2014-10-02 19:43:46 +04:00
AlexVinS
463b9e46b3 Cleanup 
* WIN64 video should work with ffmpeg
* brace-initialization syntax is now allowed (TODO get rid of boost::assign)
 2014-10-02 18:23:22 +04:00