Ilya Zhuravlev
3eb3996241
Fix android build.
2014-11-02 16:19:14 +03:00
DjWarmonger
530a3e69bf
Option to allow / ban certain types of town in a template.
2014-10-30 10:00:29 +01: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
Ilya Pomaskin
ff12aca83a
bind -> std::bind
2014-10-25 19:05:49 -04:00
Mikhail Paulyshka
ab5e1f9109
don't use separate .rc files for MSVC and MinGW
2014-10-12 16:32:02 +03: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
DjWarmonger
01491f9f1e
Fixed #1718
2014-10-01 14:20:00 +02:00
Ivan Savenko
6aef70eca1
Fixed animation order in lucky attacks. May fix 1891.
2014-09-23 17:30:36 +03:00
Ivan Savenko
a5c3ed080f
Fixes 1892 - properly handle animation of dying clones
2014-09-23 16:02:30 +03:00
Ivan Savenko
33c0e24940
Fixes 1895 - Properly select upper army for recruitment
2014-09-23 14:28:55 +03:00
Ivan Savenko
fc16c8d207
Merge branch 'optimization/swiftAI' into develop
...
Conflicts:
lib/CGameState.cpp
2014-09-21 22:31:29 +03: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
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
AlexVinS
22deb07b66
[c::b] update prejects, fix build
2014-09-11 17:53:25 +04: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
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
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
DjWarmonger
8b10f70afd
Migrating to MSVS 2013, which allows to delete inttypes.h file.
2014-08-31 19:08:39 +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
1b6f2ea3b7
VCMIDirs update #5 fix
...
- Updated old OS detect macros.
- Fixed 1 misspell.
2014-08-26 12:19:04 +02:00
Karol
958839668c
VCMIDirs update #5
...
- Minor fixes
- string based paths -> boost::filesystem::path paths (I hope it's
final)
- New user data path on windows
- New moving dir method on windows.
2014-08-21 22:26:28 +02:00
DjWarmonger
94832c743c
Updated build configs. Everything works.
2014-08-14 16:07:40 +02:00
DjWarmonger
6656515395
Updated Visual for FFMPEG. Need to define environmental variable FFMPEGDIR for it to compile. Not functional yet, though.
2014-08-13 19:21:58 +02:00
Karol
2da6d9e7dd
VCMIDirs update #4 fix
2014-08-11 21:24:31 +02:00
Ivan Savenko
e692f3f520
Implemnted enemy turn speed selection:
...
- implemented switch in settings screen
- implemented "0 speed", animation-free. *may* also work for player-owned heroes
- removed no longer used creature window switch
2014-08-11 19:16:39 +03:00
Ivan Savenko
8838607669
Trying to fix Travis compilation issues
2014-08-11 17:58:41 +03:00
Ivan Savenko
cc61ffca73
Removed debug output
2014-08-11 17:27:41 +03:00
Ivan Savenko
092df7a71c
Fixed crash on stack-less creatures, e.g. war machines
2014-08-11 16:28:15 +03:00
Ivan Savenko
4092929b70
Fixed endianness
2014-08-11 16:21:23 +03:00
Ivan Savenko
8f1a4fcb56
Fixed crash on opening creature window in battle
2014-08-11 15:57:15 +03:00
