67 Commits

Author	SHA1	Message	Date
AlexVinS	0b546a9b9f	Correct placement for hero misc artifacts in kingdom overview	2015-02-14 18:59:33 +03:00
Fay	f30cb0fa5b	Fixes crash when loading game (if path was visible previously);	2015-02-13 11:20:13 +01:00
AlexVinS	594295da32	Merge branch 'feature/worldView' into develop	2015-02-01 20:49:14 +03: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	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
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	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
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
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
AlexVinS	85a4b725f5	[Creature window] 2-line bonus description	2014-11-24 12:44:45 +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
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
DjWarmonger	530a3e69bf	Option to allow / ban certain types of town in a template.	2014-10-30 10:00:29 +01:00
AlexVinS	54453aee73	get rid of boost::assign	2014-10-04 00:34:13 +04: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	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
DjWarmonger	ec8476d43a	Compile fixes for Visual.	2014-09-05 20:13:58 +02:00