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
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
ca47ddca5c
Miscellaneous fixes to creature window:
...
- implemented missing stack size indicator
- fixed detection of battle presence
- fixed placement of spell icons
2014-09-19 16:31:01 +03:00
Ivan Savenko
78709e223b
Breaking things - trying to remove server-side knowledge of selected objects
2014-09-19 00:18:49 +03:00
Ivan Savenko
818a766fd6
Fixed 1888 - centering adv.map will also redraw minimap
2014-09-18 17:53:41 +03:00
Ivan Savenko
6cd3d1b30e
Fixed 1889 - removed memory leak that caused multiple identical quest marks
2014-09-18 17:46:35 +03:00
Ivan Savenko
3939c70a81
Fixed 1277 - only 2 cursor buttons will be enabled for sliders, depending on its direction (horizontal/vertical)
2014-09-18 17:08:21 +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
ec8476d43a
Compile fixes for Visual.
2014-09-05 20:13:58 +02:00
DjWarmonger
a89512111c
Updated visual files.
2014-09-05 16:38:19 +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
025ed08391
Merge branch 'karol57-develop' into develop
2014-09-04 20:29:58 +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
7947329a02
Merge pull request #32 from xyzz/update_gitignore
...
Updated .gitignore to include cmake/cotire/Qt stuff
2014-09-04 20:26:41 +03:00
Ivan Savenko
1647b3670c
Merge pull request #35 from rhn/rhn
...
Fixes to sound handling.
2014-09-04 20:26:32 +03:00
Ivan Savenko
0e2cc54252
Merge pull request #38 from josch/vcmiserver-handle-options-first
...
let vcmiserver handle commandline options first
2014-09-02 20:33:59 +03:00
Ivan Savenko
7158b87d71
Merge pull request #37 from josch/use-system-minizip
...
use system version of minizip, if available
2014-09-02 20:33:20 +03:00
karol57
864fa0388f
Android fix
2014-09-02 19:18:47 +02:00
josch
2e6e026645
let vcmiserver handle commandline options first
...
The vcmiserver application will first try to initialize various things
before parsing the commandline arguments. This leads to the program only
outputting an initialization error when it cannot initialize instead of
parsing arguments like --help. This patch moves the argument parsing to
earlier in program execution to avoid this behaviour.
2014-09-02 18:42:38 +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