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
AlexVinS
66b022f93e
initializer lists part1
2014-10-02 19:43:46 +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
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
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
DjWarmonger
87ecd0075e
Even tighter obstacles.
2014-09-23 16:53:26 +02:00
Ivan Savenko
bfd3aab78d
More precise timings for logs (microsecond resolution)
2014-09-23 16:01:43 +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
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
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
Ivan Savenko
6c0c03d74b
Refactoing of pathfinder <-> client/AI interaction to remove dependency on selected hero
...
- finished removal of server-side setSelection
- disabled some broken code (AI & cheats). TODO: fix
2014-09-21 16:42:08 +03:00
Ivan Savenko
78709e223b
Breaking things - trying to remove server-side knowledge of selected objects
2014-09-19 00:18:49 +03:00
DjWarmonger
a17e27bfc6
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2014-09-18 14:43:37 +02:00
DjWarmonger
495c39304d
Fixed crash due to incorrect RMG options.
2014-09-18 14:29:57 +02:00
Ivan Savenko
9a4aa8749f
Fall back to first available resolution if config contains invalid value.
...
Fixes crash on starting game with unavailable resolution
2014-09-18 14:20:53 +03:00
DjWarmonger
e0e83b6a0b
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2014-09-17 11:12:18 +02:00
DjWarmonger
36a7cff998
Cleaning error messages at access to players.
2014-09-17 11:03:53 +02:00
AlexVinS
22deb07b66
[c::b] update prejects, fix build
2014-09-11 17:53:25 +04:00
DjWarmonger
d9273b3b2a
Cleaning logs.
2014-09-10 19:09:48 +02:00
DjWarmonger
228700b1a7
Create vcmi folder if there's no existing.
2014-09-08 15:15:36 +02:00
DjWarmonger
3f49860d13
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2014-09-05 15:59:29 +02:00
Ivan Savenko
b551bdb725
Final part of the merge
...
Merging VCMI Dirs refactoring + GUI refactoring with current develop
2014-09-04 20:59:07 +03:00
Ivan Savenko
de9c5b1af7
Merge branch 'develop' of github.com:karol57/vcmi into karol57-develop
2014-09-04 20:29:24 +03:00
Ivan Savenko
1647b3670c
Merge pull request #35 from rhn/rhn
...
Fixes to sound handling.
2014-09-04 20:26:32 +03:00
karol57
864fa0388f
Android fix
2014-09-02 19:18:47 +02:00
josch
9bef590960
use system version of minizip
2014-09-02 17:00:20 +02:00
DjWarmonger
fe922605ce
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2014-09-01 10:37:03 +02:00
DjWarmonger
0edaf4fa8a
Merge pull request #26 from vcmi/FFMpeg
...
Let's do this, way too many branches running now.
2014-09-01 10:35:30 +02:00
Karol
b2a140149c
Minor fixes #2
...
- ChangeLog update
- Updated code for other platforms in CGameInterface
2014-08-31 23:02:52 +02:00
DjWarmonger
8b10f70afd
Migrating to MSVS 2013, which allows to delete inttypes.h file.
2014-08-31 19:08:39 +02:00
Karol
80998b9dc3
Minor fixes. fix
...
- Brrr... VS is idiotproof.
2014-08-30 19:08:04 +02:00
Karol
3f720901ec
Minor fixes.
...
- Removed unnecessary keywords.
- Inlined some functions.
- Minor coding style fixes.
- Minor fixes.
2014-08-30 18:45:11 +02:00
Karol
37bd4790f7
VCMIDirs update #6 fix
...
- Apple compilation fix
- Removed unnecessary macros
- Updated macros indent style
- Fixed 1. warning.
2014-08-30 15:04:00 +02:00
Karol
53ab0593b7
VCMIDirs update #6
...
- Minor fixes
- CLoadFile updated to boost::filesystem::path
2014-08-27 12:31:58 +02:00
Karol
a34d148fa3
VCMIDirs update #5 fix 2
...
- Linux compilation fixes
2014-08-26 15:29:56 +02:00