1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Commit Graph

4428 Commits

Author SHA1 Message Date
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
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
DjWarmonger
e3d968e284 Generate Grail to not crash at Obelisks. 2014-09-21 21:51:51 +02:00
Ivan Savenko
fc16c8d207 Merge branch 'optimization/swiftAI' into develop
Conflicts:
	lib/CGameState.cpp
2014-09-21 22:31:29 +03:00
Ivan Savenko
3f7ddd719b Updated changelog to inlude all notable changes 2014-09-21 22:20:39 +03:00
Ivan Savenko
0b6d94f113 Updated vcmibuilder:
- disabled download command (will re-enable near release)
- removed no longer necessary vcmi package handling
- removed wog installation since it can be installed from Launcher
2014-09-21 22:01:07 +03:00
DjWarmonger
5cb6eaa252 Fixed major RMG bug. 2014-09-21 20:57:42 +02:00
Ivan Savenko
aa0433228a Fixed cheats - sendMesssage will also pass current object.
Workaround-ish but should work. Branch should be fixed now.
2014-09-21 20:35:53 +03:00
Ivan Savenko
c4fc8f08c0 Moved assertions before variable is used 2014-09-21 18:25:52 +03:00
Ivan Savenko
4bb5784922 Fixing AI - dwelling visitation code should now work properly 2014-09-21 18:08:47 +03:00
DjWarmonger
e77f328844 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-09-21 16:08:31 +02:00
Ivan Savenko
b67618ab53 First batch of AI fixes:
- wiped not actually used set/get selection
- replaced isReachable with VCAI::isAccessible
2014-09-21 17:03:20 +03:00
DjWarmonger
147ca72f65 Fixed RMG Prisons. 2014-09-21 15:59:35 +02:00
Ivan Savenko
380c100783 Disabled Nagle algorithm for net packs.
This should significantly reduce TCP delays. On my systems this is ~120ms for server to reply to ~15ms
Possible downside - increased load on network due to possible increase in number of packages due to disabled batching
2014-09-21 16:43:25 +03:00