1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Commit Graph

4191 Commits

Author SHA1 Message Date
1647b3670c Merge pull request #35 from rhn/rhn
Fixes to sound handling.
2014-09-04 20:26:32 +03:00
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
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
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
9bef590960 use system version of minizip 2014-09-02 17:00:20 +02:00
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
8b10f70afd Migrating to MSVS 2013, which allows to delete inttypes.h file. 2014-08-31 19:08:39 +02:00
94832c743c Updated build configs. Everything works. 2014-08-14 16:07:40 +02:00
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
c0e4591bc7 Added workaround for random objects on water, fixes 1828 2014-08-09 13:48:38 +03:00
05d8fad314 Miscellaneous fixes to banks:
- fixed evaluation of bank thread by AI (1850)
- fixed crash on evaluating bank threat after loading from save (1830)
- fixed typo in bank config. TODO: schema?
2014-08-09 12:31:43 +03:00
f55d335e1c Fixed visitable objects resetting on day 7 (1847) 2014-08-08 15:53:04 +03:00
66c4d469f8 Possible fix for neutral palette (1867) 2014-08-07 19:53:07 +03:00
d1dd7eef48 Proper fix for #1712 - Building requirement tests are now fixed
- added minimize() method in logical expressions that will remove excessive elements
- replaced forEach() with morph() that allows replacing types in variant
2014-08-07 19:53:07 +03:00
4d6ab2c32d Fixed rendering of bitmap fonts shadow 2014-08-07 19:53:07 +03:00
16eb4b3267 First part of fix for 1712
- implemented recursive search for missing dependencies
 - todo - update GUI. As of now Gui may provide incorrect information
2014-08-07 19:53:07 +03:00
rhn
c8929b364b fixed typo 2014-08-06 17:55:29 +02:00
rhn
e4fce8fc8f fixed object types playing sounds 2014-08-06 17:19:54 +02:00
rhn
c3a4f15eda Updated build instructions with Fedora focus 2014-08-06 17:19:53 +02:00
rhn
a6151a5296 added FLAC support 2014-08-06 17:19:53 +02:00
rhn
a491c11305 Fixed sound effect when hero disappears 2014-08-06 17:19:53 +02:00
rhn
e9534603c2 Fixed sound on object pickup with dialog 2014-08-06 17:19:53 +02:00
d918621d66 - fixed casting sacrifice spell (was broken and now fixed partially) 2014-08-05 19:12:56 +02:00
c1ac95b288 - fixed Clang compiler warnings 2014-08-04 20:36:00 +02:00
12126754fb - added all SDL2 directories to CMake (in case if any SDL2 module is installed somewhere else) 2014-08-04 20:35:23 +02:00
5139378319 - migrated boost::function/ref/bind to std:: variants 2014-08-04 20:33:59 +02:00
d535a09d8b Updated changelog 2014-08-04 17:45:26 +03:00
33acdc51bb Fixes 1852 - fixed typo in tower config and added check to detect such cases 2014-08-04 14:47:42 +03:00
68e9cbd3a6 Fixes 1856 - Griffin Bastion will be behind Town Hall 2014-08-04 14:47:34 +03:00
00cda400a1 Miscellaneous improvements for Launcher UI:
- Implemented "show intro" toggle in settings
- Install/Update/Enable buttons are now visible even when mod info is hidden
- Fixed behaviour of show mod info switch, added more obvious button to enable it
- Removed no longer used "Enable mods on install" switch
- Added buttons to open data, user data and temporary directories
2014-08-04 14:03:57 +03:00
ca05087c3b Merge branch 'develop' into FFMpeg 2014-07-31 19:26:32 +04:00
42b349a594 Merge pull request #33 from rhn/develop
Fixed wrong message when building a structure, Rewarding objects won't loose their state on reload
2014-07-30 21:18:09 +03:00
f8359b4eb5 Randomized shapes for treasure piles. 2014-07-29 19:19:15 +02:00
2220786d0c Finally placing objects sparsely. 2014-07-29 19:05:35 +02:00
930fa21d38 Tweaked treasure density. 2014-07-29 18:12:27 +02:00
3712b9a48b - Fixed treasure zones touching each other, which sometimes resulted in unguarded paths.
- Fixed some object amounts which seemed wrong.
2014-07-29 16:58:08 +02:00
dc03a251f6 - Fixed treasure generating formula It should be now identical to OH3.
- Refactorings, tweaks.
2014-07-29 15:58:54 +02:00
rhn
aba3421e0a Fixed: 0001854: Rewarding objects loose their state after game is reloaded (breaks savegames) 2014-07-29 15:28:58 +02:00
rhn
e7fa17af38 Fixed message when a structure can't be built due to requirements, but a different building has been built already 2014-07-29 09:49:50 +02:00
fe292dfa1d Fixed desync due to uninitialized objects. Added some logging. RMG maps don't work yet, though. 2014-07-27 19:30:17 +02:00
3acbda75ef Restored old function signature for sanity. 2014-07-27 13:59:53 +02:00
713912574a Fixed duplicated Redwood Observatory on snow and possibly other objects. 2014-07-27 07:37:56 +02:00
c6d8a0a01e Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-07-26 14:21:39 +02:00
b97e4b1ab5 Fixed crash when setting players number to 1. 2014-07-26 14:20:33 +02:00
c431d9fe52 Merge branch 'develop' into FFMpeg 2014-07-26 13:07:45 +04:00
c23261ac0a Removed references to WoG files from CMake 2014-07-26 11:51:44 +03:00
16aa230dd1 Enchanters, sharpshooters and dragons are not "special" and should normally spawn on the map. 2014-07-26 10:42:12 +02:00
b99d6f862d Improved gravity algorithm. Now zones will start as small and inflate until they fill the map. 2014-07-26 10:02:33 +02:00
b654ea831b [RMG] Fix mingw build, fix some warnings 2014-07-26 10:12:45 +04:00
76c3228afa Merge branch 'develop' into FFMpeg
Conflicts:
	client/CVideoHandler.cpp
2014-07-26 07:54:43 +04:00