2911 Commits

Author	SHA1	Message	Date
DjWarmonger	6ac00873b9	Compilation fixes - allow SDL1. ... Please do not define class-specific constants that are static at same time.	2015-02-18 15:31:55 +01:00
DjWarmonger	2a082e6c21	Merge pull request #84 from Fayth/test/advMapFading ... If no one objects, I will try to merge this.	2015-02-18 09:52:09 +01:00
DjWarmonger	5d1fbedf85	Merge pull request #91 from Fayth/fix-advmap-restoring ... Short and clear code is always welcome.	2015-02-18 07:59:00 +01:00
ArseniyShestakov	536015f1c2	Quest Log: move slider to start when blocked ... Partially fixes problem mentioned in issue 2093	2015-02-18 00:07:03 +03:00
DjWarmonger	200bcd7da6	Merge pull request #88 from ArseniyShestakov/improvedQuestLog ... Awesome, thanks!	2015-02-17 06:44:38 +01:00
ArseniyShestakov	c0b78de6b4	Quest Log: block hide complete button when it useless ... We only want to to be checkable when there is actually any complete quests in list.	2015-02-17 06:08:35 +03:00
ArseniyShestakov	ae20499854	Quest Log: implement option to hide complete quests	2015-02-17 05:47:49 +03:00
Fay	116e1d62a1	Makes player interface recreate advmap instead of reusing existing instance;	2015-02-16 21:45:16 +01:00
ArseniyShestakov	007f95fa44	Fix valgrind warning about uninitialised value	2015-02-16 13:28:10 +03:00
ArseniyShestakov	c865055803	Hero Exchange: fix quest log button	2015-02-16 01:33:05 +03:00
ArseniyShestakov	df2894b798	Quest Log: implement support Seer names	2015-02-16 00:44:48 +03:00
ArseniyShestakov	37a5930f84	CSoundHandler: fix memory leak and implement cache ... This one fix issue 2091 and add caching that actually works.	2015-02-15 22:51:33 +03:00
AlexVinS	c46999bcb8	Conurrency related tweaks. Crashes in renderFrame should be fixed, but synchronization is still not perfect	2015-02-15 04:53:01 +03:00
AlexVinS	b71d985d49	cleanup	2015-02-15 01:46:47 +03:00
AlexVinS	aa5e9fc959	get rid of global debug macros.	2015-02-14 22:43:16 +03:00
ArseniyShestakov	9665c50f3f	Quest Log: clanup code that is not needed anymore ... As far as I understand once object capturing used it's no longer needed to manually call Show. Currently CIntObject::show and CIntObject::showAll automatically call it for all children.	2015-02-14 21:35:11 +03:00
ArseniyShestakov	8beed60815	Quest Log: cleanup minimap code ... Usage of shared_ptr suggested by @alexwins	2015-02-14 21:31:56 +03:00
ArseniyShestakov	5a5c126f0e	Quest Log: fix background resource name ... Currently it's not PCX, but PNG	2015-02-14 20:39:53 +03:00
AlexVinS	a5ebcd0f60	fix #2080. No more articaft exchange between heroes in kingdom overview.	2015-02-14 20:24:18 +03:00
AlexVinS	420e5f055c	Fix warnings	2015-02-14 19:24:21 +03:00
AlexVinS	0b546a9b9f	Correct placement for hero misc artifacts in kingdom overview	2015-02-14 18:59:33 +03:00
AlexVinS	c135591f81	Add comments about getArtPlace - it is a bit dangerouse	2015-02-14 16:00:57 +03:00
AlexVinS	7086fdc730	Crash fixed, but bug still present	2015-02-14 16:00:56 +03:00
AlexVinS	a6c8dcbc36	Cleanup	2015-02-14 16:00:56 +03:00
ArseniyShestakov	d06bba422a	Quest Log: display components under quest description ... This commit add CComponentBox under text. If quest have components description height will be changed to avoid conflicts. Though it's would be much better if VCMI had something like QScrollArea in Qt so both text and components was using shared slider.	2015-02-14 04:21:31 +03:00
ArseniyShestakov	c978bc862d	Quest Log: fix position of selection box on labels	2015-02-14 03:47:31 +03:00
ArseniyShestakov	c046f8ddc6	Quest Log: update code for new graphics and fix bugs ... This one should fix issues 1988 and 2022	2015-02-14 03:38:28 +03:00
ArseniyShestakov	8648081f0a	Quest Log: change minimap level when quest selected ... There also no need in own setLevel as one from CMinimap works fine.	2015-02-14 02:13:17 +03:00
ArseniyShestakov	fd99f0b9f3	Quest Log: decrease number of displayed quests ... New graphics only have 6 slots	2015-02-14 01:34:53 +03:00
ArseniyShestakov	0704e38697	Fix Quest Log button in hero window	2015-02-14 01:10:32 +03:00
ArseniyShestakov	ded4c18df9	CComponent: add option to choose image size ... This option is used to choose small resource icons in Quest Log when there more than 4 of them.	2015-02-14 00:53:24 +03:00
ArseniyShestakov	dae03fdf92	Blick Quest Log button if map have no quests	2015-02-14 00:52:00 +03:00
Fay	f30cb0fa5b	Fixes crash when loading game (if path was visible previously);	2015-02-13 11:20:13 +01:00
Fay	1c6a7a923d	Fixes color-keying after scaling bitmaps for world view display;	2015-02-09 20:16:42 +01:00
DjWarmonger	71bcacaa60	Partial fix for #2053	2015-02-09 16:23:29 +01:00
Fay	cbd3a19987	Merge branch 'develop' of https://github.com/vcmi/vcmi into test/advMapFading ... Conflicts: client/CPlayerInterface.cpp	2015-02-09 16:09:27 +01:00
Fay	cbb75d1c7a	Support for fading heroes/boats (+flags); ... Disabled map movement requests during fade;	2015-02-09 16:03:24 +01:00
Fay	485a8b5c9a	Fixed updating camera position after teleportation (gate/teleport/spells);	2015-02-06 19:11:04 +01:00
Fay	3c3fb0e21d	Added advmap config options to enable/disable fading;	2015-02-02 19:38:30 +01:00
Fay	5a7a208617	Minor fixes (possible surface leak);	2015-02-02 17:42:42 +01:00
DjWarmonger	1d34d15983	Compilation fixes.	2015-02-01 19:25:42 +01:00
Fay	4c636c15e9	Merge branch 'develop' of https://github.com/vcmi/vcmi into test/advMapFading	2015-02-01 19:12:03 +01:00
AlexVinS	594295da32	Merge branch 'feature/worldView' into develop	2015-02-01 20:49:14 +03:00
Fay	b59189ae6f	Minor fix to resolve clipping rect issue from previous commit;	2015-01-31 19:05:25 +01:00
Fay	dbedf245a0	Fixed some calculation to resolve edge tiles being partially cut-off in advmap world view mode;	2015-01-31 19:00:41 +01:00
Fay	447c4603a2	Fade-in fixes; ... Added more map object fading cases (teleports/(dis)embarking)	2015-01-31 18:36:57 +01:00
Fay	e56488d700	Fixed gems redrawing after world view scale change; ... Fixed hotkeys to start world view mode;	2015-01-31 10:57:13 +01:00
Fay	5e78a3147a	Abstracted fading into separate class; ... Smoother fade animations; Added fading when recentering hero after switching levels;	2015-01-30 23:37:28 +01:00
Fay	df419e23c0	Fixed recoloring filler background to correct player color after game reload;	2015-01-29 20:34:53 +01:00
Fay	794c03792a	Added empty background below world view panel for better compat with higher resolutions;	2015-01-29 18:39:46 +01:00
Mikhail Paulyshka	9b76ca0b27	Fix compilation with some versions of libavutil	2015-01-28 22:46:28 +03:00
Fay	e64c08df27	Initial;	2015-01-28 20:07:57 +01:00
AlexVinS	ba51de8b5f	Merge remote-tracking branch 'remotes/Fayth/mantis-2011' into develop	2015-01-28 09:41:09 +03:00
Fay	4b5b6edd44	Added space between both text entries;	2015-01-26 17:16:39 +01:00
Fay	413523956f	Fixed missing info about dealt damage in combat log when there were casualties; ... Fixed blank row in combat log in the same case;	2015-01-25 18:03:34 +01:00
Fay	b03eb56706	Possibly fixes looping videos;	2015-01-25 14:28:11 +01:00
DjWarmonger	86fde2ba54	Merge pull request #76 from Fayth/mantis-2016 ... Looks much better now :)	2015-01-25 07:49:46 +01:00
Fay	551925b6d7	Added comments;	2015-01-24 23:12:17 +01:00
Fay	ad8a6c55d7	Fixes #2016 (heroes not possible to be chosen in pregame after switching town selection); ... Fixes skipping first hero selection when switching them with left arrow; Fixes redrawing random hero portrait correctly after switching that player to AI;	2015-01-24 21:24:23 +01:00
Fay	72f34a7799	Fixes crash on dropping an artifact on an empty garrison slot;	2015-01-24 00:21:18 +01:00
Fay	77908dcf76	Added missing deletes in map handler dtor;	2015-01-20 20:51:09 +01:00
Fay	8adc209366	Fixed setting adventure map underground button state after game load;	2015-01-19 21:48:52 +01:00
Fay	beaf1a62c5	Added puzzle view button to world view gui;	2015-01-19 20:46:03 +01:00
Fay	01029779d7	World view mode drawing: refactoring, part 2 (further merging of common functionalities; abstracted puzzle view to separate blitter);	2015-01-19 20:08:19 +01:00
Fay	97d89d1d6c	World view mode drawing: refactoring, part 1 (merged main drawing method);	2015-01-18 18:53:40 +01:00
Fay	103f2ed627	(auto whitespace fix)	2015-01-18 18:23:23 +01:00
AlexVinS	a90d603c16	fix modded spell effect not showing	2015-01-18 19:38:35 +03:00
Fay	e3dc37fece	Fixed hotkeys in world view mode (added missing hotkeys + disabled non-world-view hotkeys); ... Fixed minimap radar calculation for world view mode;	2015-01-17 13:41:59 +01:00
Fay	447119e2f5	Changed zoom factors to resemble OH3 as closely as possible; ... Minor refactoring;	2015-01-17 11:56:12 +01:00
Fay	9b3b69b108	Fixed incorrect display of scaled+rotated map images in world view mode; ... Fixed miscalculated viewport sizes in somee cases;	2015-01-16 23:49:15 +01:00
Fay	8e840d2c30	Changed map surface-cache key from int to intptr_t;	2015-01-15 17:17:26 +01:00
Fay	3823631a57	Fixed recoloring world view panel info icons after current player change; ... Refactored ui objects handling in CAdvMapInt to slightly reduce clutter; Minor other improvements;	2015-01-15 00:22:20 +01:00
Fay	4b248c2762	World view impl -- initial;	2015-01-13 20:57:41 +01:00
ArseniyShestakov	af8b030810	Fix skills learning in Universities ... This one fixes 1945 and 1991	2015-01-07 18:33:09 +03:00
ArseniyShestakov	3466457d69	Fix crash on opening of Hill Fort window and attempt to upgrade one stack ... This one fixes issue 1899	2015-01-07 13:10:48 +03:00
ArseniyShestakov	ceb5da44d1	This fixes crash in battle I introduced in 8a697f2 ... dismissInfo do not present when createButtonPanel used inside the battle.	2014-12-27 06:29:09 +03:00
DjWarmonger	9962623220	Merge pull request #72 from ArseniyShestakov/fixTradeWindow ... Small fixes for CTradeWindow	2014-12-26 09:57:40 +01:00
DjWarmonger	84b2510aa4	Merge pull request #62 from vcmi/SpellsRefactoring4 ... OK	2014-12-26 08:46:29 +01:00
ArseniyShestakov	6ab807f694	Put artifact in different slot if selected is used ... This one fixes issue 2002.	2014-12-26 01:42:50 +03:00
ArseniyShestakov	27705e1ac6	Fix removal of fully sacrificed stacks from heroes garrison slots ... This one fixes issue 2010. Though CAltarWindow need proper refactoring.	2014-12-26 01:18:58 +03:00
ArseniyShestakov	aca0eeed86	Fix position of selected unit count in Freelancer's Guild ... This one fixes issue 2009	2014-12-25 22:03:19 +03:00
ArseniyShestakov	f71cfdf173	Check if slot locked before pick on Artifact Merchants ... This one is fixes issue 2007	2014-12-25 19:24:28 +03:00
ArseniyShestakov	54437a3b19	Fix check of locked artifacts for Altar of Sacrifice ... This one is explained in issue 2001	2014-12-25 06:27:39 +03:00
ArseniyShestakov	046a6fc45a	Visible blocked button for good and evil heroes on Altar of Sacrifice ... This is expected behaviour as explained in issue 558	2014-12-25 06:20:40 +03:00
ArseniyShestakov	3371cd36c9	Fix check of 22 artifacts limit on Altar of Sacrifice ... Partially fix for issue 558	2014-12-25 06:17:26 +03:00
ArseniyShestakov	4cb98e7e8d	Use isTradable and fix issue 1392 ... This change make it possible to sell spell scrolls in Artifacts Merchant.	2014-12-24 20:48:37 +03:00
ArseniyShestakov	937ef0227b	Use ArtifactID instead of int when possible	2014-12-24 18:49:12 +03:00
ArseniyShestakov	edccd60564	Tiny improvement for resources selection boxes ... This one is related to issue 562	2014-12-24 03:22:48 +03:00
ArseniyShestakov	36e05402d8	Fix text label and location on sell articacts windows ... This one fixes issue 1998	2014-12-24 03:21:28 +03:00
ArseniyShestakov	150c8425f5	Fix town income on View Towns screen ... This is fix issue 1996	2014-12-24 00:39:48 +03:00
AlexVinS	eebf65e88f	Merge branch 'develop' into SpellsRefactoring4	2014-12-24 00:15:27 +03:00
ArseniyShestakov	94d0e5486a	CSplitWindow: added input check ... This one fixes issue 1952	2014-12-23 07:38:58 +03:00
ArseniyShestakov	8a697f2ba3	Fix disabling of dismiss button for last troop ... Fix issue 1994	2014-12-23 07:12:42 +03:00
ArseniyShestakov	79cdabe3aa	CCreatureWindow: correct caption for "Ok" button ... This one is fixes issue 1396	2014-12-23 07:10:33 +03:00
DjWarmonger	94c0d5896f	[MVS] Added /LTCG option to improve linker performance.	2014-12-22 19:44:15 +01:00
DjWarmonger	7735e193f0	Merge branch 'develop' into experimental/serializerrefactoring	2014-12-22 19:17:40 +01:00
AlexVinS	2b88a914ff	Fix client build ... * use regular overloaded methods for client serialization. (serialize template not needed if connection.h already included and save/load code is different)	2014-12-21 22:33:20 +03:00
AlexVinS	3bca68fd2d	Initial refactoring ... * reduce registerTypes* templtates instantiation	2014-12-21 17:29:42 +03:00
DjWarmonger	c538370c5d	Players will be always able to see their owned heroes and other objects. Fixes #1959.	2014-12-21 13:56:32 +01:00
AlexVinS	65ed0ec356	Trying to fix random freeze	2014-11-28 02:47:14 +03:00
AlexVinS	d94f15bdf4	Added configurable animation for SPELL_LIKE_ATTACK	2014-11-28 00:36:14 +03:00
AlexVinS	943a5bf0d3	cleanup	2014-11-27 22:10:36 +03:00
AlexVinS	0612042928	Tweak creature spell projectile start position ... * need more finetuning	2014-11-27 21:33:57 +03:00
AlexVinS	04202eb030	Shoot spell projectile from creature	2014-11-27 21:06:11 +03:00
AlexVinS	657385e32c	We need to know caster stack ID for proper projectile animation	2014-11-27 20:47:37 +03:00
AlexVinS	6893509f65	Fix manaGain animation always showing	2014-11-27 19:09:59 +03:00
AlexVinS	c67f52732a	Fix CSpellEffectAnimation call parameters ... (!) need check areaEffect usage	2014-11-27 17:39:37 +03:00
AlexVinS	f1ab328a09	Cleanup	2014-11-27 17:08:19 +03:00
AlexVinS	75b93b070d	Implemented configurable hit/affect animation ... * need more testing	2014-11-27 16:51:16 +03:00
AlexVinS	256894d18a	Use configuration for spell projectile	2014-11-27 00:27:38 +03:00
ArseniyShestakov	f2aedabcb3	Fix slider remain enabled when not needed for changed label text ... This one fix issue with map description label #1977	2014-11-24 16:18:10 +03:00
ArseniyShestakov	0e346a4f0d	Reset mapDescription scrolling position on change of map / save ... This one fixes bug #1974	2014-11-24 15:56:33 +03:00
ArseniyShestakov	53c7a3cfcb	Added function CSlider::moveToMin	2014-11-24 15:24:03 +03:00
AlexVinS	a71c452fc6	Merge branch 'develop' into SpellsRefactoring4	2014-11-24 12:45:34 +03:00
AlexVinS	85a4b725f5	[Creature window] 2-line bonus description	2014-11-24 12:44:45 +03:00
AlexVinS	f7ff61ce4f	Merge remote-tracking branch 'remotes/origin/develop' into SpellsRefactoring4	2014-11-24 12:41:17 +03:00
ArseniyShestakov	6fd0f76547	Fix invisible save select when click on save name area	2014-11-23 08:51:48 +03:00
DjWarmonger	c094e70784	Replaced legacy sprintf with boost::format.	2014-11-22 12:45:13 +01:00
KroArtem	82b278307f	fixed typo	2014-11-17 23:08:08 +03:00
KroArtem	e73c60740c	corrected text in vcmibuilder, corrected errors and warnings from cppcheck	2014-11-16 20:48:29 +03:00
AlexVinS	885b495cf4	[Creature window] Fix creature art dismount possibility	2014-11-15 21:54:45 +03:00
AlexVinS	c43b218d64	Fix duplicate MR bonus display	2014-11-15 20:39:21 +03:00
AlexVinS	68d1105233	Fix creature window not showing bonus description	2014-11-15 20:22:50 +03:00
AlexVinS	752965ff69	Merge branch 'develop' into SpellsRefactoring4 ... Conflicts: lib/CSpellHandler.cpp	2014-11-14 05:28:23 +03:00
AlexVinS	81fb2ae584	Fix crash when casting firewall-like spells after creature casting ... #1910	2014-11-14 04:12:50 +03:00
AlexVinS	9e8b09d747	Use clearAffected flag	2014-11-13 15:00:45 +03: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
Ilya Zhuravlev	b22973e717	Fixed crash, "pure virtual method called", when calling doUpdate lambda from CGPreGame.	2014-11-10 20:21:39 +03:00
Ilya Zhuravlev	62a3dfb086	Fixed "Hex grid" button crash, partially fixes 1907.	2014-11-04 15:34:30 +03:00
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
Karol	a302f6c7ad	VCMIDirs update #3 ... bfs = boost::filesystem; - Updateting filenames (std::string -> bfs::path) #1 - Added platform detection, and some specyfic boost::filesystem includes to Global.h - Updated CBasicLogConfigurator. Now class uses bfs::path pathes.	2014-08-10 23:42:39 +02: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	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
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	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
beegee1	5139378319	- migrated boost::function/ref/bind to std:: variants	2014-08-04 20:33:59 +02: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	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
AlexVinS	76c3228afa	Merge branch 'develop' into FFMpeg ... Conflicts: client/CVideoHandler.cpp	2014-07-26 07:54:43 +04:00
DjWarmonger	a842068d54	Merge pull request #30 from vcmi/RMG ... Since there are no objections, I finally merge this branch.	2014-07-23 08:06:51 +01:00
Ivan Savenko	4fca583062	Merge pull request #29 from Mixaill/nsis ... CMake: add NSIS generator settings	2014-07-18 00:56:46 +03:00
DjWarmonger	e8580229dc	RMG will now actually use all the settings from pregame. Till now it did not.	2014-07-15 16:44:07 +02:00
DjWarmonger	89c97a88bb	Updated Visual projects for SDL2.	2014-07-15 12:26:18 +02:00
Ivan Savenko	731aedf3a1	Split CIntObjectClasses into multiple smaller files. This should be the last change in files	2014-07-15 10:14:49 +03:00
Ivan Savenko	9f5704f8ba	Uploaded recreated stack queue backgrounds	2014-07-14 22:38:13 +03:00
Ivan Savenko	52da593292	New resolution selection button	2014-07-14 21:49:52 +03:00
Ivan Savenko	5111bff6cc	Implemented new button for commander window	2014-07-14 20:43:38 +03:00
Ivan Savenko	7f790f9d6a	Quest window now uses new background, using same gfx sources as creature window	2014-07-14 18:07:57 +03:00
Ivan Savenko	a69fcdd435	Fixed compilation issues caused by merge	2014-07-14 17:44:15 +03:00
Ivan Savenko	92d22bae63	Merge branch 'feature/creatureWindow' into refactoring/guiClasses	2014-07-14 17:23:24 +03:00
Ivan Savenko	2a0a0e81a7	Cleaning up includes	2014-07-14 17:19:44 +03:00
Michael Pavlyshko	6a23960642	CMake/WIN32 : add icon to client and launcher	2014-07-14 01:02:00 +03:00
Ivan Savenko	647b9c683f	Reorganized client source tree: ... - client/widgets for reusable GUI elements - client/windows for independent windows - client/gui for base GUI classes which should remain internal	2014-07-13 20:53:37 +03:00
Ivan Savenko	cec9161f8f	Added missing files	2014-07-13 18:40:13 +03:00
Ivan Savenko	83099fdb78	Moved all non-window GUI elements out from GUI classes file. TODO: reorganize source tree	2014-07-13 18:39:45 +03:00
Ivan Savenko	55ff933b7f	Reducing size of GUI classes. Split trade windows into a separate file	2014-07-13 16:31:00 +03:00
Ivan Savenko	09bedf9aa9	Reducing size of GUIClasses. Moved Garrison Int into a separate file.	2014-07-13 16:11:25 +03:00
Ivan Savenko	7e76a5dd0e	Moved some code from GUIClasses into two smaller files: ... - CArtifactHolder.* - CComponent.* Goal: reorganize artifacts UI to decrease dependency on CGHeroInstance class	2014-07-13 14:56:30 +03:00
Michael Pavlyshko	bad7050096	spaces -> tabulation	2014-07-11 11:01:03 +03:00
AlexVinS	679dd64ff9	Make scale a parameter of "open" methods	2014-07-10 14:18:21 +04:00
Michael Pavlyshko	08ee65c3c8	fix .dll and .exe filenames	2014-07-10 01:06:37 +03:00
Michael Pavlyshko	c935193558	disable WIN32 flag for executables, fix previous commit	2014-07-10 00:47:22 +03:00
Michael Pavlyshko	11d73f2ac9	fix CVideoHandler compilation	2014-07-09 18:01:12 +03:00
Michael Pavlyshko	afc6530084	fix vcmiclient linkage	2014-07-09 17:37:08 +03:00
AlexVinS	18f34e14f8	set scale to off by default	2014-07-08 22:01:01 +04:00
AlexVinS	0efb6e2890	Use scaling ... (*) into - fullscreen (*) spellbook - no scaling	2014-07-08 18:20:22 +04:00
AlexVinS	61b31e5c60	add api to enable|disable scaling (unimplemented)	2014-07-08 17:39:47 +04:00
AlexVinS	c71237bba3	Mingw build with ffmpeg ... (*) get rid of BIK SMK dlls (-) missing sound (-) spellbook is scaled to fullscreen	2014-07-08 16:40:25 +04:00
Ivan Savenko	1ae7a77246	Cleanup of stack artifacts code	2014-07-05 11:48:03 +03:00
Ivan Savenko	60e5815014	Implemented stack artifact handling, no tested yet	2014-07-05 01:22:56 +03:00
AlexVinS	0edd10078f	Fix usage of fillRect. ... * proper fix for slider drawing	2014-07-05 01:52:11 +04:00
Ivan Savenko	ac6cfdfb92	Extracted too big lambda into a separate helper method	2014-07-04 20:58:18 +03:00
Ivan Savenko	20f7071d11	Implemented stack experience/commander experience display for window	2014-07-04 12:48:09 +03:00
AlexVinS	e70e68a56b	Fix puzzle map fade.	2014-07-03 23:06:11 +04:00
AlexVinS	74d3effa98	More safe way of update locking	2014-07-03 22:30:56 +04:00
Ivan Savenko	e4e9d71143	Fixed texts: ... - added new texts to translate.json - implemented texts for abilities Remaining TODO's: - handling of stack artifact - handling of commander artifacts - stack experience	2014-07-03 21:09:17 +03:00
AlexVinS	9b8ad51cd3	Run all rendering with pim lock if possible	2014-07-03 22:05:59 +04:00
AlexVinS	30d6eab20b	Do not render fully hidden tiles	2014-07-03 20:41:42 +04:00
Ivan Savenko	079866d99d	Implemented leveling up abilities. TODO: implement visible selection/descriptions	2014-07-03 19:05:19 +03:00
AlexVinS	8a488aeb86	Cleanup	2014-07-03 19:57:21 +04:00
AlexVinS	57f82f2bed	Add a comment.	2014-07-03 18:46:23 +04:00
AlexVinS	f3067878dd	Force full redraw for sliders. This fixes backgroung glitches with SDL2. ... (!) there should be better fix	2014-07-03 18:44:25 +04:00
AlexVinS	ecc7b8e05a	Draw cursor on each frame. Fix TTF rendering under cursor.	2014-07-03 18:05:07 +04:00
AlexVinS	e521e6687a	centralize cursor drawing	2014-07-03 15:10:01 +04:00
AlexVinS	022f71c26e	fix deletion in in-game console	2014-07-03 14:58:56 +04:00
AlexVinS	397f4cf8b6	Workaround for TFF font glitches under cursor in pregame	2014-07-03 14:10:15 +04:00
AlexVinS	c948891fc6	Fix threaded handlers initialization, cleanup	2014-07-03 12:26:15 +04:00
Ivan Savenko	328944e111	Fixed levelling up of commander	2014-07-03 01:00:16 +03:00
AlexVinS	dbb7526040	fix uninitialized flag	2014-07-02 23:53:49 +04:00
AlexVinS	5a029c88d1	cleanup	2014-07-02 23:53:23 +04:00
AlexVinS	3e4e810888	More ColorKey cleanup	2014-07-02 22:41:11 +04:00
Ivan Savenko	b58bbcbdd8	Leveling up commander skills seems to be working. Optimized some png's to decrease size	2014-07-02 21:38:38 +03:00
Ivan Savenko	617ea79d3c	Button overlays are now more generic (not necessarily text), removed old version of creature window	2014-07-02 21:38:38 +03:00
Ivan Savenko	7a9547bb44	New creature window made without use of H3 graphics ... This is import of ancient unfinished branch from svn. As of now window is largely finished but commander-related elements are still TODO. Note that I also uploading graphical content - this is intended and necessary for final goal - to make VCMI functional without any additional graphical pack.	2014-07-02 21:38:38 +03:00
AlexVinS	638dac90af	centralize key color management	2014-07-02 22:20:54 +04:00
AlexVinS	082c9a506e	Fix battle absolute obstactes rendering	2014-07-02 21:38:15 +04:00
AlexVinS	7b75b19d1a	Fix hero flags rendering	2014-07-02 21:09:49 +04:00
AlexVinS	9606aed4a3	Using int3 for color is weird	2014-07-02 20:12:15 +04:00
AlexVinS	e57dbbde15	Extract startTextInput & stopTextInput ... (*) these functions do nothing with SDL1 - this is by design - less ifdef`s	2014-07-02 19:41:30 +04:00
AlexVinS	9797372dbe	Implement Unicode support for ingame console	2014-07-02 19:16:05 +04:00
AlexVinS	195eae48ca	Merge branch 'develop' into SDL2 ... Conflicts: client/CPlayerInterface.cpp	2014-07-02 17:15:12 +04:00
Ivan Savenko	c956b3f02a	Fixed #1820, better detection of object below cursor that uses same logic as renderer	2014-07-01 17:19:08 +03:00
AlexVinS	50dfe05cd1	[C::B] Small projects fix	2014-06-30 11:19:55 +04:00
DjWarmonger	57fa905a2b	Something that compiles.	2014-06-26 22:05:27 +02:00
DjWarmonger	e51e2190fd	Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG	2014-06-26 20:12:37 +02:00
Ivan Savenko	32240da34e	Reduced number of #include's in headers. May break compilation on Win ... since some net packs now need DLL_LINKAGE	2014-06-25 17:11:07 +03:00
Ivan Savenko	a0689fa377	Refactoring of hoverText from objects: ... - removed hoverText field - split getHoverText() method into 3: - - getObjectName() for generic name - - getHoverText(Player) for player-specific text - - getHoverText(Hero) for hero-specific strings	2014-06-24 20:39:47 +03:00
Ivan Savenko	ad632d1e8a	Moved FoW management from CGObjectInstance to callback	2014-06-24 20:39:47 +03:00
Ivan Savenko	5ebc0e8614	First part of object instance API cleanup ... - removed passability() method in favour of passableFor(PlayerColor) - moved operator < code to map handler - updated class documentation	2014-06-24 20:39:47 +03:00
AlexVinS	4e4ba6654c	fix Eye of magi, also fix #1608 ... Conflicts: lib/CObjectHandler.cpp	2014-06-24 18:20:28 +04:00
AlexVinS	3b8d0e44d4	Merge branch 'develop' into SDL2	2014-06-24 14:09:44 +04:00
DjWarmonger	79036484dd	Trying to sort out project changes and compile issues.	2014-06-23 19:58:19 +02:00
Ivan Savenko	47639832b1	Probably fixed bug with map border rendering in rectangular maps	2014-06-23 20:47:09 +03:00
DjWarmonger	3ac306f501	Merge pull request #19 from vcmi/feature/mapObjects ... Feature/map objects	2014-06-22 14:49:42 +02:00
AlexVinS	2ec8c31558	Partial fix for hero flag rendering ... (-) blue & teal heroes are still gitchy. IDN why ...	2014-06-21 14:54:41 +04:00
AlexVinS	ac7703ffb0	Fix hero movement rendering	2014-06-21 12:13:19 +04:00
AlexVinS	8cc5363882	fix warning, cleanup	2014-06-21 11:35:08 +04:00
AlexVinS	13bd4ddcb2	Now movement can be canceled ... (-) rendering still missing	2014-06-21 10:49:27 +04:00
AlexVinS	5fa5ba622f	Start preparation for moveHero threaded implementation	2014-06-18 14:31:11 +04:00
AlexVinS	c2dd696e96	simplify CGuiHandler::handleEvents() ... Threre is no need to allow (and I doubt is was in fact possible with old code) new events to arrive during processing events. Let them to be processed in next frame.	2014-06-18 08:30:23 +04:00
Ivan Savenko	09d595e385	- Implemented "mapObject" entry for hero classes ... - Updated schemas - Some bugfixing	2014-06-16 19:27:26 +03:00
AlexVinS	5fdc63ab5b	tiny fixes	2014-06-16 14:32:37 +04:00
Ivan Savenko	836c466f81	- Implementation of overrides for towns ... - Converted dwellings.json into new format - Implemented "mapObject" entry in town format - Removed capital/fort/village fields from town in favor of overrides	2014-06-15 19:43:01 +03:00
DjWarmonger	e56f41b8be	Fixed monster strength selection.	2014-06-15 12:00:34 +02:00
DjWarmonger	5c431da0f9	Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG	2014-06-15 10:01:18 +02:00
AlexVinS	c7390316b7	small cleanup	2014-06-13 07:55:50 +04:00
AlexVinS	d707e55472	restore inGuiThread flag	2014-06-13 07:55:50 +04:00
AlexVinS	41a0319985	remove separate GUI thread ... + this fixes OGL - has some issues(f.e. hero movement)	2014-06-13 07:55:49 +04:00
AlexVinS	15fe37133c	Fix compilation with SDL1 ... + seems to be fully backward compatible (need more testing)	2014-06-13 07:55:48 +04:00
AlexVinS	56c74bc46a	+More build target to support both SDL1 and SDL2 builds	2014-06-13 07:55:48 +04:00
AlexVinS	bbd0312b45	Tweak configuration	2014-06-13 07:55:47 +04:00
Ivan Savenko	c424677736	- Hotfix: overlay was a pointer	2014-06-13 07:55:47 +04:00
Ivan Savenko	6205d07223	Re-enabled video player, should now work with SDL 2	2014-06-13 07:55:46 +04:00
AlexVinS	47979d28bb	Remove broken assertion ... * this restores music support	2014-06-13 07:55:46 +04:00
Ivan Savenko	8eb661461c	- vcmi compiles with SDL2 on Linux, video player is disabled for now	2014-06-13 07:55:45 +04:00
AlexVinS	3db7fb4f63	Still try to fix opengl backend ... - no success + make backend selection configurable	2014-06-13 07:55:45 +04:00
AlexVinS	d289c6a34a	Prefere opengl rendering ... - broken ...	2014-06-13 07:55:44 +04:00
AlexVinS	5bb3d859eb	Nice fullscreen mode++	2014-06-13 07:55:44 +04:00
AlexVinS	04aa76b842	Fix arrow keys moving on adventure map	2014-06-13 07:55:43 +04:00
AlexVinS	6474e37b76	try to fix hotkeys	2014-06-13 07:55:43 +04:00
AlexVinS	ac2896da42	Implemented SDL2 unicode input. Hotkeys are sill broken.	2014-06-13 07:55:42 +04:00
AlexVinS	d50976bf4a	restore some SDL1 code in CMT.XXX	2014-06-13 07:55:41 +04:00
AlexVinS	0ef16feca9	Refactoring towards backward compatibility (WiP)	2014-06-13 07:55:41 +04:00
AlexVinS	1597254399	just a few tweaks and it works! ... * enable video again * set default bpp to 32 - SDL2 dont like 24 bit resolution * now almost everything looks as expected (some issues are present though)	2014-06-13 07:55:40 +04:00
AlexVinS	6890c2650b	fix keyboard state access ... * is somewhat playable already!	2014-06-13 07:55:40 +04:00
AlexVinS	cd81e85a61	fix loading to pregame. Looks awful. More work to do. ... * video temprorary disabled * multithread loading seems to be broken - disabled	2014-06-13 07:55:39 +04:00
AlexVinS	e072b2664f	fix pixel format ... * now it shows intro video (but then crash ...)	2014-06-13 07:55:39 +04:00
AlexVinS	62d42465de	fix compilation ... * may not even run * text input disabled	2014-06-13 07:55:38 +04:00
AlexVinS	796905ec42	change VCMI_client.cbp to new externals layout ... * it will not compile of course	2014-06-13 07:55:38 +04:00
Haryaalcar	11955605b5	sorting by filename implemented for save and load screens	2014-06-11 00:03:08 +03:00
Ivan Savenko	44742814cd	More cleanup: ... - moved SoundBase.h to lib since it contains shared data - added RMG info to object format. Note that data is not yet imported in configs - slightly updated API of object handlers	2014-06-05 23:51:24 +03:00
Ivan Savenko	b2e8c92383	Cleanup: ... - removed commented-out #includ'es - renamed some files to match name of class	2014-06-05 20:26:50 +03:00
Ivan Savenko	652ceb2bde	Finally shattered CObjectHandler.cpp into tiny bits ... - This file is now split into multiple smaller files in mapObjects directory - CObjectHandler itself now contains only core classes (Handler itself, CGObject and interfaces) - Cleaned up excessive #include's through whole project	2014-06-05 19:52:14 +03:00
Ivan Savenko	0afdfa529c	Moved all object-related files to lib/mapObjects directory. ... Renamed some classes to more readable names	2014-06-05 14:19:47 +03:00
DjWarmonger	62e9f13b08	- Implemented guard generation formula following this post http://forum.vcmi.eu/viewtopic.php?p=12426&sid=09f5fac8992dc880eb6a720615787ca0#12426 ... - Some primitive way to randomize treasures	2014-06-04 10:16:08 +02:00
Ivan Savenko	32b6568b65	Merged changes from upstream and fixed compilation caused by API changes	2014-06-03 22:45:18 +03:00
beegee1	a87363c0f1	- fixed mantis #783 - play sound when entering message in chat box	2014-06-01 18:48:40 +02:00
Ivan Savenko	1d17d60449	gcc update: ... - removed support for 4.6 - compilation fixes for 4.7	2014-05-29 13:42:05 +03:00
karol57	dd33fd51a8	int3 dist2d microoptimization	2014-05-25 20:42:25 +02:00
Ivan Savenko	7f276185bd	Moving files: ... - new config for objects (config/objects/generic.json) - renamed lib/CDefObjectHandler to lib/CObjectClassesHandler	2014-05-24 02:07:54 +03:00
Ivan Savenko	6bd6be0835	Object class handler is now a proper "handler" ... - Some changes in interfaces - Fixed some missing fields in serialization - Moved object names to new handler	2014-05-24 01:56:51 +03:00
AlexVinS	8a3b997fa5	fix a few comments. No code changes.	2014-05-21 13:02:20 +04:00
DjWarmonger	1ea6723a32	Merge pull request #8 from xyzz/android-rolling ... Android port.	2014-05-17 05:17:54 +02:00
Ivan Savenko	b5160acbac	Finalization of object type handler interface ... - updated code to use new interface - removed old DefObjHandler (todo - rename file) Summary: - most code but loading is now in place - type names may deserve improvements (some of them are too similar) - still barely compiles and not tested	2014-05-16 23:50:02 +03:00
Ilya Zhuravlev	db7cd79cf7	Android port. ... Conflicts: lib/vcmi_endian.h	2014-05-16 23:24:29 +04:00
beegee1	80765eb0a3	- fixed clang compiler warnings (detects now unused constant vars)	2014-05-16 19:22:21 +02:00
DjWarmonger	1dbc0c7177	Compilation fix. This will be released as VCMI 0.95b.	2014-05-02 12:19:50 +02:00
DjWarmonger	fb5152254d	Merge branch 'develop' of git://github.com/Macron1Robot/vcmi into WarmysBackup ... Conflicts: client/CKingdomInterface.cpp	2014-05-02 12:03:02 +02:00
Macron1Robot	9976fcc671	Update GUIClasses.cpp ... spaces change	2014-04-29 22:25:30 +04:00
Macron1Robot	fd1640f931	Update GUIClasses.cpp ... Removed excessive check for tavernVideo string	2014-04-29 13:06:55 +04:00
DjWarmonger	4a71442c80	Missing changes.	2014-04-27 14:38:20 +02:00
DjWarmonger	f418b468c4	Merge branch 'develop' of https://github.com/vcmi/vcmi into WarmysBackup	2014-04-27 12:49:29 +02:00
Macron1Robot	8ec7a9b919	Moved "max heroes on map per player", "max heroes available for player" to "defaultMods.json"	2014-04-27 10:43:46 +04:00
Macron1Robot	907caedb13	Added "produce" section in "building" structure. Changed dailyIncome.	2014-04-26 18:23:35 +04:00
Michał Janiszewski	bece1e5b1f	fixed possible nullptr dereference ... * Fixed a switch() statement in InfoBoxHeroData::getValueText that could result in nullptr dereference. If 'type' was HERO_MANA and 'hero' was nullptr, a fallthrough would occur to HERO_EXPERIENCE, where 'hero' would we be dereferenced. * Fixed line endings.	2014-04-25 14:31:11 +02:00
Macron1Robot	9123c7a787	Fix for map tavern (video set to standard)	2014-04-25 01:06:14 +04:00
Macron1Robot	b7b890acff	Added "tavernVideo","guildBackground" to "faction" JSON config and schema. If "primaryResource" is set to "gold", silo will generate 500 gold per day	2014-04-24 23:36:18 +04:00
DjWarmonger	9e7013de77	Backup for my own MVS project configuration	2014-04-24 21:07:43 +02:00
beegee1	1d57b75bc5	- random number generation refactoring ... - fixed mantis #1743	2014-04-10 19:22:32 +02:00
Ivan Savenko	43ba3d30ea	Breaking things - first commit towards configurable object(s). ... - New files: lib/CObjectWithReward.h/cpp - Classes that will be replaced by configurable object are now in this fil Status: far from functional, currently at "it compiles" point, some essential pieces are still missing.	2014-04-06 23:14:26 +03:00
DjWarmonger	30b79588db	- Moved gameState::guardingCreaturePosition() to CMap so it doesn't need to be recalculated many times for every player. ... - Some optimizations with local cb pinter in VCAI.	2014-04-01 11:53:28 +00:00
Ivan Savenko	771c1ce255	- some effords to get rid of bottlenecks in AI code ... - fixes, probably partially #1577 - enabled code for reading map object templates from json, still not used - disabled PCH for launcher due to speed issues.	2014-03-23 16:36:16 +00:00
Ivan Savenko	9c0df68cb8	Fixing spelling mistakes. Patch from josch, fixes #1759	2014-03-23 12:59:03 +00:00
Ivan Savenko	760ae7d44a	Changes related to Debian packaging, based on josch patch ... - AUTHORS file is now in UTF-8 - tags for desktop files - fixed some typos - better reaction on --help and --version commands - vcmibuilder should work with both avconf and ffmpeg	2014-03-20 18:17:40 +00:00
beegee1	fe1b16a7ec	Some preparation towards mantis #1743: ... - refactored CRandomGenerator (added util methods, improved method names) - usages of std::minstd_ran are replaced by CRandomGenerator (not in entire code base, C rand() usages are still not replaced) - refactored getArtSync method of CArtHandler -> now named pickRandomArtifact - fixed some compiler warnings - updated source code URL in VCMI spec	2014-03-17 19:51:07 +00:00
alexvins	9cac0af7be	[Spells] More spell related refactoring ... + smart target modifier - CREATURE_EXPERT_MASSIVE target type * save format changed spell format changes already documented in http://wiki.vcmi.eu/index.php?title=Spell_Format	2014-03-17 13:11:10 +00:00
alexvins	065b8366fb	[Spells] Added basic support for icons and sounds ... * few changes in spell format * save format changed	2014-03-10 16:00:58 +00:00
Ivan Savenko	d2ae847ecf	- files in local directories (saves & configs) now always have higher ... priority than mods. Fixes #1685 and #1733 - fixed possible crash on exit in dispose() function - (vcmibuilder) fixes problem with partial mp3 -> ogg conversion	2014-03-08 16:05:23 +00:00
alexvins	4203d69525	Part 2 of new spell configuration ... 1) spell handler refactored to support modding in general way 2) imunnity icons moved to WoG as they depends on wog`s graphics 3) introduced new class template for handlers (todo: use this in other handlers) 4) save format changed 5) introduced "absolute immunity" - unaffected by "the Orb" etc. (todo: use it in config) 6) new format documented on wiki, added json schema. * more split of registertypes - fixes 32 mingw build	2014-03-07 13:21:09 +00:00
Ivan Savenko	5cbec833c2	- (linux) XDG filesystem support ... BIG NOTE TO LINUX USERS All user data has been moved according to XDG specs: - Game data (H3 files and mods) and saves: from ~/.vcmi to ~/.local/ - Temporary files, including logs: from ~/.vcmi to ~/.cache/vcmi - Config files: from ~/.vcmi/config to ~/.config/vcmi For compatibility VCMI will read game data from ~/.vcmi as well but this is temporary behavior and will be removed	2014-03-04 14:51:10 +00:00
stopiccot	7356145c3a	updated LD_RUNPATH_SEARCH_PATHS	2014-03-04 03:51:17 +00:00
Michał W. Urbańczyk	2c52617c1d	Fixed video flickering in the campaign intro screen.	2014-03-01 18:50:50 +00:00
Michał W. Urbańczyk	f6c2c96cdc	Copyright update.	2014-03-01 18:46:54 +00:00
Michał W. Urbańczyk	03fbd4e8a7	Fixed tracking autosaves.	2014-03-01 17:35:56 +00:00
Michał W. Urbańczyk	a6f68d6870	Fixed #1726.	2014-03-01 13:42:23 +00:00
DjWarmonger	b8b809bd50	Fixed #1667, #1669	2014-02-28 17:49:56 +00:00
Michał W. Urbańczyk	93856dbe98	Quick solution for #1688.	2014-02-27 20:44:20 +00:00
Ivan Savenko	e101caa997	Fixed possible buffer overflow on visiting tavern ... Introduction of unicode made fixed-length buffers too short in some cases	2014-02-26 21:20:36 +00:00
Ivan Savenko	78609871ae	bugfixing: ... - fixed parsing of campaign bonuses (conversion to building ID) - CONTROL event condition can be also fulfilled by allies - fix for crash on opening exchange window in Russian version	2014-02-26 17:32:42 +00:00
Ivan Savenko	8d36bcabce	Split registerTypes into multiple files, now in lib/registerTypes ... directory in order to reduce huge memory usage by gcc	2014-02-24 19:57:33 +00:00
Michał W. Urbańczyk	1e555a8ee3	Improved serializer. See: http://forum.vcmi.eu/viewtopic.php?p=11562#11562 ... Save format changed, removed compatibility workarounds.	2014-02-19 01:04:27 +00:00
alexvins	d01b84b460	[mechanics] fix copy-paste errors in magic skill arrays ... [c::b] few tweaks to configuration	2014-02-15 09:40:33 +00:00
Ivan Savenko	48d6e2cd59	- move campaigns description into new config file, campaignSets.json ... - campaigns parser uses binary reader, fixes #1711 - fixed description of change resolution button	2014-02-14 22:46:06 +00:00
Ivan Savenko	e6f433795b	- fixed some crashes on staring a map/campaign	2014-02-08 21:05:24 +00:00
Ivan Savenko	562dc02b3b	- fixed crash on decompressing some files from gzip stream (reported on ... forums)	2014-02-08 10:30:10 +00:00
beegee1	95034b9fa0	- Updated PCH to use our StdInc.h as the prefix header (not generated one from cotire) -> no exclude headers from ffmpeg/etc... statements required ... - Fixed compilation error (VCAI ResourceSet logging)	2014-02-05 20:25:36 +00:00
Michał W. Urbańczyk	55271e621b	Possibility to switch autoskip in the runtime.	2014-02-02 14:39:32 +00:00
Michał W. Urbańczyk	55165a8535	Fixed #1686. Compatibility measures to be removed later, when format changes become to big.	2014-02-02 14:31:56 +00:00
Ivan Savenko	14535c1c7b	- fixed crash on finishing a campaign.	2014-02-01 14:32:09 +00:00
beegee1	df0a28d9cb	- added PCH compilation for CMake using cotire module (PCH is OFF per default, can be enabled with ENABLE_PCH=ON)	2014-02-01 13:37:26 +00:00
Michał W. Urbańczyk	be3bd35b95	Hopefully fixes #1677 and its duplciates.	2014-02-01 13:35:03 +00:00
beegee1	d4fd361d4b	- fixed #1643 -> hero placeholder handling ... - fixed bug when loading victory/loss conditions of the 3rd scenario in the first ROE campaign - fixed bug when loading artifacts to hero of the 3rd scenario in the first ROE campaign (due to corrupt H3M map) - implemented function object to quickly find a object by it's sub ID in a list - added netbackbase.h to header list in CMake - removed false message which said that the server loaded the map successfully	2014-01-30 18:56:31 +00:00
Ivan Savenko	3779a54ddd	- probably fixed 1671 ... - fixed missing loss condition in Birth of Barbarian - fixed some bugs found by cppcheck	2014-01-30 11:08:37 +00:00
alexvins	16d6292be9	[refactor] extract often used classes from lib\NetPacks.h to separate header - less dependecies on whole packets class tree ... [mingw build] fix linking issues with netpacks. Mingw build is finally fixed! [c::b] update projects [config] fix and cleanup spell_info.json	2014-01-16 20:24:06 +00:00
Ivan Savenko	47c91e03b5	- fix to last commit ... - workaround to crash on disabling auto-battle (somehow client "remembers" one command given during auto-battle)	2014-01-14 14:34:08 +00:00
Ivan Savenko	c5b74a2dce	Miscellaneous fixes: ... - proper block of "back" button in campaign menu. - proper block of AI switch in battles - vertical garrisons can now be attacked from top - better UI logging, vcmi will print to log file all pressed buttons - server will not try to build already existing building	2014-01-13 17:44:21 +00:00
Ivan Savenko	fb5c9fc972	- creatures availability tests no longer check for built buildings. ... Fixes #1650 - do not crash if town has 0 creatures on some dwelling level - do not crash if dwelling for some level is not present in town at all	2014-01-11 18:12:09 +00:00
Michał W. Urbańczyk	0b2ca4416a	It is possible to use ffmpeg with Visual Studio 2013 build by definining USE_FFMPEG macro.	2014-01-06 19:12:21 +00:00
alexvins	a740f7989c	[c::b] update projects, disable PHC for now, +few fixes (still wip)	2014-01-05 17:48:50 +00:00
Ivan Savenko	1f325bafb3	fixes #1619 and #1647 ... - removed some no longer needed code from map handler - blocked "back" button on campaign map screen if some of scenarios are already completed	2014-01-05 13:45:44 +00:00
alexvins	339e1cd98b	[c::b] project file for minizip, lib & client update (wip)	2014-01-03 15:43:54 +00:00
Ivan Savenko	2c4c964a45	Large rewrite of adventure map objects: ... - replaced CDefObjInfo with ObjectTemplate class - ObjectTempate is a direct member of objects instead of pointer with shared ownership across CMap, handler and game objects - simplified handling of objects that can change appearance (e.g. towns) - all object queries regarding object appearance/blockmaps use h3m pos instead of relative positions - removed need of modhandler::reload - cleanup of some old code	2014-01-02 23:48:38 +00:00
Ivan Savenko	7e02f6b670	Support for overriding victory/defeat conditions from h3m map or ... campaign: - new file MapFormatJson that implements small subset of Json map format, as described on wiki - vcmi will read overrides from file config/mapOverrides.json (currently empty) - Json writer for logical expressions TODO: write data for map overrides	2013-12-30 23:09:58 +00:00
DjWarmonger	51e6961d08	Compile fix for MVS.	2013-12-29 15:48:56 +00:00
Ivan Savenko	96cc1b0e75	fixed slow loading of map selection window	2013-12-29 12:18:02 +00:00
Ivan Savenko	0c5be52a42	Win/loss conditions based on logical expressions, yet another large ... changeset: - victory/defeat will be detected using triggered events - vcmi will convert h3 conditions into set of triggered events - it is possible to either change number of days without towns or even remove this loss condition completely - possibility of custom win/loss text and icons in pregame (no longer connected to win/loss conditions) Still missing: - No interface to pass custom events/victory conditions into the game - AI would benefit from improvemets (handle all victory conditions, select best one to fulfill) - You have X days till defeat message still hardcoded to 7 days	2013-12-29 11:27:38 +00:00
Ivan Savenko	f6c1dace6c	Minors: ... - By default, cmake will keep debug info - removed warnings from adventure map infobox (part of #1636) - adventure map infobox will refresh on artifact changes (part of #1636) - moved terrain music files to terrains.json file - player should act before AI in all games, not only campaigns	2013-12-28 18:57:08 +00:00
beegee1	11ca1ec1f8	- Fixed custom main hero handling (map options) ... - Refactoring	2013-12-23 15:59:37 +00:00
Ivan Savenko	41cb1603e1	Fix for #1624 : ... - recreate adventure map interface on each scenario (to make sure that there is no garbage data from prev. game) - added check to avoid such situations in future	2013-12-20 15:00:48 +00:00
beegee1	68bdf71db6	- Fixed GCC compiler warnings ... - Implemented move heroes to next scenario partially	2013-12-20 13:07:58 +00:00
Ivan Savenko	29f4a12814	- fixed some evil memory leaks ... - fixed recursive dependency of castles	2013-12-19 19:43:16 +00:00
Ivan Savenko	881a7cf862	- added check to avoid recursion in AI town building code ... - restored previously missing AI shield during AI turn	2013-12-19 17:29:35 +00:00
beegee1	f0cbbbdb70	- Refactored method CGameState::init	2013-12-18 18:18:12 +00:00
beegee1	61fc216a6f	- Fixed mantis #1421 ... - Fixed initial map selection in campaign bonus screen	2013-12-17 17:14:55 +00:00
beegee1	d1002f7e8f	- Fixed starting another map from campaign bonus selection screen while playing a campaign mission	2013-12-17 12:12:25 +00:00
beegee1	b9b25ef552	- Fixed mantis #1422 (starting another scenario crashes VCMI for now) ... - Refactoring	2013-12-16 18:39:56 +00:00
stopiccot	c5e0e48d98	Some OS X related fixes	2013-12-13 11:51:15 +00:00
beegee1	69eee05ccc	- Partially fixed mantis #1065 (Gate with hex 95 can't be attacked) ... - Fixed 'catapult tried to attack non-catapultable hex!' problem, now catapult attacks attackable wall parts only - Fixed problem that the server performed applying damage on a wall part twice - Added methods for checking what wall parts are attackable and if a wall part is potentially attackable - Added functionality to trace net packages - Added functionality to trace std::vectors - Added tracing for CatapultAttack(CPack) - Updated various toString methods to use {} instead of [] - Refactoring	2013-12-08 17:54:13 +00:00
Ivan Savenko	5de70ba235	Minor fixes: ... - properly re-enable necessary mods during update - do not crash if building border is fully-colored	2013-12-08 10:07:06 +00:00
beegee1	f2cc630e2c	- Show confirmation dialog when pressing Alt + F4 to quit the game	2013-12-07 18:26:15 +00:00
beegee1	6caac8e82b	- Fixed mantis #1613	2013-12-07 10:04:17 +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
DjWarmonger	b3b523b768	Compile fixes for MVS.	2013-12-03 15:24:13 +00:00
Ivan Savenko	ee1b0459e6	Extended building dependencies: ... - buiding/structure lists must use object format. This may break some outdated mods. - generic support for logical expressions that consist from and/or/not operators. - string ID's for buidings are now actually used.	2013-12-02 11:58:02 +00:00
DjWarmonger	21c18e44a0	Components of combined artifacts will now display info about entire set.	2013-12-01 13:08:35 +00:00
beegee1	36a69aaa2f	- Fixed VS project files (added missing .cpp files) ... - Structured VS project files (added a filter for every subfolder)	2013-11-30 14:22:03 +00:00
beegee1	41e274b4aa	- Moved FunctionList from /client to /lib -> used in client and server ... - Updated project files	2013-11-30 10:08:38 +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
Ivan Savenko	27a30b5ff9	- compile fix ... - fixed crash if json defines only one creature horde	2013-11-24 11:36:51 +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	2b6cdd5f41	- (linux) launcher will be available in OS start menu/launchers as ... "VCMI" and client will be present as "VCMI Client"	2013-11-16 18:13:30 +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
beegee1	237e4272da	Fixed mantis #1485	2013-11-10 15:04:29 +00:00
beegee1	e01ef8e36a	- Fixed mantis #1576 (doesn't hang game) ... - Implemented output stream operator<< for various classes(BattleAction, BattleHex,...) to improve debugging and logging	2013-11-09 16:25:20 +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
beegee1	86b7feeab3	- Fixed mantis #1248 ... - Fixed spellbook page save positions for hotseat mode	2013-11-03 18:16:25 +00:00
beegee1	94bee3fd1b	- Changed visibility of curInt member of BattleInterface from public to private and provided a getter method	2013-11-03 16:44:47 +00:00
Ivan Savenko	0e3eae3095	patch from KroArtem	2013-11-03 12:51:25 +00:00
Ivan Savenko	c4716d0a9a	- reordered files in cmake so files with long compile times will be ... compiled first. - changed format of modSettings.json, VCMI should properly update file on the first run. - implemented property "defaultTavern" that acts as default value for "tavern" entry in hero class and town formats.	2013-11-03 12:07:23 +00:00
beegee1	aa1c193b88	Fixed mantis #1582	2013-11-02 20:07:45 +00:00
Ivan Savenko	6cb3cb006d	Several minor fixes/features ... - moved all traslatable strings into one json file, removed threats.txt file - implemented "spellbook animation" option - fixed missing central tower when attacking fort	2013-10-27 13:05:01 +00:00
Ivan Savenko	9237e6d97d	Improved json validation ... - split JsonNode.cpp into JsonNode and JsonDetail files - validation should be notably faster (at least 10% faster loading) - support for "format" field, allows checking existance of files. - minor fixes in schemas - msk/msg files are now optional	2013-10-26 19:33:34 +00:00
Ivan Savenko	e2c037402c	Unicode support. ... - boost-locale library is now required (boost 1.48 or higher) - Unicode namespace that contains UTF-8 handling - All non-ASCII strings from H3 data will be converted to UTF-8 during loading - All JSON files MUST use UTF-8. - H3 data encoding can be selected via launcher or directly in config file	2013-10-25 21:45:14 +00:00
Ivan Savenko	f6a3d6770f	- chinese fonts now use fallback to H3 fonts for ASCII characters ... - proper messages for not implemented main menu entries - some cleanup of CMessage::breakText()	2013-10-20 21:53:27 +00:00
Ivan Savenko	f838cceddd	- fixes Inferno Castle Gate	2013-10-17 13:54:12 +00:00
Michał W. Urbańczyk	d5263d75f8	Fixed #1490.	2013-10-13 17:37:59 +00:00
stopiccot	cbc8cde10a	some OS X fixes	2013-10-07 01:19:02 +00:00
Ivan Savenko	d09294e40a	compile fix, fixes blit order of heroes in siege	2013-09-30 08:45:26 +00:00
Ivan Savenko	84dea676f2	compile fix, fixes missing end-of-line #1483	2013-09-28 13:32:49 +00:00
Michał W. Urbańczyk	0abbe71b25	Merged fixes from the branch.	2013-09-28 00:58:33 +00:00
Michał W. Urbańczyk	c6c53a5b1e	Few more freeze-related fixes.	2013-09-28 00:30:12 +00:00
Michał W. Urbańczyk	d1807585ad	Fixed at least two #1428 freezes, likely more. ... They were occurring when AI hero visited bank that was also guarded by neutral creature nearby,	2013-09-27 23:46:58 +00:00
Michał W. Urbańczyk	4f29b526ca	The battle callback method battleGetAllStacks will by default omit the arrow turrets. Fixes #1453, #1455 and related.	2013-09-27 19:42:17 +00:00
Ivan Savenko	eb6ff6b114	fixes #1482, add one pixel spacing for Chinese fonts	2013-09-25 21:15:15 +00:00
DjWarmonger	1ea9dab30d	Creature abilities without any name (but with graphics) will display in creature window.	2013-09-25 10:41:32 +00:00
Ivan Savenko	208df34fc2	bigfixing & new file: launcher/jsonutils.cpp ... - launcher uses json parser from vcmi lib instead of one from Qt #1469 - fixed abilities overrides for some creatures #1476 - fixed hero portraits in seer huts #1402 - ttf fonts will render text in utf-8 mode. Not really useful at this point - new settings entry, available in launcher: encoding. Unused for now.	2013-09-21 18:29:26 +00:00
DjWarmonger	d06b02638b	Partially implemented #481	2013-09-17 12:02:33 +00:00
Michał W. Urbańczyk	d4a8e90460	Fixed #1448, #1470	2013-09-14 19:09:35 +00:00
Michał W. Urbańczyk	291da5e893	Fixed #1442, likely a few others as well.	2013-09-12 22:33:08 +00:00
Michał W. Urbańczyk	b62bb096a7	Fixed #1430, work-around to make #1435 non-crashing. ... Fixed at least one of the #1428 infinite turns cases.	2013-09-11 21:57:08 +00:00
Ivan Savenko	6331995afd	minors: ... - fixes missing line of pixels with Chinese fonts - disabling a mod won't disable all its requirements as well	2013-09-08 18:35:09 +00:00
Ivan Savenko	e13dc872e0	- support for Chinese fonts (GBK 2-byte encoding) ... - fixes #1446	2013-09-08 16:49:23 +00:00
Ivan Savenko	42879225f0	minor fixes: ... - don't crash if image can't be player-colored (no palette) - fixes #1447 - compile fix	2013-09-08 13:02:34 +00:00
Ivan Savenko	76c77d58f6	const-ified CTown. May fix #1444	2013-09-06 21:57:16 +00:00
Michał W. Urbańczyk	385f4ab7f5	#1153 and #1395 should be fixed. Terrible, terrible, terrible. ... Fixed crash in battles, when attempted to access <0 screen coordinates.	2013-09-01 22:55:57 +00:00
Ivan Savenko	708b0c6f47	- fixes #1424 - added missing override and CLabel::visibleText()	2013-09-01 17:34:46 +00:00
Ivan Savenko	7f43150bb9	- fixes #1423 - convert values to int before using	2013-08-31 00:21:29 +00:00
Ivan Savenko	fba4c2cf9e	- fixes #874	2013-08-30 13:19:08 +00:00
Ivan Savenko	8ac6a1fcf4	- fixes 1394	2013-08-29 20:35:24 +00:00
Ivan Savenko	83440f1149	A bit more text-related work: ... - credits screen will use multi-line label instead of hackish usage of text box - campaign intro movie player now plays voiced intro - minor fixes to last commit	2013-08-29 16:41:14 +00:00
Ivan Savenko	6bee105d7d	Some refactoring of text display widgets: ... - renamed some methods/classes with better names + some consistency (no more print, setTxt and setText that do exactly same thing) - TextBox now contains label widget instead of inheriting it - smooth scrolling support (up/down buttons still scroll one line)	2013-08-29 13:46:27 +00:00
Ivan Savenko	db1dc1dcc6	- fixed terrain music restarting every tile ... - field "contact" for mod.json schema	2013-08-20 10:47:40 +00:00
Michał W. Urbańczyk	3b42cff3ec	#1409 should not crash anymore. ... Fixed crash on serializing empty path. [How did it got there...?] operator<< for boost::optional.	2013-08-18 15:46:28 +00:00
Ivan Savenko	45c2bd7511	hopefully fixes #1397. Still too much magic in this code :(	2013-08-09 17:37:41 +00:00
Ivan Savenko	8beee29482	- corrected "isToReverse" check, partially fixes 1397 ... - ballistics fix - minor	2013-08-06 15:25:51 +00:00
Ivan Savenko	c81a31c74a	- catapult attacks should be identical to H3 ... - catapult may miss and attack another part of wall instead (this is how it works in H3) - minor fixes	2013-08-06 11:20:28 +00:00
Michał W. Urbańczyk	58ccaa2e93	The cmath "fix" was not needed after all, the includes order decides.	2013-08-02 08:28:52 +00:00
Michał W. Urbańczyk	c57b159fc9	Missed one call.	2013-08-01 22:36:49 +00:00
Michał W. Urbańczyk	f897333b2c	Don't crash when music file cannot be found.	2013-08-01 13:52:01 +00:00
Michał W. Urbańczyk	7a90ead051	VS-2013 issue.	2013-08-01 11:58:30 +00:00
Ivan Savenko	b57b14b752	- fixed several bugs with siege graphics, including #1389 ... - removed "shooterHeight" property - seems to be same in all towns.	2013-07-31 22:24:44 +00:00
Ivan Savenko	ee09c5301e	minor fixes: ... - vcmi can play music files from archives - converted resource_reward fields in bank_config into json object, fixes 3000 gems reward in shipwreck - some compile fixes for minizip	2013-07-31 11:36:42 +00:00
Ivan Savenko	1d9139303a	introduced zip support into vcmi ... - minizip library is now part of sources, located at lib/minizip - cmakefiles will compile minizip as dynamic library (Note: only 2 files used by vcmi are included in minizip.so) - zip files can be loaded similar to other archives via filesystem.json - mods can use Content.zip instead of Content/ directory. Files in directory will replace files in archive.	2013-07-30 15:02:55 +00:00
DjWarmonger	d8594576e2	One more compile fix, works now fine on Windows.	2013-07-29 12:15:50 +00:00
Ivan Savenko	77496bcea9	- fixed several cases of accessing full path to files in archives	2013-07-29 11:38:18 +00:00
DjWarmonger	a314a81fd5	Compile fixes. Game doesn't even launch, however.	2013-07-28 18:57:07 +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	5f310aa20f	Fixed all issues with Resurrection: #123, #1358	2013-07-27 19:01:31 +00:00
DjWarmonger	b36be10e30		2013-07-25 11:53:36 +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
Ivan Savenko	a719e03b30	- fixed #1375 ... - damage done by turrets is properly increased by built buldings	2013-07-22 16:23:23 +00:00
DjWarmonger	4fd9bcfedc	Fixed #1345	2013-07-22 10:39:11 +00:00
Michał W. Urbańczyk	d8a27d8f3c	Refactored player-specific data into single struct BattleState.	2013-07-21 22:01:29 +00:00
Ivan Savenko	491bd557ef	fixed several bugs reported on forum: ... - necromancy issues - fix for lookout tower - Sir Mullich is unavailable - first hero is awakened on next turn - give 500 XP on defeating hero	2013-07-21 18:27:33 +00:00
Ivan Savenko	a148c39e0a	more battles animations: ... - UI will be correctly greyed-out during opponent turn - fixed remaining issues with blit order - a bit better handling of catapult attack - fixes #1362	2013-07-21 10:10:38 +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
Michał W. Urbańczyk	e45d174ba5	Fixed crashes on Land Mines / Fire Wall casting.	2013-07-20 21:35:12 +00:00
Ivan Savenko	096d6ebf9c	refactoring of CBattleInterface::show() and all related code ... fixes most of blit order-related bugs in battles (#1200, #1238, #226) known issues, will fix soon: - there are still some minor blitting issues during movement - destruction of walls in siege is out of sync with catapult projectile movement	2013-07-19 16:35:16 +00:00
DjWarmonger	b925a75ecc	Tweaked Frenzy spell which now ends at the beginning of stacks turn, not at the end of turn (#1332).	2013-07-17 10:54:07 +00:00
Ivan Savenko	43db5587a1	- minor fixes to battle animations ... - fixes crash on siege start	2013-07-16 22:59:39 +00:00
Ivan Savenko	1a77fee7f7	more improvements for battle animations ... - synchronized attack/defence animation - spell animation speed uses game settings - added logging domain for battle animations - fixed disrupting ray duration	2013-07-16 18:12:47 +00:00
DjWarmonger	4f7c6b8d34	Fixed #688	2013-07-15 08:51:48 +00:00
Ivan Savenko	91cd88ba97	- compile fix for OSX	2013-07-11 20:10:17 +00:00
Michał W. Urbańczyk	d4ce091d2b	A patch from Gernsworth related to #1204 — spell effects will be layered along with the creatures.	2013-07-10 10:45:51 +00:00
Ivan Savenko	4ac2a6e8b6	minor refactoring of VCMIDirs, bugfixing ... - VCMIDirs represent XDG specification more closely (partial #1310) - Minor bugfixing, including #1327 #1328 and #1306	2013-07-08 20:55:22 +00:00
Ivan Savenko	410ec92668	Minor fixes: ... - removed unused functionality from CCreatureAnimation - simplified postioning of units in battle, should fix remaining issues with unit positioning - fixed unit tests compilation	2013-07-07 19:44:08 +00:00
Michał W. Urbańczyk	516684aaab	Visual 2012 compile fixes. ... Unfortunately no C99 math nor uniform initialization till VS 2013.	2013-07-07 08:27:27 +00:00
Ivan Savenko	146a5e5ef8	Made speed of most of battle animations time-based ... - speed of creature-related animation no longer depends on framerate - most of values from cranim.txt are now used correctly - removed BMPPalette struct in favor of SDL_Color - animation group "DEAD" that is used to display dead stacks, by default consists from last frame of "DEATH" group Notes: - animation speed may still need some adjustments - range of config property "battle/animationSpeed" has been changed. This may result in extremely fast animation. To fix - change animation speed via options.	2013-07-06 16:10:20 +00:00
Michał W. Urbańczyk	a1f545792b	Compile fixes specific for VS 2012" ... * Reverted std::bind to boost::bind. std::bind on Visual 2012 doesn't work in some cases (especially with std::ref), not sure why [but it seems to be a bug, since 2013 preview compiles the same code fine]. * Move assignment operator for VS 2012.	2013-07-02 15:23:32 +00:00
Michał W. Urbańczyk	4576719abe	Visual Studio 2013 Preview compile fixes: ... * 0 is not convertible to std::function, nullptr should be used * std::ref(rand) is not convertible to function<int()>, used lambdas (why we dont just pass "rand" ? ) * CFunctionList needs to be constructible from nullptr * move constructor for CMapInfo (Visual cannot generate them :( ) * #ifdefed some stuff that is not needed anymore since cmath is updated with C99 stuff * using std::make_unique instead of our vstd implementation CSelector: * introduced a class in place of typedef * Having an overloaded && || operators over sth that is convertible to bool… Wasn't a good idea after all. Purged the operators, replaced with And/Or methods (chaining-style). * constructor that is present only when constructing from class or function (SFINAE). std::function has an implicit converting constructor from T causing ambiguities (even if the overload would cause compile error in the body)	2013-07-02 12:08:30 +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
Michał W. Urbańczyk	1a2c8de6ad	Minor improvements.	2013-06-24 14:35:27 +00:00
Ivan Savenko	dd808ef5cc	bugfixing: ... - support for one more Russian localisation, fixes #1321 - fixed icon for level 1 town hall, #1294 - correct portraits for first heroes from mods, #1297 and probably #1298 And a lot of gcc compile fixes	2013-06-23 19:35:54 +00:00
Michał W. Urbańczyk	17403b544c	Various fixes for quick combat. ... Replaced several boost::bind usages with lambdas.	2013-06-23 16:09:15 +00:00
Michał W. Urbańczyk	06f0a29b31	Compile fixes for gcc, as per http://forum.vcmi.eu/viewtopic.php?p=9638#9638	2013-06-23 12:36:18 +00:00
Michał W. Urbańczyk	04d11519ef	Quick Combat system setting works… if user doesn't click in the meantime.	2013-06-23 11:25:48 +00:00
Michał W. Urbańczyk	2a471eeb1a	Addec quick combat to system options window. ... Compile fixes [I don't know why it has compiled for me before].	2013-06-23 07:54:33 +00:00
Michał W. Urbańczyk	4a0587d500	More work on auto-fight. ... Dynamic libraries return smart-pointers to what they create.	2013-06-22 21:47:51 +00:00
Michał W. Urbańczyk	2be2143844	Game interfaces can register another interfaces to receive info on game events.	2013-06-22 18:22:44 +00:00
Michał W. Urbańczyk	254f194220	Some very early work towards autofight feature. ... Added EmptyAI to the solution. Passing callbacks by shared_ptr.	2013-06-22 14:47:20 +00:00
Michał W. Urbańczyk	06dbdd234f	Further changes for duel mode. It is possible to pass names of AIs to be used by command line. Moved things in battle AI.	2013-06-21 20:59:32 +00:00
Ivan Savenko	6737c270c9	gcc 4.5 compatibility fixes. Mostly due to lack of fully finctional nullptr class	2013-06-19 21:26:27 +00:00
Michał W. Urbańczyk	6a88604937	* fixed crash related to cammander's SPELL_AFTER_ATTACK spell id not initialized properly (text id was resolved on copy of bonus) ... * fixed duels, added no-GUI mode for automatic AI testing * minor things	2013-06-17 15:45:55 +00:00
Michał W. Urbańczyk	30fb552fb4	Patch from Gernsworth fixing #1283.	2013-06-15 22:09:15 +00:00
Ivan Savenko	08b2af3ccb	- fixed "get txt" console command ... - command "extract" to extract file by name - command "def2bmp" to convert def into set of frames.	2013-06-10 17:02:37 +00:00
Ivan Savenko	870399c7be	- updated link to repo in readme ... - image loader will report last SDL error if loading failed - fixed parsing of floats from H3 txt's	2013-06-09 10:09:28 +00:00
Michał W. Urbańczyk	8bfc6a1116	A patch from O01eg: http://forum.vcmi.eu/viewtopic.php?p=9313#9313	2013-06-02 19:53:13 +00:00
Ivan Savenko	0c5a717e08	- fixed crash in town after loading #1291 + extra check just in case. ... - disabled intro menu animation for now - different position in different versions (WoG, SoD) - removed no longer needed entry for Linux video from filesystem	2013-06-02 18:57:58 +00:00
Ivan Savenko	1c0ccd2b02	- fixed some bugs with artifacts icons	2013-05-31 11:46:19 +00:00
Ivan Savenko	3fbcf86dec	- fixed broken again palette in some battle backgrounds	2013-05-31 10:25:23 +00:00
Ivan Savenko	4724ccbb45	- fixes #1276 ... - minor fix to json arrays merging - fixed update of growth icons on town screen	2013-05-30 18:43:45 +00:00
Ivan Savenko	3943c10f1a	fixes #1237 - if server savegame entry is missing it will be created in "update mode".	2013-05-30 16:25:00 +00:00
Michał W. Urbańczyk	1e8e932323	Logging around #1237. Typos.	2013-05-30 12:14:39 +00:00
Michał W. Urbańczyk	79026bdfde	Introduced strongly typed QueryID. ... Exchange between heroes is now a proper first-class query. Fixes #1269. #66 should also be finally fully fixed. VC projects: /Zm flag to fix compilation issues with recent Boost.	2013-05-27 10:53:28 +00:00
Ivan Savenko	dca8e9fa6f	- removed access to one wog file ... - removed way to avoid dependency checking in identifiers resolution - minor fixes	2013-05-21 22:11:44 +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	c85829a00c	* creature window prints morale/luck for actual stack in battle (CStack), not stack as seen in hero screen (CStackInstance), fixes #1264 ... * creature abilities bonus properties are updated when the creature id is assigned * removed decrease morale ability from config file (it was duplicating the one from ZCRTRAIT.TXT	2013-05-19 19:53:03 +00:00
Michał W. Urbańczyk	fc6e72dc75	* Fixed enchantments (#1265). Their effects were not properly added when reading config. Battle interface will be little less likely to block itself after corrupted spell cast. ... * Fail gracefully when the file from which game is started is in invalid version. * Bumped versions.	2013-05-19 15:14:23 +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
Michał W. Urbańczyk	f95e6c233b	It is possible to set on visit query that object is to be removed after visit is over. ... Fixes #1263.	2013-05-14 13:42:52 +00:00
beegee1	42c2c29976	- Added support for RMG templates(subset of OH3) - Added template "Small Ring" for testing	2013-05-11 17:36:11 +00:00
Michał W. Urbańczyk	5c2473d436	Support for saving/loading in player interfaces, including VCAI. ... Minor changes.	2013-05-09 11:09:23 +00:00
Ivan Savenko	b3bbe27089	- ignore wog maps if wog is not present	2013-05-04 19:20:32 +00:00
Ivan Savenko	8be801a6dc	- CMappedFileLoader class to remap WoG files to h3 names ... - WoG should be optional, all remapped files are listed in WoG/config/wogFileOverrides.json - fixed several cases of incorrect positioning of creatures in battles - some missing sounds for battle effects - negative luck support, disabled by default - a bit hackish detection of WoG presence, VCMI should work on SoD-only installs	2013-05-04 13:14:23 +00:00
stopiccot	da659a4924	tiny fix in OS X cmake files	2013-05-01 12:30:46 +00:00
Ivan Savenko	b20f8fd3d4	- fixed uninitialized access into modHander ... - fixed #389	2013-04-28 15:06:14 +00:00
DjWarmonger	a7ed3ee3d0	Fixed #987	2013-04-27 08:11:20 +00:00
Ivan Savenko	8273f323b1	- it is possible to edit data of another mod or H3 data via mods ... - mods can access only ID's from dependenies, virtual "core" mod and itself (optional for some mods compatibility) - metadata field for JsonNode, used to track source mod - moved wog creatures into wog mod - (linux) convertMP3 option for vcmibuilder for systems where SDL_Mixer can't play mp3's	2013-04-25 14:03:35 +00:00
Ivan Savenko	e71bace8e3	- fixed crash on missing icons ... - proper ID resolution for secondary skills to avoid #1258	2013-04-23 09:16:20 +00:00
Ivan Savenko	3285f1910b	- finally, solution for imageIndex fields. All image lists will be generated in runtime ... - iconIndex fields from json are no longer used - simple check for missing icons on startup	2013-04-22 19:51:22 +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	8a4f81b981	Tribool - part II.	2013-04-21 12:28:26 +00:00
Michał W. Urbańczyk	6e1464b568	Tribool - I used it wrong.	2013-04-21 12:24:54 +00:00
Michał W. Urbańczyk	d1d67caa0b	Get rid of some old serialization workaround code that is not needed because serializer was improved in the meantime. ... Fixing #1254. Fixed possible race causing corruption of the server savegame.	2013-04-20 18:44:55 +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	b1428bcd24	- Compile fix for editor - Renamed /Editor to /editor and Scripting/ERM to scripting/erm - Removed unused ipch folder and format file - Removed ancient lua folder	2013-04-13 11:07:32 +00:00
Ivan Savenko	0cf969d508	- console logger by default uses same format as previously (no extra data) ... - a lot of changes in configs; - - update to creature format - abilities are now json structure - - multiple bugfixes revealed by validation - made schemas a bit more strict - creatures data can be replaced via mods - it is possible to validate vcmi configs using schemas (disabled)	2013-04-11 19:24:14 +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	6827fcdb53	- Integrated the logging API into the server project - Simplified CBasicLogConfigurator usage(exception handling, logging, log file appending)	2013-04-10 17:18: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	30bcec42c6	- Renamed client/BattleInterface to client/battle and client/UIFramework to client/gui	2013-04-07 11:52:07 +00:00
beegee1	ee51c5beb5	- Renamed /lib subfolders to lowercase	2013-04-07 10:48:07 +00:00
DjWarmonger	f39ad093b9	Compile fix.	2013-04-04 19:54:58 +00:00
Ivan Savenko	2a469d4ffc	- removed hardcoded set of catapult trajectories ... - some more improvements into projectile blitting Remaining issues: - timing is off when catapult hits walls/tower - catapult trajectory may need tweaking	2013-04-04 18:20:25 +00:00
stopiccot	f2309d70dd	replaced extern SDL_Surface* X; all over the code with single header	2013-04-04 14:58:54 +00:00
Ivan Savenko	619a07da03	- projectile blitting should be closer to original H3. But still not perfect. ... - removed no longer needed field "projectile spins"	2013-04-04 13:18:38 +00:00
Ivan Savenko	655ade9a00	- vcmi will not crash if building selection area is smaller than def ... - detection of transparency on selection area is closer to H3	2013-04-03 16:28:50 +00:00
Ivan Savenko	c927913f5f	- Improved json validation. Now it support most of features from latest json schema draft ... - Set of schemas in config/schemas directory that are used to validate input from mods.	2013-04-02 17:06:43 +00:00
Ivan Savenko	c4c592b773	- bugfixing: #1243, #1227, #1241, #1236, #1233	2013-03-14 20:44:00 +00:00
Ivan Savenko	5082dafd62	- h3 hero classes and artifacts can be modified via json ... - commander artifacts are now merged into main artifacts.json, todo - split 2.5k file into something manageable	2013-03-12 14:56:23 +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
DjWarmonger	2ee5c4b745	Fixed stack artifact (and related buttons) not displaying in creature window.	2013-03-05 08:01:14 +00:00
mateuszb	dbec99ffc7	* PlayerColor and TeamID refactoring	2013-03-03 17:06:03 +00:00
Ivan Savenko	b5fcefe455	- moved all system-specific handling of filesystem to VCMIDirs.cpp (new file) ... - fixed #1128, artifact constituents are now stored as pointers	2013-03-02 18:41:25 +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
Michał W. Urbańczyk	8c7c4789ca	Attempt to apply patch from stopiccot.	2013-03-01 21:32:26 +00:00
Michał W. Urbańczyk	01d1029b1f	Fixed #1221.	2013-02-28 05:09:08 +00:00
Ivan Savenko	9c1c337a3d	- fixed #1220 and #1218 ... - vcmibuilder will correctly install campaign video	2013-02-27 15:46:14 +00:00
Ivan Savenko	b78c4c19ea	- compile fix	2013-02-26 15:07:21 +00:00
DjWarmonger	928d1d2121	- Some work on bonus system, effect range can be ignored. TODO: usage of bonus with any subtype. ... - Fixed #1156	2013-02-26 09:36:21 +00:00
Ivan Savenko	57d23c74ee	patches from qdii	2013-02-25 19:17:36 +00:00
Ivan Savenko	e8c35bdb24	fixed extremely slow musicHandler compilation. Removed usage of boost bimap.	2013-02-24 10:05:56 +00:00
mateuszb	602827d1ae	* MSVC compilation fixes ... * campaign epilogues and minor fixes	2013-02-23 19:16:14 +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
mateuszb	fbb1ae1bb8	* prologue videos (according to Randjan's list)	2013-02-22 21:03:56 +00:00
Ivan Savenko	9fa59276c9	- OSX patch from stoppicot	2013-02-21 17:32:50 +00:00
mateuszb	92995964f3	a bit more of prologue/epilogue screen	2013-02-20 21:01:18 +00:00
mateuszb	b776b93b0c	* a bit of campaign prologue/epilogue screen	2013-02-19 20:39:09 +00:00
Michał W. Urbańczyk	6fdf64c2b1	Little more logging.	2013-02-18 23:10:46 +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
DjWarmonger	111312636a	Fixed #1207. Some tweaks.	2013-02-17 18:53:01 +00:00
mateuszb	560315bc48	* SlotID refactoring	2013-02-16 14:03:47 +00:00
Michał W. Urbańczyk	d23a5dcfdf	Fixed #1208.	2013-02-14 15:19:35 +00:00
mateuszb	9e00090c42	* refactoring, a few intriguing problems remain	2013-02-13 23:55:42 +00:00
mateuszb	6d06710684	* fixes for town building campaign bonus	2013-02-13 14:21:11 +00:00
DjWarmonger	ac742affe5	Compile fix	2013-02-13 07:22:55 +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
Ivan Savenko	5a8787b74d	- fixed some compiler warnings, gcc\clang work fine ... - better handling of innoextract in vcmibuilder.	2013-02-11 22:36:12 +00:00
DjWarmonger	4f75e47c47	Fixed crash with Firewall / Forcefield cast when there is dead stack.	2013-02-11 20:08:53 +00:00
mateuszb	8a8eecd063	* refactoring	2013-02-11 19:11:34 +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	2f39db2375	Hero portraits in campaign bonus selection.	2013-02-09 19:19:14 +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
Ivan Savenko	a269b22741	- fixed incorrect appearence of hero in battle ... - vcmibuilder works with spaces in filenames - by default output directory for vcmibuilder is ~/.vcmi	2013-02-09 12:34:49 +00:00
mateuszb	0003d30991	* refactoring	2013-02-08 22:42:46 +00:00
mateuszb	9dd60b6dbe	* refactoring ... * moat damage went to config file	2013-02-08 21:17:39 +00:00
mateuszb	f1c78e3260	* creature ID refactoring ... * double week creatures are configurable now	2013-02-07 17:34:50 +00:00
Michał W. Urbańczyk	124d732171	* fixed race condition crash ... * no crash when there is no creature in dwelling (that should not happen at all... but) * removed paths from vcxproj, use property sheets	2013-02-07 15:27:22 +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
Ivan Savenko	56ffd05648	patch from stoppicot: ... 1. vcmiclient now usese custom Info.plist 2. Original H3 game data is now also stored in Application Support folder	2013-02-06 15:39:34 +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
Ivan Savenko	3f309f0c5e	- removed support for ancient versions of ffmpeg ... - some cleanup in Linux video player	2013-02-05 23:11:48 +00:00
Michał W. Urbańczyk	60c18f1bb8	More fixes for campaigns.	2013-02-05 21:19:08 +00:00
Michał W. Urbańczyk	17755caa10	* fixed #1199 ... * fixed advancing between misisons in campaigns	2013-02-05 20:06:13 +00:00
Ivan Savenko	8ffd482324	- gcc compile fix ... - mismatching enum (?) in HeroBonus - probably fixed some cases of unaligned access	2013-02-05 19:56:28 +00:00
mateuszb	898228fd54	* minor fix for bonus selection screen	2013-02-05 19:33:09 +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
Michał W. Urbańczyk	1fca96257d	Fixed #1197.	2013-02-03 15:05:30 +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
Ivan Savenko	6a5af58aed	(linux) version bump to 0.91	2013-02-01 08:58:14 +00:00
mateuszb	a1da195b85	* minor refactoring	2013-01-31 20:11:25 +00:00
mateuszb	4ae4b998a3	* bug 1165 fixed	2013-01-31 17:52:10 +00:00
mateuszb	5b0c6059e2	* bug 1193 should be fixed ... * minor refactoring	2013-01-30 21:28:31 +00:00
Ivan Savenko	a82601db72	- playing a bit with ttf fonts: bugfix + shadow rendering	2013-01-29 22:43:39 +00:00
Ivan Savenko	9caa21a51c	- fix for #1189 (h3 text parsing fix) ... - fix for #1188 (replaced ffmpeg detection with module from KDE)	2013-01-26 19:39:54 +00:00
beegee1	db2f468341	- Fixed some bugs when generating terrain view IDs (mock map seems to be OK) - Enabled RMG by default	2013-01-26 13:48:20 +00:00
DjWarmonger	dcedfb05d2	Fix for #1187	2013-01-25 14:39:28 +00:00
DjWarmonger	dad5771a09	Workaround for new artifacts r-click descriptions, they will be displayed in same way as OH3 artifacts.	2013-01-24 08:01:43 +00:00
Ivan Savenko	080e037c54	- fix for starting towns (#1180) ... - fix for creature window (#1184)	2013-01-23 22:09:58 +00:00
Ivan Savenko	6b3debc5ed	- fixes for market window (#1182) ... - aligment issues on level-up window	2013-01-22 23:28:10 +00:00
DjWarmonger	e5783801af	Fixed #1183	2013-01-22 09:47:25 +00:00
beegee1	a4129f43f2	- Correct handling of who manages which players(player count may differ from initial start options for a RMG map) - Fixed warning	2013-01-21 20:49:19 +00:00
DjWarmonger	a0e72785a6	Fixed doubled descriptions in creature window.	2013-01-21 09:32:51 +00:00
Ivan Savenko	46eb0b3daf	- wrokaround/fix for #1177 ... - removed assert in Fonts.cpp (can be triggered a lot by old pregame\battles code) - fixed battle console text positioning - fixed some new compiler warnings	2013-01-20 22:49:34 +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
Michał W. Urbańczyk	5b919d88eb	"More stable" opening AI.	2013-01-20 12:06:49 +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
Ivan Savenko	5deb499e7e	Last breaking change into mod system (will explain on forum) ... - paths in "filesystem" node are now relative to mod directory - "filesystem" entry in mod.json is now optional - made "register object" log messages visible only in log - minor fixes, including #1173	2013-01-16 14:28:49 +00:00
Ivan Savenko	2f83b211ca	- fix for text on kingdom overview (#1172 + some other similar cases) ... - removed unused code from text handler	2013-01-12 19:28:38 +00:00
alexvins	f4ee750d64	[refactor] a few more cleanups	2013-01-12 13:53:02 +00:00
Ivan Savenko	7e7d12095b	- basic support for dependencies\conflicts for mods ... - adventure map objects transparency should be more similar to h3	2013-01-10 18:53:49 +00:00
alexvins	d8b068afd9	[c::b] update projects	2013-01-08 09:41:28 +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
mateuszb	2848fb6fef	Gernsworth's patch for bug #1118	2012-12-30 18:29:15 +00:00
Ivan Savenko	e023b7d6bc	another OS X patch from stopiccot	2012-12-27 09:21:30 +00:00
Ivan Savenko	96cc88ba91	- removed autotools files from ERM ... - fixed misplaced town label	2012-12-25 15:39:06 +00:00
alexvins	9051731755	[c::b] reorganize workspace	2012-12-24 15:55:19 +00:00
Ivan Savenko	0b1c215882	- end of world, at least for autotools. Removed completely in favor of CMake	2012-12-23 19:44:37 +00:00
Ivan Savenko	da6cb0ae12	- trade windows work with new creatures\artifacts ... - removed some duplicated code in creature loading	2012-12-23 10:23:41 +00:00
Michał W. Urbańczyk	fa3d32925e	A patch from Gernsworth that fixes #166. CGStatusBar is extended to support alignment, old CStatusBar class is removed.	2012-12-22 20:05:08 +00:00
Ivan Savenko	4e0881f689	- fixed #1167 ... - CLabel will print text in "{}" using title color	2012-12-20 13:57:29 +00:00
Michał W. Urbańczyk	bcf8cab19a	Project files update/cleanup.	2012-12-19 18:23:21 +00:00
Michał W. Urbańczyk	27f8408c52	Compile fix for MSVC. ... Fixed crash when no maps are present. Fixed crash on opening the loading screen. Fixed crash on starting the turn when Games/ subfolder is not present.	2012-12-19 18:19:09 +00:00
Ivan Savenko	b5ebf443fc	- all fonts handling is now in new file, UIFramework/Fonts.cpp/h ... - common base class for H3 bmp and ttf fonts - replaced fonts.txt with fonts.json	2012-12-19 17:24:53 +00:00
alexvins	66d9edf76e	small refactor secskill limit check.	2012-12-18 11:24:13 +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	62e99a1ae5	- basic loading screen, no progress bar ... - startGame() call will run in separate thread if loading screen is used (looks OK so far)	2012-12-17 18:01:17 +00:00
Ivan Savenko	ff146a80fe	- fixed empty tavern in new towns ... - by default new heroes\new towns will be enabled on maps (no effect without mods)	2012-12-17 12:55:29 +00:00
Ivan Savenko	e36bc50504	- support for new heroes and hero classes ... - moved hero-specific data from text handler to CHero - moved hero classes-specific data into heroClasses.json	2012-12-16 13:47:53 +00:00
Ivan Savenko	c764ce6ebe	- one more unitialized memory crash (#1163) ... - minor tweaks for hero handler	2012-12-15 13:40:22 +00:00
DjWarmonger	f05b398e5c	Compile fixes.	2012-12-15 09:04:55 +00:00
Ivan Savenko	d2ee602b29	- fix uninitialized cursor ... - stubs for loading heroes and classes from mods (no real code yet) - heroes loading uses string IDs for secondary skills, some cleanup in HeroHandler	2012-12-15 08:47:02 +00:00
Ivan Savenko	423a226e31	OS X patch from stopiccot	2012-12-15 07:24:25 +00:00
Ivan Savenko	e695f1ad63	- fixed slow hero screen (not specific to it, but most notable here) ... - fixed some bugs related to animation (cove buildings mostly)	2012-12-14 19:47:38 +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
Ivan Savenko	ca4f53aea1	- some fixes for garrisons (crashfix and correct behaviour of split button)	2012-12-12 12:03:02 +00:00
Ivan Savenko	04358ed0c6	multiple changes in config system, breaks existing mods. See upcoming post on forums. ... - filesystem initialization works in conjuction with modHandler - (config) split buildings.json in multiple files in "factions" directory - (mods) merged filesystem.json and config/mod.json into mod.json	2012-12-12 11:13:57 +00:00
Ivan Savenko	e3231db1c9	- primaryResource and warMachine now use string ID ... - fixed long delays on moving units in garrisons - fixed bug on loading available spells from map - removed unused bigImgs from Graphics	2012-12-11 12:12:46 +00:00
Ivan Savenko	1c5a4c669c	- merged minimap.json into terrains.json ... - removed no longer used fields from Graphics + portraits.json - work on pregame: - - new code for map options window icons + popups - - fixed bugs related to new towns - - less hardcoded magic numbers	2012-12-10 14:28:27 +00:00
DjWarmonger	730cbd930a	Parsing for new artifact format: http://wiki.vcmi.eu/index.php?title=Artifact_Format ... Not finished, not tested.	2012-12-10 13:55:54 +00:00
Ivan Savenko	85a23e298c	- generic string ID -> numeric ID resolution system ... - - hero army and creature upgrade names are resolved using new system - - faction names and creatures in towns are resolved using new system - (linux) replaced build_data.sh with hopefully better vcmibuilder script - minor fixes	2012-12-03 16:00:17 +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
DjWarmonger	c5d9110176	Compile fix for last commit.	2012-12-01 07:17:55 +00:00
Ivan Savenko	2643762f08	Mac OS patch from stopiccot	2012-12-01 06:30:52 +00:00
DjWarmonger	52242692f1	Fixed #1130. ... Moved isToReverse() function to battleCallback so that creature rotation will be handled by core mechanics and not only GUI.	2012-11-29 15:02:55 +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
Ivan Savenko	8eba824ada	- updated icons + psd file ... - better log messages if server failed to open port - 1148 should be fixed. Cleanup in CGameHandler::moveHero() - compile fixes	2012-11-15 21:29:22 +00:00
beegee1	e08db9790b	* Map size can be any integer value * Changed new_*; to new_*(); for zero-parameter c-tors (=code convention; stack allocated objects without parantheses as ever to avoid c++ most vexing parse)	2012-11-13 18:01:31 +00:00
DjWarmonger	f5ddc44827	- Compile fix - unique_ptr can't be serialized ... - Linking fix - now MapGenOptions have DLL-interface (but probably shouldn't be called directly from client anyway)	2012-11-13 12:55:47 +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
beegee1	c336abcf4a	* Added RMG tab to pregame(disabled by default, activate with: enableRMG=true in settings.json) * Fixed tab intendation * Renamed colors to more comprehensible names	2012-11-11 12:23:31 +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
Ivan Savenko	fc85e08a64	- clang and gcc 4.5 compatibility ... - autotools update - debian build system fixes	2012-11-03 19:31:16 +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
DjWarmonger	347bfde310	Added patch for #1144. Thanks cirdan!	2012-10-27 16:59:24 +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	8604234f8d	- fixes for autotools build	2012-10-26 12:57:18 +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
alexvins	b3f317c1ed	fix to prev. commit	2012-10-07 10:38:35 +00:00
alexvins	ff3da291a1	[refactor] reduce some code duplication. no functional changes	2012-10-06 20:35:04 +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	c071a03a8a	- fix for #1135 ... - merged wall_pos.json into town config - removed tower_shooter field from creatures.json	2012-10-05 18:03:49 +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	f113f9573d	- CPack support. Works on my side, needs tweaks for Win	2012-10-05 12:38:17 +00:00
DjWarmonger	4bacd97497	Quests now handled by pointers again, this time without bugs. ... Fixed some issues with quests and AI.	2012-10-03 14:49:29 +00:00
Ivan Savenko	3542bfdc63	- fixed #1128 #1127 #1121 #1119 ... - instructions in linux readme use cmake instead of autotools - update autoconf files	2012-10-02 14:22:58 +00:00
Ivan Savenko	42cbbc8682	- linux version update	2012-10-01 07:05:12 +00:00
mateuszb	099e6bf776	* implemented #1111	2012-09-30 12:19:14 +00:00
Ivan Savenko	07f9cb16c5	- spellbook fix (#1110) ... - possible fix for kingdom overview (#1109) - tweaks for recruit window (part of #1113)	2012-09-30 10:35:17 +00:00
Ivan Savenko	77710eaffb	- fix for #1106 and #1107	2012-09-29 19:18:35 +00:00
mateuszb	657ed41088	* fixed bug in campaigns ... * turned off artifacts.json creation * minor changes	2012-09-29 17:36:48 +00:00
Ivan Savenko	b1557bc6c4	- fixes #1105 ... - minor improvement to resolution selection dialog - removed (hopefully) all cases where neutral faction uses id -1	2012-09-29 15:10:56 +00:00
DjWarmonger	b6a20b6e99	Fixed teleporting animation (#818). Flying ability with subtype "1" will cause movement animation to skip (teleport).	2012-09-29 12:40:12 +00:00
Ivan Savenko	a602d7e9da	- build system update ... - compile\warning fixes	2012-09-29 12:02:46 +00:00
Michał W. Urbańczyk	f8a27a9fdb	* Moved CConfigHandler from client to lib, CMake/Makefile need updating. I believe other projects besides client also need access to settings. (surprisingly there was a "server" category used only by client... and now VCAI.) ... * It is possible to set the battle ai that'll be used by neutrals by typing in VCMI console: setBattleAI <AIName> VCAI also respects that setting and uses given AI as its battle back-end.	2012-09-29 10:59:43 +00:00
Ivan Savenko	b0f669a764	- moved Sprites and Data directory to vcmi "mod' ... - some bugfixing: - - teleporting animation fixed #1087, partially - #818 - - gui adjustments for #1093 and #1090	2012-09-29 08:35:31 +00:00
Michał W. Urbańczyk	2ba0427432	* Fixed #1096 ... * serializing icon index, otherwise creature portraits are gone after loading a game * VCAI: fixed crash on attempting revisiting a boat (that is no longer present because it was boarded) * Fixed strange crash with "neutral hero" (there should be no such thing... but somehow it appears, needs further investigation)	2012-09-28 20:49:23 +00:00
Michał W. Urbańczyk	7e6128b653	Assurance that #1016 won't happen again.	2012-09-28 19:18:08 +00:00
DjWarmonger	0435d5a4f1	- Removed pointer usage for CQuest. may look rough, but works and fixes #1051. ... - Better autoSkip mode, now info windows are not displayed.	2012-09-28 15:46:09 +00:00
Michał W. Urbańczyk	6c017a0fdf	Fixed #1088.	2012-09-28 09:11:18 +00:00
mateuszb	0b15a634f9	* bug 1082 fixed	2012-09-27 17:16:41 +00:00
Ivan Savenko	1fdacc4085	- fixes #1086 ... - removed outdated code from filesystem. Filesystem.json from 0.89b will no longer work.	2012-09-27 13:23:33 +00:00
mateuszb	8dca88c3c8	* start map in campaign button is properly disabled/enabled (I hope) ... * exported json for artifact bonuses; no limiters/propagators yet, so it's not used * minor changes	2012-09-26 18:10:29 +00:00
Ivan Savenko	4ceb6cd272	- better fix for button borders	2012-09-26 13:50:15 +00:00
Ivan Savenko	15a7f43e11	- fixed #1075, #1080, #1081 ... - fixed some warnings from cppcheck	2012-09-26 13:13:39 +00:00
Michał W. Urbańczyk	ecd8947d8e	Crashes on starting next campaign mission should be fixed.	2012-09-25 18:00:55 +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	00c079f7dc	* improvements for HERO campaign bonus	2012-09-23 11:26:26 +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
DjWarmonger	e2bfd53c98	- Fixed some issues and crashes ... - Simplified projectile handling. New creatures can now shoot.	2012-09-21 19:49:35 +00:00
mateuszb	8e3de98059	* restoring campaign features ... * minor improvements	2012-09-21 17:59:54 +00:00
DjWarmonger	16adfa3aa7	- Fixed crash on creature window drawn for neutral faction ... - Fixed sound parsing. Check forum for updated mod. It is now possible to attack & fight new creatures without crash.	2012-09-21 07:22:23 +00:00
Ivan Savenko	99dcb73a72	- filesystem.json files for wog and vcmi data ... - merged puzzle map into town configuration (todo: sieges, adventure map, icons)	2012-09-20 21:28:18 +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
Ivan Savenko	2c88845b9e	- compile fix	2012-09-20 16:14:23 +00:00
mateuszb	4010978a91	* a bit of work on campaigns	2012-09-19 17:41:22 +00:00
mateuszb	fb2f19b4c5	* some work on campaigns	2012-09-18 17:47:52 +00:00
mateuszb	2cf4905d9c	* hopefully fixed 790	2012-09-18 15:17:32 +00:00
DjWarmonger	abd4a96bf1	Very simple loading and adding new creatures. Needs testing.	2012-09-18 07:36:07 +00:00
DjWarmonger	9438cfc7e2	Moved creature sounds to CCreature. Sound IDs are now stored as strings. ... Creature parser is complete (untested).	2012-09-17 19:00:26 +00:00
Ivan Savenko	061ed69c63	- fixed seer hut issue (#1073) ... - separate archive types in filesystem for lod\vid\snd	2012-09-17 17:25:54 +00:00
alexvins	2b2b02cccc	[static analysis] [WIP] fix few possible bugs ... CBattleAnimations.cpp,CBitmapHandler.cpp,CGameHandler.cpp Possible null pointer dereference	2012-09-16 14:36:31 +00:00
DjWarmonger	554a98dbd7	Quests will now be handled as object member instead of inheritance. Enabled quest objects for AI.	2012-09-16 13:34:01 +00:00
alexvins	369f0ae9c6	[PLATFORM] MinGW support added ... * disabled features unsupported by MinGW * fixed issues with DLL_LINKAGE ! BOOST_THREAD_VERSION in now 3 workaround for existing code added, consider refactoring. * some small tweaks ("-fpedantic" warnings)	2012-09-15 19:16:16 +00:00
Michał W. Urbańczyk	96a92d0f45	* fixed remaining part of #1071 — the screen surface has always to be created in the main thread ... * hold events in the queue by value (less ptr jugglery)	2012-09-11 14:25:19 +00:00
Michał W. Urbańczyk	d935e87dd8	#1071 should be fixed.	2012-09-09 23:57:22 +00:00
Michał W. Urbańczyk	529394a4e7	Development build 0.89b ... * Updated changelog * Some logging I did for #1066	2012-09-07 22:43:41 +00:00
Ivan Savenko	a138db7c9e	- removed lib headers from PCH ... - fixed #1062 - correct terrain penalty check	2012-09-06 10:39:48 +00:00
Michał W. Urbańczyk	ea4841045f	Fixed #1064.	2012-09-06 10:26:18 +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
Michał W. Urbańczyk	5a157290d9	Fixed crash occurring after casting Armageddon and killing all stacks. ... Removed some commented-out code.	2012-08-31 16:33:30 +00:00
Michał W. Urbańczyk	6530e7a1e1	* servers will not allow using out-of-range slots ( #1061 ) ... * server won't crash on some scenarios when they're used * fixed some minor discrepancies with creature placement in creature banks	2012-08-30 16:01:19 +00:00
DjWarmonger	31f82cade0	- Removed integer parameters from CCreature, all stats are now handled by Bonus System Only ... - Parsing for creature format http://wiki.vcmi.eu/index.php?title=Creature_Format Needs rearrangement of some info to work	2012-08-30 14:57:24 +00:00
Ivan Savenko	c7789992c3	- fix for hero flags along with battlehero cleanup ... - removed unused code	2012-08-29 14:55:31 +00:00
Michał W. Urbańczyk	d0e2f25cfe	* No explosion when catapult fails to damage the wall ... * Missing abilities for Azure Dragon (tons of others are still missing...)	2012-08-29 13:44:39 +00:00
Ivan Savenko	8fac276922	- a bit nicer stack queue. Check forum for graphics. ... - warning fix	2012-08-28 16:28:21 +00:00
Michał W. Urbańczyk	0b85cfaf78	Fix for #1058.	2012-08-28 15:38:00 +00:00
Ivan Savenko	4d4f72292e	- fixed crash on hovering indestructible walls ... - fix for music player (no music after end of battle)	2012-08-27 20:45:58 +00:00
Michał W. Urbańczyk	a14f381d48	Fixed #1055 - hang when creature performed automatic (not controleld by player) action. ... Fixed possible crash on arrow turret turn.	2012-08-27 12:34:43 +00:00
Michał W. Urbańczyk	7c09f73402	* INFINITE_DIST is now enum, it should cause least trouble that way. Uh, it's so hard to fight magic values these days. ... * Fixed crashes in battles after loading game * Fixed crash in battle AI, when stack is blocked and stands next to an enemy * Fixes problem when server's moveStack is called with dest==position * Above should cover #1053.	2012-08-26 19:13:57 +00:00
Michał W. Urbańczyk	d390113c23	* New files for lib: CBattleCallback.cpp and CBattleCallback.h ... * Updated MSVC project files * Filesystem: My version of .SND archive does not have \0 after WAV extension. Fixed (though hardcoded 3-char extension length). * New bonus types: BLOCK_MAGIC_ABOVE for blocking casting spells above given level and BLOCK_ALL_MAGIC for blocking all magic. * Heavy rewrite of battle callbacks. Fixed some minor bugs. Code reusage between lib/client/server (removed proxy calls). Better access control and support for various perspectives. * Fixed #1031 * Fixed Orb of Inhibition and Recanter's Cloak (they were incorrectly implemented). Fixed #97. * Fleeing hero won't lose artifacts. Spellbook won't be captured. Fixed #980. * Fixed crash when attacking stack dies before counterattack (ie. because of Fire Shield) * Server does some basic checks if action requests during battle are valid * Minor stuff.	2012-08-26 09:07:48 +00:00
DjWarmonger	39d433c1c7	Moved game Modules to config file.	2012-08-24 09:37:52 +00:00
Ivan Savenko	e79ac5f1d7	- removed deprecated ffmpeg functions. Fixes #779 ... - removed hardcoded video name constants	2012-08-21 17:37:06 +00:00
DjWarmonger	9e0c9b4f49	Fixed #1042. Tweaks for Commander bonuses.	2012-08-20 16:10:50 +00:00
Ivan Savenko	deb22b3674	- (linux) use empty video player if av_register_protocol function was not found	2012-08-18 10:29:54 +00:00
DjWarmonger	037d4811a1	Fixed #1047	2012-08-14 06:31:14 +00:00
Ivan Savenko	eec4d3579d	- fixed crash on missing videos ... - fixed savegames name selection	2012-08-11 11:34:49 +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	d72c44e4c3	- fixed modifiers keys behaviour in TextInput ... - erm compilation is optional in cmake (too memory-consuming for old systems) - minor fixes	2012-08-10 08:49:18 +00:00
DjWarmonger	d3d24d0737	Compile fix for windows.	2012-08-09 13:52:40 +00:00
Ivan Savenko	7e778045b8	- removed no longer used CSndHandler. Transition to new fs is finished ... - moved TownHandler::requirements to CBuilding class	2012-08-09 10:32:50 +00:00
Michał W. Urbańczyk	08bcfd1285	* windows video player uses the new FS ... * don't crash on missing sounds	2012-08-09 07:40:47 +00:00
Ivan Savenko	94cfc99d7b	- fixes #1044 ... - fixes to linux video player	2012-08-08 20:58:06 +00:00
Ivan Savenko	127600311f	- linux video player uses new FS	2012-08-08 12:17:25 +00:00
Ivan Savenko	cab8955d8f	- sound player uses new FS	2012-08-08 12:03:32 +00:00
Michał W. Urbańczyk	cd63c177e2	* std::unordered_map implementation in MSVC 10 has terribly slow destructor. Since bug is fixed only in VC11, I replaced it with boost::unordered_map. ... * fixed crash with invalid .lod archive (some H3 installations have fake 1 byte .lod "archives" * fixed crash when parsing invalid map file * minor random optimizations (rv-refs, etc)	2012-08-08 08:25:27 +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	8040a81eec	- fixed save games issues (#1044) ... - hopefully some speedup for filesystem loading (#1048)	2012-08-07 11:28:52 +00:00
Ivan Savenko	708ad6ac7f	- music player uses URI's instead of enum from music base ... - #1045 and #1046 should be fixed - moved pregame backgrounds to config/mainmenu - animation can be overriden with .json multiple times	2012-08-06 07:34:37 +00:00
DjWarmonger	385be09248	Foxed #943	2012-08-06 06:01:02 +00:00
DjWarmonger	75283bf0fd	Fixed TextBox line breaking & slider.	2012-08-04 17:51:02 +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	12e71e0dff	Missing serialization for Border Gate fixes #1040.	2012-07-29 18:18:55 +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
Ivan Savenko	a72a294a46	some work on new filesystem, not tested ... - one more new file - removed duplicating code - filesystem parser is now recursive - decompression should be possible if decompressed size is unknown - autotools and cmake update	2012-07-23 10:23:43 +00:00
Ivan Savenko	13de841e10	- minor tweaks to quest window ... - fixed #531 - fixed query crash (empty funciton)	2012-07-21 20:16:54 +00:00
Michał W. Urbańczyk	9207e4f4a4	Fixed a compile error on MSVC with abs(ui64). ... Fixed crash when quest object is removed.	2012-07-20 21:42:25 +00:00
Michał W. Urbańczyk	79f8e0ea3c	Fail gracefully when file pointed by --start path doesn't exist.	2012-07-20 20:57:18 +00:00
Ivan Savenko	e4c88d5088	- moved ParseBonus to JsonNode.cpp (linkage errors) ... - fixes to CMakeLists - vcmi can be compiled and started with cmake - gcc\clang warnings fixes	2012-07-19 18:52: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
DjWarmonger	cf45239332	Fixed #1035. ... Support for commander artifacts that accumulate bonus after battle.	2012-07-16 16:18:02 +00:00
ddaroo	69de38bf1d	Tweaks for cmake build system: data dir definitions, flags for clang (not tested), missing CQuestLog.cpp file for the client, naming convention of few binaries same for autotools and cmake	2012-07-15 16:05:41 +00:00
Michał W. Urbańczyk	edccbd4809	Rewritten many parts of query handling. Fixed several scenarios leading to a hang (including #1012). Purged boost::function from player interface (handy but impossible to serialize). VCAI will keep description for each unanswered query, so the further debugging will be easier.	2012-07-15 15:34:00 +00:00
Michał W. Urbańczyk	ab0a384d31	Updated MSVC project files.	2012-07-15 15:26:12 +00:00
DjWarmonger	b28da1a5d3	- Quest log minimap now has clickable icons ... - Border guard & border gate inherit Quest interface - Lots of tweaks	2012-07-08 16:36:20 +00:00
DjWarmonger	32d1a08470	Pointer serialization for CQuest.	2012-07-08 08:42:03 +00:00
DjWarmonger	7fbf89ffc8	Rearragned Seer Huts & Quests. More work on Quest Log descriptions.	2012-07-08 06:33:41 +00:00
Ivan Savenko	846474af66	- fixed (partially) #1028 ... - fix to last commit	2012-07-07 14:10:47 +00:00
Ivan Savenko	55c78e9f16	- ComponentBox usage in 2 windows: levelup and build screen ... - Components have selectable image size - fixed #794	2012-07-07 13:32:37 +00:00
DjWarmonger	49d2ba1982	Quest Log is partially functional. TODO: update quest after completion.	2012-07-07 08:45:45 +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
DjWarmonger	12511d8fee	First part of new Quest Log, including common quest interface.	2012-07-06 19:12:04 +00:00
DjWarmonger	e3e4bc4c9c	Second part of interactive Commander level-up. Quite messy.	2012-07-04 14:41:53 +00:00
DjWarmonger	ac997b8214	Partial interactive mode for Commander level-up dialog. It is possible to select secondary skill.	2012-07-03 08:07:34 +00:00
DjWarmonger	406346a6ab	Compile fix. Please do not use undefined default (?) constructors.	2012-07-03 06:28:11 +00:00
Ivan Savenko	235cf458d7	- fixed text duplication in choice windows ... - fixed compile issues - added unused and untested for now CComponentBox	2012-07-02 21:51:48 +00:00
Michał W. Urbańczyk	54ca71d598	Update to Boost.Filesystem version 3, since Boost 1.50 drops support for version 2. ... Check http://forum.vcmi.eu/viewtopic.php?t=518	2012-07-02 09:04:05 +00:00
ddaroo	758fb0679e	Stub for a CMake build system.	2012-07-01 14:27:41 +00:00
Ivan Savenko	613172fa45	- fixed #582, #1019 and #1022 ... - linux readme tweaks	2012-06-27 20:44:01 +00:00
Ivan Savenko	770a6e077c	- handling of incorrect or missing configuration files (settings.json\defaultSettings.json) ... - better code for recruitment window, fixes #1013 - minor tweak to adv.map classes	2012-06-22 11:40:16 +00:00
Michał W. Urbańczyk	933049ee91	Updated MSVC project files.	2012-06-20 21:20:07 +00:00
DjWarmonger	a15ad329b4	Fixed #1015.	2012-06-20 13:03:05 +00:00
Ivan Savenko	7a6133a824	- some bugfixing ... - removed redundant or unused code in GUI	2012-06-16 22:40:28 +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	8c6965c5ee	- shadows for CWindowObject-based windows ... - better error messages on read error - fixed crash on level-up window	2012-06-16 10:41:14 +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
DjWarmonger	ef250fcb8f	Compile fixes for previous commit.	2012-06-13 14:11:18 +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
Michał W. Urbańczyk	d0816a7924	Fixed crash when artifact casts spell ( #991 )	2012-06-10 12:01:56 +00:00
Michał W. Urbańczyk	e6ebf42308	#994 should not crash anymore.	2012-06-09 19:58:17 +00:00
Michał W. Urbańczyk	f378e5be31	MSVC compile fix #997. ... CClickableHex apparently can't be held by value in vector anymore.	2012-06-09 16:45:45 +00:00
Frank Zago	5dff7d64f6	Allows to load campaigns from the user directory too.	2012-06-09 14:26:41 +00:00
Michał W. Urbańczyk	e7d82a9702	Rewritten CLoadFile::openNextFile to be cleaner and not leak. Desperate messing around for #989.	2012-06-08 00:12:31 +00:00
Ivan Savenko	d60f2d57a0	- first part of CIntObject API clean-up. ... - - mostly remove usage of (de)activateSomething functions - - CIntObject's can be safely deleted in active state or without removing from parent first - - Added CWindowObject to use as base of all windows (will be required for such features as shadows) Report any crashes or glitches - it should not cause any issues apart from more console output. TODO: - remove redundant (de)activate and show(All) calls - decrease usage of blitAtLoc\printAtLoc methods - switch all windows to new base	2012-06-02 15:16:54 +00:00
Ivan Savenko	c3eead45d4	(linux-only) ... - version set to 0.89 - added icon and desktop file for client - updated compilers warning settings	2012-06-01 17:28:05 +00:00
Michał W. Urbańczyk	dc4d30df0e	Ench0's patch from #948.	2012-06-01 17:23:26 +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	61ccabde53	- vcmi can be compiled with clang-3.1	2012-05-27 19:06:35 +00:00
Ivan Savenko	c512069177	- fixed #982: ... -- replaced 8to24 bilt with sdl blit -- fixed alpha values for images loaded via SDL	2012-05-27 14:07:12 +00:00
Ivan Savenko	7ddf76a081	- fixed #967 ... - removed unused settings.txt - fixed player flags on info windows.	2012-05-26 17:59:00 +00:00
Michał W. Urbańczyk	77e7a25ed7	Fixed #970. ... Fixed issue where cursed ground obstacles were appearing on holy ground (and vice versa). Fixed battle interface blocking itself up after clicking on owned stack to open creature window.	2012-05-26 11:01:31 +00:00
Michał W. Urbańczyk	470885d719	Fixed #969. ... Minor changes.	2012-05-26 10:02:55 +00:00
DjWarmonger	e0135ab6a6	Fixed Commander artifacts management, including #968.	2012-05-25 15:10:38 +00:00
Ivan Savenko	49495c9caf	- possibly fixed #966 and #958 ... - fixed crash on shutdown - fixed compile issue #973	2012-05-25 11:49:56 +00:00
Michał W. Urbańczyk	ee6e9fcc7f	Fixed #947.	2012-05-22 21:08:16 +00:00
DjWarmonger	3e4d0e73e8	Fixed #964. ... Basic scrolling for commander artifacts. Needs tuning.	2012-05-22 17:16:37 +00:00
DjWarmonger	18e53a1717	- Fixed a scenario when AI could visit the town without picking troops, resulting in a lock ... - Added ench0's patch for creature range tooltip (#948)	2012-05-22 10:15:16 +00:00
DjWarmonger	d34cf90bf7	Support for Chain Lightning. ... Fixed getClosestTile function.	2012-05-20 11:40:23 +00:00
Ivan Savenko	59255a4cad	- background for main menu can be scaled. Won't work as default due to non-scalable video	2012-05-20 11:03:21 +00:00
DjWarmonger	88639be91b	Enabled commander artifacts. Don't work yet.	2012-05-20 08:39:19 +00:00
Michał W. Urbańczyk	a234b4c935	Fixed #956. ... Removed unused code left after tests. Updated changelog.	2012-05-19 22:57:24 +00:00
Ivan Savenko	a13a62537b	- fixed crash in hero window (#963) ... - added unused for now image scaling algorithm	2012-05-19 21:38:01 +00:00
DjWarmonger	6419f953cb	Some (disabled) work for commander artifacts. Hero artifacts window seems broken. ... Minor fixes.	2012-05-19 18:27:23 +00:00
Ivan Savenko	665837d656	- hopefully better town development for AI ... - fixed minimap blitting - fixed crash on attacking town without moat	2012-05-19 16:22:34 +00:00
Ivan Savenko	6f6cd6814e	- fixed wrong battlefield (#961) ... - minor tweaks	2012-05-19 11:47:26 +00:00
Michał W. Urbańczyk	d168f3eac2	* Implemented Moat functionality during siege (stops movement and deals dmg) ... * Mostly implemented battle spells: - Fire Wall - Force Field - Land Mine - Quicksands	2012-05-18 20:50:16 +00:00
DjWarmonger	5435101182	Lots of fixes and improvements for Commander interface.	2012-05-18 19:44:15 +00:00
Ivan Savenko	45c2809a40	- pregame will use same resolution as main game ... - disabled most of now unused code for changing resolution - added missing spell effect sounds - adventure map spells sounds - remaining fixes for big endian systems	2012-05-18 17:35:46 +00:00
DjWarmonger	d491bc1c3a	Commanders can level up. It's non-interactive yet. ... Printing secondary skills for Commanders.	2012-05-18 14:02:27 +00:00
Ivan Savenko	ed634a5f06	- minor fix to last commit	2012-05-17 11:15:11 +00:00
Ivan Savenko	97aeaa9f28	- moved ColorPutter's to separate SDL_Pixels.h file ... - added Channels namespace for accessing subpixels in format-independent way - fixed several big-endian issues - re-generated buld system	2012-05-17 10:44:48 +00:00
DjWarmonger	416c08260a	- Basic Commander window ... - First part of unified quests interface This graphics package is needed: http://forum.vcmi.eu/viewtopic.php?p=6943#6943	2012-05-16 17:29:05 +00:00
Ivan Savenko	99439e1ed6	- fixed creature sounds (#802, #113) ... - added missing sounds for commanders and sharpshooters (#524) - minor fixes	2012-05-15 16:29:40 +00:00
DjWarmonger	fb34a48eec	Compile fix for previous commit.	2012-05-15 09:21:32 +00:00
Ivan Savenko	8de71c2b39	- fixed #711, #862, #321 ... - moved PutPixel templates into header to allow inlining	2012-05-15 08:47:11 +00:00
Ivan Savenko	90ff99d4eb	- fixed ancient #31 ... - fixed #603	2012-05-14 16:29:06 +00:00
Ivan Savenko	9efe05c90b	- removed usage of Graphics in several places (Components and hero window). ... minor: - fixed several deprecation warnings in video player - config file may have multiple upgrades for creatures	2012-05-13 15:04:21 +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
DjWarmonger	9cbbfcf258	- Fixed all bugs with battle interface. It's now more consistent. ... - Minor cleaning.	2012-05-07 16:04:43 +00:00
DjWarmonger	ee2768ab07	- Some work for commanders ... - New creature window - visit forum for package with necessary graphics: http://forum.vcmi.eu/viewtopic.php?p=6908#6908 - More AI optimizations - heroes will be processed starting from the fastest one. - AI will check is GATHER_ARMY object is reachable	2012-05-07 12:54:22 +00:00
Ivan Savenko	82b60c00a2	- fixed compile issues. Renamed several "battleobstacleSplaced" to "battleobstacleplaced" ... - implemented --disable-video command line switch	2012-05-05 08:32:55 +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
DjWarmonger	5d311fb3ed	- Hopefully fixed possibleActions for every case ... - better algorithm for looting artifacts, yet buggy	2012-05-01 13:56:32 +00:00
DjWarmonger	2fbc57e140	1. Better way to disable stack / cursor glitches ... 2. An attempt to handle looting artifacts after battle	2012-05-01 08:52:22 +00:00
DjWarmonger	25bdcd3cab	- Fixed wrong creature teleported ... - Support for Sacrifice	2012-04-28 19:40:27 +00:00
DjWarmonger	f5e47474c5	- Fixed random crashes after creature spellcasting ... - Added dummy projectiles to Commanders	2012-04-28 15:38:34 +00:00
DjWarmonger	192de453af	- Fixed Remove Obstacle spell ... - Fixed freeze at Chain Lightning	2012-04-28 15:18:21 +00:00
DjWarmonger	d6873d7570	- No battle actions will be available during tactics phase ... - Fixed moving stacks during tactics - Fixed Genie spell targeting - Fixed AI getting stuck at Tree of Knowledge when no resources	2012-04-28 13:01:39 +00:00
Michał W. Urbańczyk	b0371597cd	A better tweak.	2012-04-24 19:11:23 +00:00
Michał W. Urbańczyk	482051eb17	Tweaks for obstacles.	2012-04-24 05:16:04 +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
DjWarmonger	81e74f8c33	- Config settings & parsing for Commanders. ... - Fix for Regeneration icon	2012-04-22 13:28:46 +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
Ivan Savenko	fef876e1ec	- fixed #934 (batte screen after changing resolution)	2012-04-19 21:21:11 +00:00
DjWarmonger	cd1a9414ac	- Restored Genie random spell ... - Fixed crashes in many strange creature-spellcasting scenarios, including stack with multiple cast abilities and Enchanter with non-stadard spell	2012-04-18 15:57:49 +00:00
DjWarmonger	05311dd30c	- Fixed and simplified Teleport casting ... - Stack artifacts will now not be wearable by hero (by default) - Fixed crash involving clone	2012-04-18 13:24:18 +00:00
DjWarmonger	f9dff013eb	Fixes for battle interface, including #932. Basic funtionality is restored.	2012-04-18 09:01:08 +00:00
DjWarmonger	f720038ca5	- Battle interface fixes. It's possible to move stacks & attack ... - Creature window allows to pass stack artifact to hero - Fixes for Mana Drain, including #916	2012-04-17 14:50:23 +00:00
DjWarmonger	294276ea13	- Second part of battle interface. ... - Testing for Stack Artifacts feature.	2012-04-17 08:46:09 +00:00
DjWarmonger	aeb9cf9460	- First part of battle interface rewrite. Untested. May work or not work randomly. ... - Tweaks for AI logging.	2012-04-16 17:12:39 +00:00
Ivan Savenko	66f5b5e2d7	- gcc compile fixes	2012-04-14 16:28:36 +00:00
Michał W. Urbańczyk	6ec3501909	Fixed #927.	2012-04-14 07:39:32 +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
Michał W. Urbańczyk	8baec8b093	Implemented #715 (load game from sys options). Fixed #224. Minor improvements.	2012-04-09 02:53:50 +00:00
Michał W. Urbańczyk	f9f0fe9d97	Likely fixed #920.	2012-04-08 20:49:16 +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	d9064f4f7d	Implemented #714 — restart functionality, including quick restart tweak (bound to CTRL+R).	2012-04-08 03:06:27 +00:00
Michał W. Urbańczyk	d6223dd137	Fixed #686. ... Minor changes.	2012-04-08 02:29:11 +00:00
Michał W. Urbańczyk	9f6270a1f7	Fxied #306 and #856.	2012-04-08 02:14:20 +00:00
Michał W. Urbańczyk	b874295b3a	Really fixed #918.	2012-04-08 01:43:40 +00:00
Michał W. Urbańczyk	3bf76cb719	Fixed #216 and #907. ... * CTRL+T will open marketplace window * T in adventure map will switch to next town * T in castle window will open a tavern window (if available) * G will open thieves guild window if player owns at least one town with tavern * various minor changes	2012-04-08 01:15:18 +00:00
Michał W. Urbańczyk	7317e803db	Locking pim mutex in client pack handling method, instead of dozens playerint call-ins. GUI won't try updating in between gamestate change and call-ins about it. Should fix #912. ... Minor changes.	2012-04-06 15:02:15 +00:00
DjWarmonger	038d105bcc	- first sketch of Commanders ... - accumulateBonus should make mechanics simpler	2012-04-04 17:41:55 +00:00
DjWarmonger	2193f8912e	- Framework of new battle interface ... - Minor fixes for AI	2012-04-04 08:03:52 +00:00
Michał W. Urbańczyk	c61f536d8b	* fixed remaining parts of #760 ... * it's possible to switch active creature during tacts phase by clicking on stack * a few minor fixes after handleHex rewrite	2012-04-02 23:23:14 +00:00
Michał W. Urbańczyk	584b761d37	Fixed #917.	2012-04-02 11:38:59 +00:00
Michał W. Urbańczyk	7ccc78c757	Fized crash on attacking walls with Cyclop Kings.	2012-04-01 13:40:14 +00:00
Michał W. Urbańczyk	414a896dbd	Fixed #890.	2012-03-30 23:39:44 +00:00
Michał W. Urbańczyk	a9af0da0ab	Rewritten handling mouse movement over hex and l-clicking hex into one procedure. That way the tooltip and cursor are always accurate, because they're set by the same routing that selects action. Having that logic duplicated in two methods was unmaintainable. [though the new one is still monstrous...] By the way fixed numerous issues, including: ... * #785 and parts of #760 * first aid tent can heal only creatures that suffered damage * war machines can't be healed by tent * creatures casting spells won't try to cast them during tactic phase * console tooltips for first aid tent * console tooltips for teleport spell * cursor is reset to pointer when action is requested * fixed a few other missing or wrong tooltips/cursors Implemented opening creature window by l-clicking on stack. Master Genie's spell is picked by server, not client. Minor changes.	2012-03-30 21:36:07 +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	7b7ddf987a	Fixed #909. ... Minor fix in using requestActionASAP (capture by val).	2012-03-26 11:38:51 +00:00
Michał W. Urbańczyk	13f26fc3cb	* Client is able to await for answers for multiple queries at the same time ... * Hackish solution allowing AI undertaking actions from event-handling thread * Fixed crash when death stare or acid breath activated on stack that was just killed * minor fixes	2012-03-25 22:46:14 +00:00
DjWarmonger	7e4855c271	Quick fix for #910.	2012-03-12 15:00:32 +00:00
Michał W. Urbańczyk	6db3c5bc7e	* VCAI: can't request actions from action handling thread ... * Save game screen and returning to main menu will work if game was started with --start option * GUI controls can selectively capture keyboard events. CTextInput won't capture Enter. Fixes #654.	2012-03-11 16:29:01 +00:00
DjWarmonger	88e9dec974	Fixed Thieves Guild window showing for all players. ... It needed 11 files modified... :/	2012-03-07 14:05:54 +00:00
Michał W. Urbańczyk	d0e259864e	* Replaced boost::shared_ptr with std::shared_ptr. ... * Brought shared_ptr and unique_ptr and their factories (make_shared, make_unique) to the global scope. * Removed excessive usage of shared_ptr in bonus system interface. * Fixed bonus system limiters/caching interactions. That covers #823, #859 and a number of rare edge-cases. * Implemented multiple-step limiters applying, fixing hasAnotherBonusLimiter and allowing transitional dependencies between bonuses. * Bonus system should be slightly faster, since we cache limited bonuses. Some rare usages (limiting query against a foreign node) however can't use caching.	2012-03-06 16:59:55 +00:00
Michał W. Urbańczyk	77b13404c0	Fixed #888.	2012-03-01 13:36:58 +00:00
Michał W. Urbańczyk	a833cbd308	Fxied #887.	2012-03-01 11:57:38 +00:00
DjWarmonger	18b1b83c8a	Fixed creatures casting aimed spells at dead stacks.	2012-02-29 13:47:57 +00:00
Michał W. Urbańczyk	f2642cb62c	Added VCAI and EmptyAI to the VS solution. Removed from it GeniusAI. ... Fixed #329, #884, #885.	2012-02-29 01:31:48 +00:00
Ivan Savenko	9ce3c78387	- fix for compilation with gcc-4.5 ... - fix for #881	2012-02-28 11:26:08 +00:00
Ivan Savenko	2018fc09a4	- fullscreen config option will take effect immediately ... - fixed bug with highlightable buttons - added several missing spells sounds	2012-02-24 20:41:14 +00:00
Michał W. Urbańczyk	4f182744e7	* Fixed in game scenario info and save game screens ... * AI will now use tlog6 (teal color) for logs	2012-02-22 19:22:11 +00:00
Michał W. Urbańczyk	3546c7841a	* Possibly fixed #870 ... * Fixed crash after catapult successfully destroyed one of turrets (stack queue wasn't properly updated)	2012-02-22 17:43:59 +00:00
Michał W. Urbańczyk	37d3bea0a9	Missing part of fix for #871.	2012-02-22 14:38:40 +00:00
Michał W. Urbańczyk	d9a78ff1ce	* fixed #871 ... * dead stacks won't be also shaded as possible targets	2012-02-22 14:31:53 +00:00
Michał W. Urbańczyk	e18419f5d2	* adventure map GUI should be properly blocked during AI turn ... * battle window will wait till all dialogs are closed * fixed problems with AI working after the game ended * fixed problems with overzealous redrawing of infobar	2012-02-22 13:41:27 +00:00
Ivan Savenko	354b9e7fb3	- fixed #793 and #865 ... - fixed #866 but may result in performance decrease - (deb) removed vcmi-doc package	2012-02-21 14:08:42 +00:00
Michał W. Urbańczyk	5afa5cfb54	* fixed #863 — all members of team will receive notification about FoW change ... * fixed #486 * removed reference to a deleted file from lib VC project file	2012-02-20 21:01:54 +00:00
DjWarmonger	5e14d17ed3	Fixes for r2543.	2012-02-20 09:50:49 +00:00
DjWarmonger	444b59d478	1. Fixed #843 ... 2. Refactoring for battle console hoover texts 3. Clone should work only for creatures of certain tier. However, ALL creature immunities stopped working in the meantime. Looking for an earlier bug.	2012-02-20 08:19:03 +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
DjWarmonger	5c86d32903	Cloned stack dissapear when killed. ... Fixed #864	2012-02-18 17:39:47 +00:00
Michał W. Urbańczyk	0867451f26	Fixed path issues: #491, #834, #845. ... Fixed AI crash when enemy hero was teleported onto tile not visible for AI.	2012-02-18 14:59:37 +00:00
Ivan Savenko	d1d21b16dc	- replaced auto_ptr with c++11 unique_ptr	2012-02-17 20:34:34 +00:00
Michał W. Urbańczyk	1abf089bc7	Missed fixed for #858 (TortoiseSVN tricked me...) ... Fixed #852.	2012-02-16 21:46:28 +00:00
Michał W. Urbańczyk	4baf4e13ed	* fixed #857 and #858 ... * fixed crash when AI attacked player before his first turn * fixed various crashes when mass-effect spells affected town turrets in sieges * some refactoring around spell positiveness	2012-02-16 21:19:07 +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
Michał W. Urbańczyk	7a66c1bf2b	* added an initial version of adventure AI: VCAI, more details here: http://forum.vcmi.eu/viewtopic.php?p=6508#6508 ... * VCAI set as default adventure AI * several adjustments in GUI (hourglass during AI turn), minor changes	2012-02-14 18:04:45 +00:00
DjWarmonger	c724092028	Partial support for Clone spell.	2012-02-10 13:13:24 +00:00
DjWarmonger	9e5fcc3152	Stack artifact backup. ... Still doesn't serialize properly, though.	2012-02-10 10:32:21 +00:00
DjWarmonger	2bddf29cbf	Stack artifacts part 2, not working yet.	2012-02-04 16:34:29 +00:00
DjWarmonger	b8a5d0d430	Stack artifacts - part 1	2012-01-30 16:07:52 +00:00
DjWarmonger	56c56f81e3	Fixed #849. Fixed buying artifacts for free. ... Minor tweaks.	2012-01-28 11:42:15 +00:00
DjWarmonger	1cbd7e94e4	- Extended cap or removed sign for some values that may potentially overflow ... - Fixed #851	2012-01-26 16:48:53 +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
DjWarmonger	ba646b1d41	Compile fix for #847	2012-01-12 20:41:32 +00:00
Ivan Savenko	86e7d96b39	- setting system: replaced settings.txt + sysopt.bin with json-based system (defaultSetting.json + settings.json) ... - some work on system settings window - new menu for selecting resolution (reused town portal graphics), can be opened from system settings	2012-01-12 15:23:00 +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
Ivan Savenko	91c0ce33f4	- re-generated build system ... - fixed several gcc issues	2011-12-31 10:03:29 +00:00
beegee1	156aa6e4d9	* Updated class - file - handling ... * Renamed color constants * Renamed class AdventureMapButton to CAdventureMapButton * Moved basic controls like CTextBox from GuiClasses to CIntObjectClasses * Moved new creature window from GuiClasses to CCreatureWindow	2011-12-22 13:05:19 +00:00
beegee1	2f5d6f2684	* CHexField renamed to CBattleHex ... * CHexFieldControl renamed to CClickableHex * CCreatureAnimation.cpp/.h moved to BattleInterface/CCreatureAnimation.cpp/.h * Removed unused project files * Added VCMI_client filters file for VS 2010 * Gathered common parts of StdInc.h in Global.h * Boost.Spirit has been included in PCH for ERM project * StopWatch renamed to CStopWatch * GuiBase.cpp split up in UIFramework/...	2011-12-17 18:59:59 +00:00
beegee1	cce814c41b	* Final commit	2011-12-13 21:35:28 +00:00
beegee1	7f04ed990b	Major refactoring. First part: BattleInterface ... Introduction of pre compiled headers,...	2011-12-13 21:23:17 +00:00
Ivan Savenko	2eca314e92	- fixed #841 and #840 ... - fixed several crashes	2011-11-27 18:55:11 +00:00
DjWarmonger	dfea7db6e8	Compile fixes. May be suboptimal.	2011-11-27 15:39:44 +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	29f42aa873	- fixed #834 ... - fixed crash at campaigns loading - minor fixes	2011-11-25 19:41:23 +00:00
Frank Zago	a62634cf94	Add support for SDL 1.3 in compatibility mode.	2011-11-17 00:24:27 +00:00
DjWarmonger	2e0ca6d162	Cleaned some code.	2011-11-13 09:29:22 +00:00
Ivan Savenko	0f2e00c780	-(linux) Moved all (I hope) files created by VCMI to ~/.vcmi to prevents crash on launch from read-only directory ... - minor fixes for #362 #835 #836	2011-11-01 12:58:01 +00:00
Ivan Savenko	ede7fd5a7a	- (linux) Fixed gcc linking issues	2011-10-31 18:00:44 +00:00