games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
8,218 Commits 30 Branches 75 Tags
7a51527ede48ff8b37d99b614d343485ab01d20d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Savenko a1cca251ec Possible fix for selection of incorrect method for serialization of vector<bool> 2016-10-30 11:42:53 +02:00
Ivan Savenko 256f43f467 Fixes zero-initialized fileVersion member in deserializer 2016-10-29 19:52:19 +03:00
Ivan SavenkoandArseniy Shestakov 5b76c3f4eb Rebase of codebase changes for refactored serializer 
Some of newer fixes not yet merged there and save compatibility a bit off.
 2016-10-27 18:12:20 +03:00
Ivan SavenkoandArseniy Shestakov 3d1b1f4ba8 Add files for rebased serializer refactoring done by Ivan 2016-10-27 17:26:22 +03:00
Ivan Savenko a051a08a46 Merge remote-tracking branch 'origin/issue/2306' into develop 2015-12-18 22:21:11 +02:00
Ivan Savenko 89bf3592e3 Likely fixed duplicated random heroes 2015-12-05 01:40:23 +02:00
Ivan Savenko 8a3feb1e48 Added assert to hopefully catch invalid GiveBonus package at some point 2015-12-05 01:39:14 +02:00
Ivan Savenko faa7cbff18 Fixed gcc/clang warnings 2015-12-04 01:17:43 +02:00
Ivan Savenko c2f4991e99 Replaced barrier with mutex due to data races: 
Destruction of barrier while one of the threads is still in barrier.wait() is illegal. This may happen if caller thread reaches wait() after helper thread and immediately return's from the function destroying barrier which is still in use by helper thread
 2015-12-04 00:12:49 +02:00
Ivan Savenko f02e553b70 Fixed another uninitialized field possiblity causing issues with StupidAI 2015-12-04 00:11:44 +02:00
Ivan Savenko 2e56b547ee replaced references to SectorMap with shared_ptr to avoid data races in AI code 2015-12-04 00:10:51 +02:00
Ivan Savenko 73b4188fab Fixed access to unitialized memory causing StupidAI to act stupid 2015-12-03 21:28:01 +02:00
Ivan Savenko 90dfe3e782 reduced visibility for members of Mine and Dwellings 2015-12-02 22:34:13 +02:00
Ivan Savenko 7189a12df2 removed few more includes from headers 2015-12-02 22:10:46 +02:00
Ivan Savenko 7b5a7f43ad Removed includes of CGameState from headers 2015-12-02 21:39:53 +02:00
Ivan Savenko c3ce4b25df Removed all #include's of CMap.h from headers. 
To all - please, avoid #include's in headers as much as possible
This kills incremental build compile times
 2015-12-02 21:05:10 +02:00
Ivan Savenko bef7048460 minimized visibility of members of teleportation-related classes 2015-12-02 21:01:43 +02:00
Ivan Savenko f9d9a38e53 Fixed gcc warnings 2015-12-02 20:59:38 +02:00
Ivan Savenko 3aa5360ac6 Merge pull request #135 from josch/develop 
Replace deprecated FFmpeg API for compatibility with ffmpeg 2.9
 2015-11-07 11:23:30 +02:00
Ivan Savenko 86e1ae928e Merge pull request #121 from vmarkovtsev/develop 
Fix portability issues with vcmibuilder on MacOSX
 2015-10-21 19:45:47 +03:00
Ivan Savenko aefe5923fd update sdl packages for Ubuntu/Debian to 2.0 2015-08-30 00:10:35 +03:00
Ivan Savenko 1066330925 update minimal boost version 2015-08-30 00:01:57 +03:00
Ivan Savenko 90bf1a5a54 Merge branch 'master' of github.com:vcmi/vcmi 2015-05-02 09:02:22 +03:00
Ivan Savenko 78d02cb1eb Linux version bump 2015-05-02 09:01:48 +03:00
Ivan Savenko b55ab61605 Merge pull request #98 from AMDmi3/freebsd-fixes 
FreeBSD fixes
 2015-04-10 22:12:37 +03:00
Ivan Savenko 376b2436f8 Fixed weird bug in serializer which caused corrupted data in Json map (missing guards entry in banks) 2015-03-31 00:56:33 +03:00
Ivan Savenko eef45b5ae8 Fixed warnings 2015-03-31 00:55:37 +03:00
Ivan Savenko 8139eaf961 Merge pull request #71 from Kedrigern/patch-1 
Update F21 dependency
 2015-02-20 22:32:11 +02:00
Ivan Savenko 2dd5145796 Merge pull request #61 from ArseniyShestakov/fixMapDescription 
Fixes for two visual map description bugs
 2014-12-02 22:55:57 +02:00
Ivan Savenko a472199812 Merge pull request #63 from josch/vcmibuilder_case_insensitive 
let data, maps and mp3 directory be truly case insensitive
 2014-12-02 22:54:27 +02:00
Ivan Savenko 7d429247ab Merge pull request #57 from josch/includeFuzzyliteCPP11Headers 
add FL_CPP11 preprocessor define independent of which fuzzylite is used
 2014-11-18 19:25:05 +02:00
Ivan Savenko ffd5867913 Merge pull request #58 from josch/kFreeBSDandHurdSupport 
FreeBSD and HURD support
 2014-11-18 19:24:50 +02:00
Ivan Savenko b73edea856 Merge pull request #59 from adrianlang/patch-1 
vcmibuilder: Support another root directory
 2014-11-18 19:22:56 +02:00
Ivan Savenko dce9880d16 Minor refactoring of FunctionList using variadic templates. 
Please make sure that all supported compilers are OK with this code
 2014-11-12 22:46:37 +02:00
Ivan Savenko a3d4f9d22f Fixed conversion warnings caused by Qt 2014-11-12 22:46:36 +02:00
Ivan Savenko 356b6ab34a A bit delayed, but still - Linux version bump 2014-11-11 22:59:26 +02:00
Ivan Savenko 2692150efc Merge pull request #52 from josch/launcherNoAutoCheckRepositories 
Launcher: do not automatically check remote repositories
 2014-11-10 19:51:14 +02:00
Ivan Savenko 176e029cd1 Merge pull request #53 from xyzz/fix_1907 
Fixed "Hex grid" button crash, partially fixes 1907.
 2014-11-09 16:00:54 +02: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
Ivan Savenko 7c70d2e493 Merge pull request #40 from IlyaPomaskin/patch-1 
Fixing Mac OS building issues
 2014-10-03 22:02:21 +03: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
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
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
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
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
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
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
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
Ivan Savenko 69c6a3fa79 Fixed crash on visiting multi-creature dwellings (1874) 2014-08-19 13:16:25 +03:00
Ivan Savenko 7e05945a6a Swapped skills on level-up screen 2014-08-19 13:15:40 +03:00
Ivan Savenko ecc705c8b7 Fixed guardians of dragon hive, fixes 1871 2014-08-19 12:09:52 +03: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
Ivan Savenko a115406fa3 Fixed data presence check 2014-08-10 10:58:56 +03:00
Ivan Savenko 1e5e02c7df Compilation fixes caused by merge, replaced some remaining boost::bind with std's 2014-08-09 15:14:31 +03:00
Ivan Savenko b1285bc506 Merged GUI refactoring into develop, fixed conflicts 2014-08-09 15:01:55 +03:00
Ivan Savenko c0e4591bc7 Added workaround for random objects on water, fixes 1828 2014-08-09 13:48:38 +03:00
Ivan Savenko 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
Ivan Savenko f55d335e1c Fixed visitable objects resetting on day 7 (1847) 2014-08-08 15:53:04 +03:00
Ivan Savenko 66c4d469f8 Possible fix for neutral palette (1867) 2014-08-07 19:53:07 +03:00
Ivan Savenko 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
Ivan Savenko 4d6ab2c32d Fixed rendering of bitmap fonts shadow 2014-08-07 19:53:07 +03:00
Ivan Savenko 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
Ivan Savenko d535a09d8b Updated changelog 2014-08-04 17:45:26 +03:00
Ivan Savenko 33acdc51bb Fixes 1852 - fixed typo in tower config and added check to detect such cases 2014-08-04 14:47:42 +03:00
Ivan Savenko 68e9cbd3a6 Fixes 1856 - Griffin Bastion will be behind Town Hall 2014-08-04 14:47:34 +03:00
Ivan Savenko 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
Ivan Savenko 9841600839 Moved all resolutions but 800x600 into a separate mod 2014-08-03 19:11:54 +03:00
Ivan Savenko 77a73fbaa9 Merge branch 'feature/freegfx' into refactoring/guiClasses 
Conflicts:
	client/windows/CHeroWindow.cpp
	client/windows/CQuestLog.cpp
	client/windows/GUIClasses.cpp
 2014-08-03 18:50:59 +03:00
Ivan Savenko 7390647cd5 End of buttons refactoring: 
- cleanup of slider API
- documentation fixes
 2014-08-03 17:31:56 +03:00
Ivan Savenko 0882201b17 Miscellaneous fixes to toggle buttons 2014-08-03 16:19:16 +03:00
Ivan Savenko 10fc1892a8 Large refactoring of button classes: 
- renamed CAdventureMapButton to more expectable CButton
- merged CButtonBase into CButton
- created more generic class for clickable elements
- created more generic class for selectable elements
- renamed CHighlightableButton to CToggleButton
- renamed CHighlightableButtonsGrous to CToggleGroup
- minimized differences between API of all these classes
- removed all but one contructors in buttons, with same parameters across all classes
 2014-08-03 14:16:19 +03:00
Ivan Savenko 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
Ivan Savenko c23261ac0a Removed references to WoG files from CMake 2014-07-26 11:51:44 +03:00
Ivan Savenko 4fca583062 Merge pull request #29 from Mixaill/nsis 
CMake: add NSIS generator settings
 2014-07-18 00:56:46 +03:00
Ivan Savenko 6073a08d1c Merge pull request #31 from NikolayIT/develop 
Added optimization flag (-O1) for the GCC compiler on Windows platform to prevent "CGameState.cpp.obj: too many sections" compile error
 2014-07-16 13:57:33 +03:00