1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

4340 Commits

Author SHA1 Message Date
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
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
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
Ilya Pomaskin
67506144ae Fixing Mac OS building issues 2014-10-01 17:47:37 +04:00
DjWarmonger
f7882135e6 More random paths within zones. 2014-10-01 14:56:06 +02:00
DjWarmonger
01491f9f1e Fixed #1718 2014-10-01 14:20:00 +02:00
DjWarmonger
95e442898e Fixed #1900 2014-10-01 13:26:04 +02:00
DjWarmonger
c832eab172 Fixed #1909 2014-10-01 11:38:03 +02:00
DjWarmonger
e40818f2c6 Fixed incorrect treasure distance on underground maps. 2014-09-26 13:19:39 +02:00
DjWarmonger
59ab30751c - Version set to 0.96b
- Updated changelog
2014-09-26 07:40:51 +02:00
DjWarmonger
c5bbf62093 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-09-23 21:43:35 +02:00
DjWarmonger
1f7ce7c1d9 Cut area around towns to prevent sealing off parts of zone. 2014-09-23 21:12:10 +02:00
DjWarmonger
df9d2f8d8f A bit smarter algorithm for cutting paths. 2014-09-23 18:32:32 +02:00
Ivan Savenko
6768237aae Disabled build configuration that fail too often
Should be re-enabled once we will fix that huge memory usage.
2014-09-23 18:50:37 +03:00
DjWarmonger
87ecd0075e Even tighter obstacles. 2014-09-23 16:53:26 +02:00
Ivan Savenko
6aef70eca1 Fixed animation order in lucky attacks. May fix 1891. 2014-09-23 17:30:36 +03:00
Ivan Savenko
84e2f07c18 Disabled monthly reset of banks. Reasoning:
- workaround for 1896 (still needs a fix)
- to match H3 behaviour
2014-09-23 16:06:21 +03:00
Ivan Savenko
a5c3ed080f Fixes 1892 - properly handle animation of dying clones 2014-09-23 16:02:30 +03:00
Ivan Savenko
bfd3aab78d More precise timings for logs (microsecond resolution) 2014-09-23 16:01:43 +03:00
Ivan Savenko
33c0e24940 Fixes 1895 - Properly select upper army for recruitment 2014-09-23 14:28:55 +03:00
DjWarmonger
8e1e8abe90 Default constructors for Scholar, Pandora and Event. 2014-09-23 09:46:31 +02:00
DjWarmonger
3e36d0d88b Possible tweak for underground. 2014-09-22 15:27:42 +02:00
DjWarmonger
b96ab55c4d Tighten obstacles to improve map look and feel. It should be now on pair with original maps :) 2014-09-22 14:46:52 +02:00
DjWarmonger
f3d7c658f0 Ensure distance between treasure piles. 2014-09-22 14:18:01 +02:00
DjWarmonger
0f4608ae01 Nicer treasure piles. 2014-09-22 13:36:55 +02:00
DjWarmonger
035d028d5c Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-09-21 22:20:30 +02:00