622 Commits

Author	SHA1	Message	Date
beegee1	68bdf71db6	- Fixed GCC compiler warnings ... - Implemented move heroes to next scenario partially	2013-12-20 13:07:58 +00:00
beegee1	f0cbbbdb70	- Refactored method CGameState::init	2013-12-18 18:18:12 +00:00
beegee1	b9b25ef552	- Fixed mantis #1422 (starting another scenario crashes VCMI for now) ... - Refactoring	2013-12-16 18:39:56 +00:00
beegee1	2d095cf20a	- Fixed days without castle counter ... - Fixed 'you have only 0 days...' message - Checks victory/loss conditions every player turn instead of every day - Fixed mantis #1463	2013-12-06 19:44:11 +00:00
Ivan Savenko	b1e638d1af	More fixes: ... - logical expressions should compile without cpp include - fixed #1608 and #1610	2013-12-04 03:54:02 +00:00
Ivan Savenko	3d3f93275d	Multiple minor fixes: ... - fixed starting armies of some heroes, including Bron #1602 - (debian) added vcmi-dbg package with debug information - proper randomization of hero secondary skills, fixes #1603 - second capitol will show up as disabled immediately #1604 - proper deserialization of boost::variant - empty file will no longer crash JsonNode parser - fixed some compiler warnings	2013-12-03 09:03:37 +00:00
beegee1	c786a3076a	- Refactored victory loss condition checks ... - Added toString() method to EVictoryLossCheckResult enum class to improve debugging - Removed mostly unused CFunctionList2 - Added missing header files for vcmiclient project to CMakeLists - Tweaked SDL suggests bpp message a bit - Added showInfoDialogAndWait (info dialog and waits, used from client thread) and showOkDialog (callback to ok click, used from GUI thread) to player interface - Added showOkDialog method to CInfoWindow (unused for now, but may be used later)	2013-11-30 09:43:31 +00:00
beegee1	3e4407593f	- Refactoring for checking victory/loss conditions (use enum class instead of magic numbers) ... - Improved showing player lost message for one special case	2013-11-17 17:57:04 +00:00
Ivan Savenko	3560bbb7f3	two patches/pull requests from janisozaur ... - replace our custom bmap with std::map::at() - compile fixes for editor	2013-11-12 10:45:42 +00:00
Ivan Savenko	f56cccb716	- fixed bug where having towns with less than 16 heroes would result in ... invalid random heroes on map start.	2013-11-12 10:09:55 +00:00
Ivan Savenko	55577d0ac4	- fixed missing DLL_LINKAGE ... - use precalculated checksum for zip files - UNUSED macro to silence some warnings	2013-11-09 13:49:36 +00:00
Ivan Savenko	ee6cdbeffe	went through the rest of cppcheck warnings, mostly harmless	2013-11-07 12:48:41 +00:00
Ivan Savenko	71d6b0fea9	- Fixed some warnings from cppcheck ... - Minor improvements to JSON validation - Cleanup in SDL_Extensions.cpp - Implemented new propery for creature format: idle animation duration - Disabled idle animation of some of conflux creatures (was clearly broken)	2013-11-06 13:42:58 +00:00
Ivan Savenko	0e3eae3095	patch from KroArtem	2013-11-03 12:51:25 +00:00
Michał W. Urbańczyk	9ee3133077	Fixed crash on game start when buildings are customized, should finally solve #1444.	2013-09-29 20:53:45 +00:00
Michał W. Urbańczyk	0e5a59e2a5	Changes related to #1444 — fixing affected savegames, assert to detect when things go wrong.	2013-09-27 15:20:42 +00:00
beegee1	a13d72b636	- Fixed GCC warning ... - Small refactoring - Added RPM spec to SVN again (it's better to keep it there :) )	2013-08-19 18:20:11 +00:00
Ivan Savenko	b87897096c	Filesystem handling is now more flexible ... - removed CResourceLoader class in favor of one that implements resource loader interface - removed global pool of files, in favour of more dynamic approach - renamed some files to match current situation All these changes are needed mostly for future mod manager + .zip support	2013-07-28 14:49:50 +00:00
DjWarmonger	66d6aebe32	Fixed all the issues with Quests, #828 and #1223. ... Upgrade cost will never be negative.	2013-07-23 15:03:01 +00:00
Michał W. Urbańczyk	e9d51a2670	Fixed issue that allowed to build multiple boats in town. Renamed state() to sth more sensible.	2013-07-21 10:08:32 +00:00
Ivan Savenko	f82122d9be	second part of c++11 update. gcc 4.5 and VS 2010 are no longer supported ... - BOOST_FOREACH -> for - replaced several boost classes with std (e.g. unordered) - removed gcc-4.5 workarounds - ran clang c++11 migration tool to detect some cases: - - pointer initialized with "0" to nullptr - - replace for with iterators with range-based for - - use auto in some situations (type name specified twice, avoid long iterators type names)	2013-06-29 13:05:48 +00:00
Ivan Savenko	2b45e13c5c	c++03 -> c++11 switch: ... - use std versions of function, bind and ref - OVERRIDE -> override - NULL -> nullptr - use std versions of random distributions NOTE: this may be last revision that supports gcc-4.5	2013-06-26 11:18:27 +00:00
Ivan Savenko	4cc28d5e91	compile fix	2013-05-29 08:14:01 +00:00
Michał W. Urbańczyk	11bcc48cc3	Version bump 0.92c. Fixed #1268. Split a few mehods from CGameState::init.	2013-05-28 22:47:15 +00:00
beegee1	5328beb8e7	- Fixed some bugs when starting a RMG map - Checks if there is a template for the chosen options(rejects if not) - Added a few templates for development(2 to 4 players, medium maps are supported) - Refactoring	2013-05-21 19:08:06 +00:00
Michał W. Urbańczyk	be7c2bd07f	CGHeroInstance* can be serialized over network even when hero has been defeated. Strongly typed hero type ID introduced. ... Should fix #1260.	2013-05-18 22:30:48 +00:00
beegee1	3358a8efec	- Added terrain & object selection classes - Added CComposedOperation - Refactored clear terrain, it is now an operation - Added rough support for updating terrain type if required	2013-04-29 15:51:39 +00:00
Ivan Savenko	b20f8fd3d4	- fixed uninitialized access into modHander ... - fixed #389	2013-04-28 15:06:14 +00:00
Ivan Savenko	4db13ba845	- proper destructors for handlers and lib objects	2013-04-21 16:38:31 +00:00
Ivan Savenko	c6cc6e6301	Large changeset, first part of editing H3 objects via mods feature. Changes: ... - loading of all objects (including H3 objects) will be directed by mod handlers - common base for all handlers accessible from mod system (IHanderBase) - json format changes: use struct with string ID's instead of vector - fixed some gcc/clang errors and warnings - fixed several cases of memory leaks and invalid memory access (mostly related to usage of bonus system and/or identifiers resolution) Note that right now loading is much slower than before due to excessive json validation (or not fast enough validator)	2013-04-21 12:49:26 +00:00
Michał W. Urbańczyk	e8354908c3	Big change: Introduced new mechanism to handle queries. It should not cause any visible changes ATM apart from fixing several long-standing bugs realted to handling post-visit/battle/levelup callback, including infamous creature bank issues: #955, #1053, #1063, #1191. Needs testing. ... Minor changes: * default log level set to trace * LOG_TRACE raii guardian lifetime will last till the end of block * compile fixes * minor refactorings	2013-04-20 11:34:01 +00:00
beegee1	03c2aa9153	- Refactored CMapEditManager(added structure for undo functionality) - Refactored CMap(terrain pointer is private, safe access via getTile)	2013-04-19 11:43:11 +00:00
beegee1	feea589648	- Bug-fixing for last commit - Moved CMapGenOptions to CMapGenerator	2013-04-15 17:18:04 +00:00
beegee1	c10266ed97	- Reduced complexity to use the CMapGenerator(simpler interface) - Removed h3m.txt and tchar_amigaos4.h	2013-04-14 18:52:05 +00:00
beegee1	f10ba48c77	- Fully integrated new logging API(ERM, Editor, missing parts) - Removed old logger	2013-04-11 15:58:01 +00:00
beegee1	c7c2686379	- Integrated the logging API into the client and the lib - Remove some more comments and switched to /// style - Fixed recursive locks - Added Global.h to CMakeLists(now visible in qt-creator) - Removed usage of shared_mutex - Added unique_ptr to CLogger targets	2013-04-09 14:31:36 +00:00
beegee1	ee51c5beb5	- Renamed /lib subfolders to lowercase	2013-04-07 10:48:07 +00:00
alexvins	2eb8263e51	Basic Configuration for bonus types ... * introduced new handler BonusTypeHandler * config\bonusnames.json converted to common format and splitted info main and localizable parts * hanlders initialization refactored	2013-03-06 18:49:56 +00:00
Ivan Savenko	b4e54f76ea	- split heroes.json in manner similar to creatures\factions ... - string ID's for H3 heroes - data in vcmi configs for heroes will replace data in h3 txt's	2013-03-03 18:00:37 +00:00
mateuszb	dbec99ffc7	* PlayerColor and TeamID refactoring	2013-03-03 17:06:03 +00:00
Ivan Savenko	f306d7bb70	some changes towards editing H3 objects via mods. Should be stable, report if not. ... - removed duplicated json loading code in handlers - simpler and mod-friendly handling of combined artifacts - reorganized CCreature to avoid huge number of fields in one structure	2013-03-02 16:55:51 +00:00
Ivan Savenko	74ac44662c	- a bit less memory usage during compilation with gcc, new file - RegisterTypes.cpp ... - fixed several issues related to visiting town by ally - fixed #1215	2013-02-23 12:22:23 +00:00
Michał W. Urbańczyk	d45a554fec	Significant changes to saving system. Now both client and server store their lib part. ... Desync detection upon loading. Fixed many desyncs. (more remain) Monsters won't have creature count 0 even if that is set as creature properties.	2013-02-18 22:37:22 +00:00
mateuszb	560315bc48	* SlotID refactoring	2013-02-16 14:03:47 +00:00
mateuszb	9e00090c42	* refactoring, a few intriguing problems remain	2013-02-13 23:55:42 +00:00
alexvins	ceea466f54	[refactor] spell handling ... * more config options for spells + mind immunity handled by config + direct damage immunity handled by config + immunity icon configurable - removed mind_spell flag * more use of new spell identifacation	2013-02-13 19:35:43 +00:00
mateuszb	9c1a117c1c	* refactoring	2013-02-12 22:24:48 +00:00
Ivan Savenko	7e46d462b6	- compile fixes ... - fixed portrait initialization for random heroes	2013-02-12 21:32:55 +00:00
mateuszb	bda766b697	* refactoring	2013-02-12 19:49:40 +00:00
mateuszb	8a8eecd063	* refactoring	2013-02-11 19:11:34 +00:00
mateuszb	6ff7d61b91	* small fix	2013-02-11 16:07:29 +00:00
mateuszb	d540723739	* refactoring	2013-02-11 14:42:09 +00:00
mateuszb	86dc9386d6	* refactoring, including a generic solution for IDs	2013-02-10 23:24:57 +00:00
Michał W. Urbańczyk	13b3d23b26	Finally working hero crossover in campaigns. ... Uncovered new secrets of h3m.	2013-02-09 18:18:55 +00:00
mateuszb	d03dbf64a6	* refactoring	2013-02-09 12:56:35 +00:00
mateuszb	f1c78e3260	* creature ID refactoring ... * double week creatures are configurable now	2013-02-07 17:34:50 +00:00
mateuszb	af5287c193	* fixed opening custom campaign selection window ... * artifact positions refactored * vstd::advance allows moving between enum values	2013-02-06 23:24:43 +00:00
mateuszb	169cf3558d	* changes in campaign handling	2013-02-06 19:48:09 +00:00
mateuszb	3958364884	* a bit more work on campaigns; hero crossover still buggy	2013-02-06 10:16:44 +00:00
mateuszb	dc091a1ce1	* some work on hero crossover; still buggy	2013-02-05 23:16:13 +00:00
mateuszb	bda92a4a73	* refactoring ... * fixed bug 1143 * some work on campaigns	2013-02-05 18:48:46 +00:00
mateuszb	25663ce7af	* fixed vector<bool> serialization ... * refactoring	2013-02-04 19:43:16 +00:00
DjWarmonger	e63747d2d2	Fixed #860 and #1169 ... Imprisoned heroes as well as their commanders will get full level ups, with updated specialty, mana and movement.	2013-02-04 12:32:53 +00:00
mateuszb	8769f67c5d	* JsonReader can convert to enums ... * refactoring	2013-02-03 21:05:44 +00:00
DjWarmonger	beb1ca1bf8	- getDate function now uses enum for different modes ... - Fixed Black Market (#1195) - Fixed one-week bonuses removed eveyr day (#976)	2013-02-02 08:29:57 +00:00
mateuszb	c4e03ef0de	* enum serialization/deserialization (si32 as basetype ought to be enough for anybody) ... * some fields in classes refactored to use appropriate enums (not yet finished)	2013-02-01 22:04:25 +00:00
Michał W. Urbańczyk	a96f03e947	Crashes realted to illegal access to enemy hero data should be fixed, including #1178.	2013-01-20 20:29:35 +00:00
beegee1	1cab54b87a	- Fixed bug when starting random map with 1 player - Refactoring - Fixed compile bug - Heroes can be selected in map selection screen(RMG map) - Main town gen	2013-01-20 14:43:58 +00:00
DjWarmonger	ce15eb37c2	- Fixed serialization of limiters ... - Hero can now can have several separate specialty nodes - Fixed typo (speciality->specialty) - Fixed several crashes related to commanders - Improvements to specialty handling, bugfixes and temporary solutions for upcoming hero specialties in mods	2013-01-17 18:15:00 +00:00
alexvins	68e91ada1c	[refactor] ... * spells are now more configurable (unused yet, WiP) * a few more cleanups	2013-01-15 14:20:48 +00:00
beegee1	0311e5e6f5	- Added basic mock/test generation - Added stub for terrain editing	2013-01-06 19:30:12 +00:00
alexvins	4bc2fd5519	[c::b] renamed map subfolder to workaround dependency tracking bug	2013-01-03 12:19:20 +00:00
alexvins	889031a95a	get rid of few magic numbers (obj types)	2012-12-24 10:18:30 +00:00
DjWarmonger	0e06ac15ad	- Commanders are now a part of faction config ... - Support for external dwellings for new towns	2012-12-19 16:35:58 +00:00
Ivan Savenko	94c55e2632	- string ID's for spells (not configurable due to hardcode) ... - spell chances in new towns guilds can be specified in config	2012-12-18 10:32:11 +00:00
Ivan Savenko	ffe8b99369	- reorganized hero classes ... - artifact iconIndex should work - new file with hardcoded string constants: lib/StringConstants.h Note: some minor bugs, will fix soon: - slow to open hero window - hero adventure map images serialization is broken\incorrect	2012-12-14 15:32:53 +00:00
Ivan Savenko	23fcdd1a4a	- missing fields in town serialization	2012-12-13 13:07:56 +00:00
Ivan Savenko	ec8e078ef8	- fixed out of sync hero armies ... - one more crash in garrison	2012-12-12 14:52:42 +00:00
DjWarmonger	cff758cfba	Moved artifact-related text to CArtifact class.	2012-12-06 19:03:47 +00:00
Ivan Savenko	c9dd80ea6d	- moved json-related functions (e.g. ParseBonus) into JsonUtils namespace ... - replaced JsonNode::toStdVector with more universal convertTo - some renaming in StartInfo	2012-12-02 12:21:44 +00:00
beegee1	53169abea7	- Foundation for starting a random map is done - Moved StdInc.h to header file in some /Map and /RMG compilation units(better syntax highlighting, should have no negative impact)	2012-11-20 17:53:45 +00:00
mateuszb	100dad889a	* much better callback function declaration (previous version inspired me to write a new coding guideline)	2012-11-14 21:19:32 +00:00
DjWarmonger	a7cea94247	- Hopefully fixed #1103 ... - Fixed #1137	2012-11-14 14:27:18 +00:00
Ivan Savenko	f7915d9e61	- removed creature-related code from ModHandler ... - new towns can be loaded as mods - removed separate DefInfos for towns\capitals - a bit simpler handling of adventure map def's	2012-11-13 11:52:23 +00:00
Ivan Savenko	0d863c83d7	- removed autogenerated by autotools files ... - fixes for #386 using patches from Ixtreon	2012-11-10 21:56:19 +00:00
beegee1	105083dd70	* Code convention updates * Default values for CMap types * Updated BinaryReader c-tor * Converted "bool" int types to bool in CMap classes * Removed map event operators in favor of member methods	2012-11-06 16:39:29 +00:00
beegee1	a878f5f79a	* Separated map loading from the map object * Moved map classes to lib/Map * Renamed map.h/cpp to CMap.h/cpp * Profiling of map loading is now optional * Updated CMemoryStream	2012-11-03 13:30:47 +00:00
beegee1	720deba838	* Added comments to map.h * Refactoring(renamed attributes, some steps towards coding guidelines, ..)	2012-10-26 17:51:05 +00:00
Ivan Savenko	db10f512d5	- game won't crash on missing dwellings (instead random one will generated) ... - added disabled code that can be used to fix buildings blit order - minor fixes	2012-10-07 14:58:48 +00:00
Ivan Savenko	da7a6234b1	- some tweaks towards new towns ... - it is possible for faction to have 0 available heroes	2012-10-06 08:47:13 +00:00
Ivan Savenko	9f0441a0be	- adventure map defs are now part of town config. Should be the last part ... - possibly fixed #1136	2012-10-05 19:57:28 +00:00
Ivan Savenko	306d64b0c4	- it is possible to read json file with vector ... - town configuration: - - all town-related texts are now in TownHandler - - alignments are now part of faction - - removed CTown::bonus field	2012-10-05 13:11:26 +00:00
Ivan Savenko	15a7f43e11	- fixed #1075, #1080, #1081 ... - fixed some warnings from cppcheck	2012-09-26 13:13:39 +00:00
mateuszb	f3f4a7633d	* fixed 1085 ... * fixed starting hero is granted in normal scenarios * introduced TArtifactInstanceID	2012-09-25 14:40:39 +00:00
mateuszb	f16a3a4527	* fixed bug 1084	2012-09-25 08:07:32 +00:00
mateuszb	7fe2692bf8	* support for campaign scenarios with no bonuses	2012-09-24 19:23:11 +00:00
mateuszb	18bd898cb1	* fixed bug when starting certain maps in campaigns ... * introduced TPlayerColor typedef	2012-09-24 16:14:53 +00:00
Michał W. Urbańczyk	95b866c131	* Further work on Battle AI. Now it is able to cast a number of offensive spells. Battle callback exposes more spell-casting info. ... * Took down the one Boost.Assign usage offending VC11. I'm getting impatient I guess...	2012-09-23 23:10:56 +00:00
mateuszb	6a81c8b1af	* campaign against magic numbers ... * ArtifactID was misleading and wrongly used in one place -- renamed and fixed * minor changes	2012-09-23 18:01:04 +00:00
Ivan Savenko	3fcba4fb5c	- fixed crash on start of some campaigns ... - allowed on map factions is now set instead of bit field	2012-09-23 14:32:49 +00:00
mateuszb	9acfa0d136	* more or less working HERO campaign bonus ... * minor improvements	2012-09-22 17:23:28 +00:00
mateuszb	82e21f8b6e	* minor campaign related improvements	2012-09-22 15:16:45 +00:00
Ivan Savenko	8f936cd34d	- added battleAI to CMake, compile fixes ... - icons config for towns and creatures	2012-09-22 15:10:15 +00:00
mateuszb	8e3de98059	* restoring campaign features ... * minor improvements	2012-09-21 17:59:54 +00:00
Michał W. Urbańczyk	62e63d45b1	Work in progress on BattleAI. Related changes: ... * battle AIs receive ptr to CBattleCallback (not sure why it was CPlayerBattleCallback, likely mistake) * reworked some battle callback methods to be more generic and able to handle some hypothetic scenarios * for testing purposes in duel mode the first AI will be taken fro mconfig and the second will remain stupid ai * minor changes	2012-09-20 16:55:21 +00:00
mateuszb	fb2f19b4c5	* some work on campaigns	2012-09-18 17:47:52 +00:00
Ivan Savenko	0ca9f64573	Next part of town configuration: ... - town screen is mostly implemented, has some minor issues - factions are now separate from towns, neutrals have faction with id=9 - more constants to GameConstants: town-specific buildings, strings for terrains and resources - replaced most access to builtBuildings with isBuilt() method - replaced id's with enums for town subtype and buildings id's	2012-09-05 12:49:23 +00:00
Ivan Savenko	44cc848edc	first part of town configuration: ... - moved almost all loading to TownHandler - CBuildings and CStructures are now part of CTown - merged hall.json into buildings.json Should not cause any crashes or glitches	2012-09-02 10:33:41 +00:00
Ivan Savenko	c7789992c3	- fix for hero flags along with battlehero cleanup ... - removed unused code	2012-08-29 14:55:31 +00:00
DjWarmonger	289b7b68d9	Mod Handler class. It is connected with engine, but doesn't do anything yet.	2012-08-10 13:07:53 +00:00
Ivan Savenko	9cbc1f1058	- merged basicCreatures and upgradedCreatures into single array ... - missing fix for savegames	2012-08-07 21:46:24 +00:00
Ivan Savenko	e67f8afdd9	- removed multiple unused files ... - config folder with all json files is used via new FS API - fixed campaigns loading. Replaced "detect h3m starts" heuristics with CCompessedStream::getNextBlock()	2012-08-02 11:03:26 +00:00
Ivan Savenko	b3c17d2788	large filesystem update. Filesysytem is now fully functional, everything should work. ... - completely replaced CLodHandler, removed bitmaph and spriteh - replaced CLodStream in favour of CCompressedStream (2 new files) - renamed CResourceLoaderFactory and ResourceIndetifier to shorter names NOTES: - campaign loading is currently broken. Will fix. - I am going to remove several unused files in several days (e.g. LodHandler)	2012-08-01 12:02:54 +00:00
DjWarmonger	17a513c01b	various fixes for #828	2012-07-30 09:27:19 +00:00
Michał W. Urbańczyk	5981ad15d4	Fixed Duel mode. Integrated some changes from programmingChallenge branch - it's possible to define duel parameters using JSON.	2012-07-26 00:48:44 +00:00
DjWarmonger	d8cb3a34d3	-Fixed crash #1037 ... -AI can now successfully complete several types of quests. -Lots of tweaks for AI TODO: fix bizarre crash when opening borderguard	2012-07-19 09:10:55 +00:00
Ivan Savenko	50e8bc1704	- build system update ... - compile fix for quests (vector can't be used to store const data) - fixed several "unitialized" warnings	2012-07-06 20:19:54 +00:00
Ivan Savenko	47945383da	gcc-4.5 compatibility	2012-06-23 17:19:50 +00:00
Ivan Savenko	1b50082e43	- fixed crash with necromancy dialog #1009 (russian-only) ... - Client::run will catch only asio exceptions - (linux) fixed typo that disabled debug mode	2012-06-16 17:12:58 +00:00
Ivan Savenko	2d8a15f27c	- all windows except for pregame\battles are now CWindowObject-based ... - added simple scaling algorithm that works with indexed surfaces	2012-06-15 17:08:19 +00:00
Ivan Savenko	9d2711fb51	- rewrote most of classes from adventure map window ... -- new files: client/AdventureMapClasses.* -- implemented all missing details from infobox - textinput can handle numbers as input - fixed several bugs caused by CIntObject changes - fixed #988	2012-06-13 13:04:06 +00:00
Frank Zago	9fc459b5c8	Fixed clang warnings.	2012-06-07 03:08:38 +00:00
Ivan Savenko	828d9e70d2	- one more crash at map loading	2012-06-01 11:35:31 +00:00
Ivan Savenko	4e92859cee	- fixed crash on loading of some maps ... - minor fixes	2012-05-30 18:37:21 +00:00
Ivan Savenko	faaf799d95	- fixed some extra warnings. Mostly harmless. ... NOTE: Please check changes in BattleState.cpp and GameHandler.cpp for possible bugs	2012-05-28 19:29:32 +00:00
Ivan Savenko	6f6cd6814e	- fixed wrong battlefield (#961) ... - minor tweaks	2012-05-19 11:47:26 +00:00
Michał W. Urbańczyk	d2756e8c88	Partial fix for #961. ... Minor fixes for VS project files.	2012-05-18 22:47:54 +00:00
Ivan Savenko	46f48f0676	- bugfixing: ... -- fixed #942 and #898 -- removed dublicated code in dwelling loading, #900 is fixed -- fixed roads rendering for #895	2012-05-11 19:03:40 +00:00
Michał W. Urbańczyk	5449546447	Advanced work on support for Quicksand and Land Mine spells.	2012-05-04 21:16:39 +00:00
Michał W. Urbańczyk	7dc0d6878e	Rewritten battle obstacles. New file for lib: CObstacleInstance.cpp. ... Now obstacles should be placed exactly like they were in OH3. All problems with displaying obstacles in battlefield should be gone. They should be now matched to the single pixel. If there are still some discrepancies, please report them.	2012-04-23 19:56:37 +00:00
Michał W. Urbańczyk	017013a5a4	Throwing runtime_errors instead of string (or even char*) objects.	2012-04-22 07:32:45 +00:00
Michał W. Urbańczyk	722ec55384	Redid stack artifacts. Broken save compatibility. Added serializer support for boost::variant and sending CStackInstace* over network by implicitly passing IDs. Moved seeds and checksum to StartInfo. Various minor changes.	2012-04-14 02:20:22 +00:00
Ivan Savenko	f426a48d09	- fixes for gcc-4.7 ... - added missing virtual destructors (new warning from gcc)	2012-04-08 10:34:23 +00:00
Michał W. Urbańczyk	d6223dd137	Fixed #686. ... Minor changes.	2012-04-08 02:29:11 +00:00
Michał W. Urbańczyk	3cf4ebc163	Little more work on #760: ... * no tactics in creature banks * no spellcasting during tactics phase	2012-03-28 21:54:43 +00:00
Michał W. Urbańczyk	c698181c4c	* simple mechanism for detecting desync after init ... * moving stacks in tactics phase won't affect stack queue (part of #760) * moved all boost headers in server to PCH	2012-03-27 20:08:54 +00:00
Michał W. Urbańczyk	e4dc00abac	* new file lib/UnlockGuard.h — unlock_guard is for unlocking a mutex for the scope time (RAII) ... * all lock/unlock and unlock/lock pairs are done by RAII guards now * fixed two possible crashes at the end of battle when last stack was killed by spell. That should fix #749 and #752. * fixed a very nasty race condition, eliminating possible deadlock at the start of battle when human hero has tactics * fixed #422	2012-02-19 21:03:43 +00:00
Michał W. Urbańczyk	a975805ae8	Fixed #850.	2012-02-17 19:30:40 +00:00
Ivan Savenko	0c3e88226f	- (linux) replaced Genius with VCAI ... - gcc set to c++0x mode - most of gcc warnings fixed - replaced boost::assign with initialization lists (if available in compiler) - new cheat code: vcmiarmenelos - build everything - updated linux readme - minor fixes, applied patch for #98	2012-02-16 17:10:58 +00:00
DjWarmonger	b8a5d0d430	Stack artifacts - part 1	2012-01-30 16:07:52 +00:00
Ivan Savenko	dbc603b7d7	- fixed crash on opening spellbook during enemy turn ... - fixed last known localization issue (bank configs) - diplomacy and new weeks\month mechanics should be identical to H3 - minor fixes	2012-01-19 14:33:22 +00:00
Ivan Savenko	3fcf8b6f4b	- minor mechanics fixes, corrected handling of 2nd upgrades (like pirates from hota)	2012-01-13 14:18:32 +00:00
Michał W. Urbańczyk	046e54563c	* fixed project files for RD configuration ... * fixed crash when creature is casting Hypnosis (ie. exped Vampire Lords) * fixed crash when creature is casting Cure before attack (ie. exped Unicorns) * fixed crash when creature is summoning elemental (TODO fix it) * fixed crash when doing a bonus system operation with a hero liberated from prison (ie. entering town or battle) * fixed deadlock when StupidAI tried to assault the turrets * fixed never ending siege when StupidAI has to use catapult (no more deadlocks on AI-AI siege) * fixed deadlock when a hero received a level during another player's turn (ie. when he successfully defended) * AI can win the game by defeating all enemies if there is a specific victory condition applying only to human players * added options to help testing adventure map AI (--onlyAI, --autoSkip and --oneGoodAI). * many minor changes	2012-01-03 01:55:26 +00:00
beegee1	7f04ed990b	Major refactoring. First part: BattleInterface ... Introduction of pre compiled headers,...	2011-12-13 21:23:17 +00:00
Ivan Savenko	064466998a	- made main menu configurable (mainmenu.json) ... - added credits screen (using NWC credits for now) - campaigns can be started	2011-11-27 13:14:20 +00:00
Ivan Savenko	89bd7e273d	- fixed #808 ... - Implemented Json validator and schema for buildings.json - several fixes for Json writing - fixed several gcc warnings	2011-10-08 16:58:25 +00:00
Michał W. Urbańczyk	623325ca61	Ouch. Thing was for branch only.	2011-09-27 22:03:43 +00:00
Michał W. Urbańczyk	bdd66b6537	Zmiany do Programming challenge.	2011-09-27 21:54:40 +00:00
Frank Zago	c4b8039c1e	Added a missing rturn in CGameHandler::isAllowedExchangeForQuery. Fixed several typos.	2011-09-24 01:15:36 +00:00
Michał W. Urbańczyk	6ef44bde5a	Work on pathfinder: torn the code out from CGameState into a separate class. It can use Subterranean Gates and Boats. Removed code for handling Fly spell effect. It didn't work as supposed anyway.	2011-09-19 20:50:25 +00:00
Michał W. Urbańczyk	9621cbcaa7	* fixed crash on calculating dmg dealt by stack under Curse ... * fixed crash on sea battles (obstacles data got corrupted during conversion) * fixed crash when StupidAI had a catapult * minor fixes and refactorings (typename for bonus list under shared ptr)	2011-09-06 13:59:26 +00:00
Frank Zago	2ae53395d7	Removed duplicate function initVillagesCapitols(), and simplified its clone loadTownDInfos().	2011-09-04 18:07:26 +00:00
ori.bar	5b836f428a	Partial fix for 37. Full fix for 27, 64, 600. Fix for bug where code tried to reload non existent file.	2011-09-04 00:04:48 +00:00
Michał W. Urbańczyk	6b9e64de91	Lazy updates of hero paths.	2011-09-03 02:54:33 +00:00
Michał W. Urbańczyk	4c3ed24fe1	Fixed #768. More logging for #774. ... Fixed crash on town time event (-1 and -2 "structures" present on buildings list).	2011-08-25 20:02:38 +00:00
Michał W. Urbańczyk	3152e6d540	Fixed #771, #772 and #787. ... Some minor changes and fixes.	2011-08-25 15:24:37 +00:00
Frank Zago	b3a3cabd5b	Moved the starting ressources into a json file.	2011-08-20 02:53:57 +00:00
beegee1	55e7959fd9	* Bonus system caching updated, partially rewritten, much more robust, thread-safe ... * Adjusted projectile speed, trebuchet canon speed	2011-07-13 18:39:02 +00:00
Michał W. Urbańczyk	b3234e8bfa	* CGameInterface.h/.cpp moved from client project to lib (and, appropriately, to lib subfolder). ... * New files in lib: ResourceSet.h/.cpp -> containing new structure for managing resources logic * Minor changes and fixes	2011-07-05 06:14:07 +00:00
beegee1	5fdb5aa494	* Improved battle and bonus system performance (significantly faster in debug build, tip: use vs 2008, turn of hex field presentation) ... * Implemented caching for the bonus system	2011-06-25 13:53:15 +00:00
DjWarmonger	bdce46ab60	Minor refactorings, fixes & improvements. ... Moved CArtifactSet to ArtHandler. ObjectHandler is already too messed.	2011-06-24 17:43:02 +00:00
Frank Zago	ff49b852df	Silenced several "warning: suggest parentheses around ‘&&’ within ‘||’": added some parenthesis, optimized a couple statments and fix a bug in another.	2011-05-30 19:20:14 +00:00
Michał W. Urbańczyk	2d61fab7e9	* Probably fixed #655. ... * Fixed #736, #737. * Fixed crash on loss/victory. * Fixed crash on loading some AB maps. * Fixed crash on loading map where victory/loss condition objective hero was placed inside the town. * Fixed crash on loading map when neutral Dungeon has built Portal of Summoning. * Mutex protecting GS will be used to prevent changes in GS when GUI might read it. * Little more securities around moving hero and ending turn, still needed more.	2011-05-29 23:49:25 +00:00
Michał W. Urbańczyk	3ca95ef5ed	Fixed #730: ... * crash on +5 growth week * crash on spawning wandering creatures on double growth months (how come that has not been found in previous build?) More logging for #729-like issues.	2011-05-28 01:02:28 +00:00
Michał W. Urbańczyk	617e1f962e	New files for lib: ... * lib/ERMScriptModule.cpp * lib/ERMScriptModule.h * lib/CObstacleInstance.h More jugglery with callbacks. Moving stuff from CGameState to CGameInfoCallback. Work on unified game events interface for player (AI or GUI) and script module. Directing events to ERM interpretetr, first attempts of calling some triggers. Crashy, if there any scripts. Some other changes, including fighting amount of includes in includes and tracking of hero visits (need further work).	2011-05-09 22:20:47 +00:00
Michał W. Urbańczyk	b4144dc616	Callback jugglery, part 1. ... Fixed #252.	2011-05-03 03:14:18 +00:00
Ivan Savenko	0f605256e9	- added new files to build system ... - minor gcc fixes - updated castle interface code, added missing parts including #380 - buildings enum in global.h	2011-04-07 17:54:08 +00:00
Michał W. Urbańczyk	5e4140762f	Fixed #687.	2011-03-19 14:35:29 +00:00
mateuszb	a6b4cfdde7	* spell scroll campaign bonus ... * minor fix (gratuitous call to giveCampaignBonusToHero)	2011-02-23 11:21:40 +00:00
Michał W. Urbańczyk	a46ad0b7ef	Next set of fixes, mostly for deserialization.	2011-02-22 09:47:25 +00:00
Michał W. Urbańczyk	4c9edd3f06	Many fixes around bonus system. Some basic propagation mechanism (not clever but works).	2011-02-21 04:13:00 +00:00
Michał W. Urbańczyk	ab20e024c0	Various fixes and improvements around kill hero and kill monster quests. A few minor unrelated fixes.	2011-02-11 12:27:38 +00:00
Michał W. Urbańczyk	979f77d900	Some preparations towards handling stack experience by the new bonus system. New nodes for controlling premies for creatures of given tier (level). Minor changes.	2011-02-10 13:12:53 +00:00
Ivan Savenko	2ff07fa66a	- Next part of animation system: ... -- Reduced memory usage for images with margins -- Implemented RLE compression - Linux-related changes: -- build system updated to include changed paths -- new dependency: boost-program-options -- configure option --disable-debug will produce optimized build - Several gcc compile fixes - Optimized CPU usage on town screens - Removed several includes from headers - Possible fix for #496	2011-02-06 17:26:27 +00:00
Michał W. Urbańczyk	c6db92c0be	More development around bonus system: building hierarchy, managing morale bonuses. Fully functional Spell Scroll and Angelic Alliance artifacts. Fixed recruiting hero and moving hero to garrison.	2011-02-04 14:58:14 +00:00
Michał W. Urbańczyk	ed07cfe073	Configurable duels.	2011-01-21 02:36:30 +00:00
mateuszb	2451c0dea6	* a bit better stack reversing ... * FoWChange uses unordered_set instead of set	2011-01-20 17:25:15 +00:00
Michał W. Urbańczyk	898ad292ea	A few fixes for artifacts.	2011-01-18 18:56:14 +00:00
mateuszb	56ec829049	* minor refactoring ... * minor improvements in battle interface	2011-01-09 17:41:46 +00:00
Michał W. Urbańczyk	c1bd81abdd	Mostly fixed battle animations. ... Added proper ending for duel mode.	2011-01-08 19:38:42 +00:00
Michał W. Urbańczyk	a53ec23556	Stupid AI is capable of winning / losing battle.	2011-01-08 18:33:40 +00:00
mateuszb	957f1764d7	* some progress in StupidAI ... * refactoring of battle handling WARNING: strange crash on entering battle	2011-01-07 10:48:31 +00:00
Michał W. Urbańczyk	471c23ba71	Compile fixes, more work on new artifact system.	2010-12-26 14:34:11 +00:00
mateuszb	b3fd14b524	* splitted CGameState into general game state and battle game state ... * added missing fields to serialize in CHero	2010-12-25 19:23:30 +00:00
Michał W. Urbańczyk	2cf6729eee	Towards duel support.	2010-12-25 01:43:40 +00:00
mateuszb	4929cf9782	* enum for secondary skills ... * THex for battle positions * towards removal of battleGetStackByID TODO: investigate the necessity of putting implementation of BattleAction CGlobalAI::activeStack( const CStack * stack ) in CGeniusAI.cpp	2010-12-23 20:18:10 +00:00
Michał W. Urbańczyk	2fe8b07f4f	Little more development for duel mode.	2010-12-23 00:33:48 +00:00
mateuszb	af2c4633ad	* partially done duel mode ... * program options parsing via boost::program_options * Stupid AI - a stupid battle-only AI * precompiled headers for server and Stupid AI on MSVC	2010-12-22 20:14:40 +00:00
mateuszb	49083c4e5a	* ConstTransitive CGI more or less done ... * hch contents distributed to more appropriate folders	2010-12-20 21:22:53 +00:00
mateuszb	8b831c1f46	Const-transitiveness of CGI almost reached	2010-12-20 13:04:24 +00:00
mateuszb	b15deaa203	* more constTransitivePointers in GameInfo, separated client GUI classes from it, moved def handlers from CGDefInfo	2010-12-19 14:39:56 +00:00
mateuszb	5806976a9a	* towards ConstTranssitivePointers in CGI	2010-12-18 22:11:28 +00:00
mateuszb	23c501b79e	some changes	2010-12-17 18:47:07 +00:00
Michał W. Urbańczyk	fc6d6e02a3	More fixes for stacks, some basic macro-based logging for bonus graph operations.	2010-12-11 23:11:26 +00:00
Michał W. Urbańczyk	848a00bc6f	Stacks #4 -> giving creatures still needs to be fixed.	2010-12-05 23:10:02 +00:00
Michał W. Urbańczyk	7c3f3d20c3	Stacks #2 -> towards new system of stack operations.	2010-11-27 01:46:19 +00:00
Michał W. Urbańczyk	32ce20af15	Moving stack system to pointers, part #1	2010-11-22 00:34:46 +00:00
Michał W. Urbańczyk	9250cc8adf	Separated CStack and CStackInstance.	2010-11-20 17:36:02 +00:00
Michał W. Urbańczyk	27f83ea8c3	Further work on bonus system.	2010-11-20 00:03:31 +00:00
Michał W. Urbańczyk	cdf7b2b4d9	Bonuses now use pointers. ... Things are very broken.	2010-11-18 22:06:56 +00:00
Michał W. Urbańczyk	4d657eaf47	Merges from trunk. Minor changes.	2010-11-18 18:07:57 +00:00
Michał W. Urbańczyk	9028684697	Disemboweling the system. ... Things are broken now.	2010-11-13 20:26:15 +00:00
Michał W. Urbańczyk	bce805dacc	Restored Warmonger's changes to artifacts system. ... They will be subject of my further work, along with next part of bonus system.	2010-11-10 00:06:25 +00:00
Ivan Savenko	9771dd12ff	- changes in LodHandler: ... -- file type (text, image...) can be specified in getFile(), all hacks removed -- replaced Nodrze with std::set - some gcc warnings fixed	2010-11-09 11:27:58 +00:00
Michał W. Urbańczyk	1c8d909433	Hotfix for loading game.	2010-11-03 11:34:25 +00:00
Frank Zago	dbe38a7062	A few bug fixes and arious warning fixes: unused code/variables, out of order initializations, ...	2010-10-30 21:53:41 +00:00
Michał W. Urbańczyk	0f36095dc7	Less "crashy" campaigns.	2010-10-30 18:54:59 +00:00
Michał W. Urbańczyk	c299a1cdea	Fixed desync. ... Version bumped to 0.82c	2010-10-27 11:36:14 +00:00
DjWarmonger	d823b18c72	Fixed 625, probably also 628 and 568. Minor fixes.	2010-10-27 09:01:27 +00:00
Michał W. Urbańczyk	daeb3af67a	Early changes towards MP support. ... It's possible to connect several clients (running on localhost) and enter MP pregame. The actual MP game still not playable. (though it can be started)	2010-10-24 11:35:14 +00:00
Michał W. Urbańczyk	aa131bbf15	Reverted r1811, r1812, r1813	2010-10-24 11:23:43 +00:00
DjWarmonger	8ac954a7f9	Fixed crash with damage calculation.	2010-10-23 08:58:48 +00:00
DjWarmonger	0f314e106c	Artifacts will now be handled by pointers. ... Assembling & disassembling combos may be buggy, but it's already been before.	2010-10-03 07:07:53 +00:00
DjWarmonger	02d7fa35b7	A number of fixes. Banks serialization, doubling spell effects, week of plague.	2010-10-02 07:10:38 +00:00
DjWarmonger	e481a4375b	Removed bonus system loop in GameState. ... Moved some game settings to global.h	2010-09-30 13:15:18 +00:00
DjWarmonger	717141ab0b	Statue of Legion is finally functional. ... You can see my attempt to create very generic handling of global effects, but I abandoned it since no other items might actually use it. However, Statue's constituents are buggy, so may be assembling & dissasembling them. Most likely this issue is general.	2010-09-25 20:23:55 +00:00
mateuszb	9356ba15ef	* minor improvements for campaigns	2010-09-04 14:49:15 +00:00
Frank Zago	4b8be22fb6	Several compile/link fixes.	2010-09-04 14:47:39 +00:00
mateuszb	4ba3c68ced	Chenges (networking for PG, minor fixes)	2010-09-03 18:42:54 +00:00
mateuszb	dc0cdf68b6	* small fix	2010-09-02 14:41:35 +00:00
mateuszb	608e26b453	* a few fixes for CStack.effects removal - more should come	2010-08-31 10:22:21 +00:00
DjWarmonger	4696d89d2e	Last part of hero specialities - support for peculiar enchants.	2010-08-31 08:39:32 +00:00
DjWarmonger	30cf8b7e77	Fixes for previous commit.	2010-08-30 19:46:38 +00:00
DjWarmonger	bfe266a377	Moved battle effects to bonus system. May be buggy. ... Moved creature damage to bonus system, simplified its handling. Some changes and tweaks. Support for Adela's bless.	2010-08-30 18:06:17 +00:00
mateuszb	34b4e09927	* minor changes - hero crossover in campaigns	2010-08-30 14:52:18 +00:00
DjWarmonger	59447fb85e	Hero speciality will now affect Resurrection and other remaining spells. ... Minor refactoring of spell mechanics, more to come.	2010-08-29 18:29:00 +00:00
DjWarmonger	c7f8f0a967	Support for creature weeks and Deity of Fire is now complete.	2010-08-26 07:23:08 +00:00
Ivan Savenko	dc2f3cf181	- some fixes for town events ... - #190 - InfoWindow components adjusted vertically - #194 - correct sex for heroes in battles	2010-08-25 14:57:58 +00:00
DjWarmonger	ea966a3d21	Creature weeks now work fine. Castle interface still needs to be updated.	2010-08-25 08:40:50 +00:00
DjWarmonger	630dc7f7f2	Next part of creature weeks code.	2010-08-24 14:26:57 +00:00
DjWarmonger	f6b97704c7	Partial support for random wandering stacks. Well, they are not 'that' random as don't use global ran() function.	2010-08-22 07:11:46 +00:00
DjWarmonger	0c4bec0a52	Fixed #608. I just ignored odd postInit interface, hope that's fine.	2010-08-20 16:23:43 +00:00
mateuszb	d681afe1c1	Changes towards campaign support.	2010-08-20 13:34:39 +00:00
Ivan Savenko	d732565002	- blocked retreating from castle. Escape Tunnel implemented. ... - fixed crash when player have no hero (like castle defence) - minor fixes	2010-08-19 11:03:33 +00:00
Michał W. Urbańczyk	4aa60cd40e	Minor changes.	2010-08-18 09:50:25 +00:00
DjWarmonger	6f022e02bb	Fixed #583. Minor fixes.	2010-08-15 16:24:58 +00:00
DjWarmonger	2ec775cb46	Fixed #599	2010-08-15 07:39:07 +00:00
Ivan Savenko	fd45cd0a6d	- fix for #283 ... - ally support: adventure map	2010-08-13 10:46:08 +00:00
Ivan Savenko	bdcdc89991	- University fix for #594 ... - Ally support: - - fix for non-continuous players (notes to rev 1736) - - objects visiting and shared puzzle map	2010-08-06 13:14:10 +00:00
mateuszb	ec5fa1dc22	* Mutare's special ability ... * implemented vial of dragon blood * problems with teams discovered: maps with noncontinuous player occupancy (e.g. only red and teal) crash on loading. hideTiles has obvious bugs - loop goes through teams and team numbers, but fw.player is set to team number, as is the 4th argument to getTielsInRange.	2010-08-06 10:46:40 +00:00
mateuszb	a95bb9d916	* fixed 576 ... * new cheat code: vcmiforgeofnoldorking - hero gets all artifacts except spell book, spell scrolls and war machines	2010-08-05 09:47:12 +00:00
mateuszb	52319f5713	* CBonusSelection will now work on CCampaignState instead of CCampaign; unfortunately there seems to be no elegant way to move that state between bonus selection screen and CGameState::init, so it's not yet moved.	2010-08-04 11:18:13 +00:00
Ivan Savenko	3c868146a6	- linux fix for BuildingHandler ... - #584 should be fixed - first part of ally support: -- shared FoW -- function Callback::getPlayerRelations for team checking	2010-08-03 12:34:06 +00:00
mateuszb	54496ddee1	* player's serialID removed (save format broken, new game seems to work) ... * building bonus (campaigns) supported	2010-08-03 11:36:52 +00:00
mateuszb	3361126c55	* partially done building bonus (campaigns) ... * ERMU -> picture name mapping by Ivan (thanks)	2010-08-02 14:29:30 +00:00
mateuszb	b441143a73	* monster campaign bonus handled ... * selecting / displaying difficulty	2010-08-01 14:40:34 +00:00
Michał W. Urbańczyk	c6653949e1	Fixed #90, #581, #567. ... Broken #87	2010-08-01 14:04:48 +00:00
mateuszb	32597fb391	* more campaign bonuses supported	2010-08-01 12:52:42 +00:00
mateuszb	c06de1f1ce	* improved campaign handling - bonus selection screen is mostly functional ... * preliminary support for giving campaign bonuses (resources and spells, artifacts, skills for generated hero are given) * differing the amount of resources given to AI and human players * minor changes	2010-07-31 13:55:05 +00:00
Michał W. Urbańczyk	d79fa527a7	Implemented abandoned mine. Minor fixes.	2010-07-31 00:26:34 +00:00