2830 Commits

Author	SHA1	Message	Date
Alexander Shishkin	20fd7cf916	Merge pull request #190 from vmarkovtsev/feature/fix_uf_warning ... Fix unused function warning in release mode	2016-02-02 15:23:37 +03:00
DjWarmonger	97117491ae	Merge pull request #191 from vmarkovtsev/feature/psychic_elementals ... I think we could implement general bonus that reduces damage depending on arbitrary immunity (or other bonus), but it's beyond the scope of this PR.	2016-02-02 13:02:13 +01:00
Vadim Markovtsev	eb10433535	Implement psychic elementals vs mind immune units	2016-02-02 14:30:37 +03:00
Vadim Markovtsev	bdd87be10d	Try to fix http://bugs.vcmi.eu/view.php?id=2362	2016-02-02 11:46:33 +03:00
Vadim Markovtsev	8d7629bdab	Fix unused function warning in release mode	2016-02-02 11:12:28 +03:00
Vadim Markovtsev	88bc21952b	Make stables message appear if hero has cavaliers but visited stables before	2016-02-01 09:41:15 +03:00
Vadim Markovtsev	c30a6f2ff3	Fix 1989 cavaliers -> champions in stables	2016-01-31 21:09:11 +03:00
ArseniyShestakov	7f68124b97	Merge pull request #136 from vcmi/issue/1372-2 ... issue/1372	2016-01-31 20:28:54 +03:00
Vadim Markovtsev	3926920103	Rename radious -> radius ... There is no such English word, "radious" Some files get new lines in the end - BSD sed bug + best practices	2016-01-31 18:01:58 +03:00
Vadim Markovtsev	e18b21b78e	Fix 2264 learning stone & Learning skill	2016-01-31 10:12:01 +03:00
Vadim Markovtsev	eb4331baf6	Fix 1916 water wheel reward	2016-01-30 19:11:22 +03:00
Vadim Markovtsev	918fbd8530	Refactor hero's mana regain	2016-01-30 13:51:07 +03:00
Vadim Markovtsev	22fc4fd3e9	Fix 2406 reset potentially available heroes	2016-01-30 10:02:33 +03:00
AlexVinS	16e0d18880	Added special slots for war machines and arrow towers	2016-01-30 00:53:53 +03:00
AlexVinS	ba017c443d	Start from diff of pull request #124 from vcmi/issue/1372	2016-01-29 21:05:17 +03:00
ArseniyShestakov	a534fe1cfe	Merge pull request #152 from vcmi/feature/moatHexesConfig ... Configurable moat hexes positions	2016-01-29 20:07:22 +03:00
Arseniy Shestakov	75f278b913	moatHexes: use initializer list and update comment	2016-01-29 19:25:25 +03:00
ArseniyShestakov	94fa25d56d	Merge pull request #179 from vmarkovtsev/issue/2405 ... Fix 2405 quest timeout mechanics	2016-01-29 12:19:31 +03:00
Vadim Markovtsev	30d64e3e3c	Fix 2405 quest timeout mechanics	2016-01-29 09:28:37 +03:00
AlexVinS	0011507e42	wipe constexpr on @DjWarmonger request	2016-01-29 00:34:54 +03:00
Arseniy Shestakov	8c39ecf538	moatHexes: add saves and mods compatability	2016-01-28 01:35:01 +03:00
Arseniy Shestakov	48aedaef47	Merge branch 'develop' into feature/moatHexesConfig	2016-01-28 01:15:08 +03:00
Arseniy Shestakov	b7fbbfdebe	CQuest: add missing completedOption initialization for CGQuestGuard	2016-01-27 23:24:17 +03:00
ArseniyShestakov	4e8486da7b	Merge pull request #160 from vmarkovtsev/issue/2388 ... Fix 2388 obelisks puzzle revealing	2016-01-27 20:49:03 +03:00
Vadim Markovtsev	0ac833cca4	Fix 2377 "Seer Empty Text"	2016-01-27 19:52:45 +03:00
AlexVinS	048e22dbe6	Fix build.	2016-01-27 19:32:59 +03:00
AlexVinS	d7c0c3759a	Merge branch 'Zyx-develop' into develop ... Conflicts: lib/filesystem/AdapterLoaders.h	2016-01-27 18:53:41 +03:00
ArseniyShestakov	3c84400262	Merge pull request #175 from vmarkovtsev/feature/switch_retreat_no_troops ... Feature/switch retreat no troops	2016-01-27 18:49:29 +03:00
Alexander Shishkin	1472ed970d	Merge pull request #176 from vmarkovtsev/issue/2160 ... Fix 2160 dismissing a VIP hero.	2016-01-27 18:28:57 +03:00
Vadim Markovtsev	9f3313524e	Fix 2160 dismissing a VIP hero	2016-01-27 17:10:19 +03:00
Vadim Markovtsev	36eaa399e7	Add hardcodedFeature to switch winner's retreating with no troops	2016-01-27 16:42:17 +03:00
AlexVinS	bffdc2813d	revert some project changes	2016-01-27 15:21:29 +03:00
DjWarmonger	94ecc3f520	Compilation fix. MVS 2013 doesn't support constexpr and it's not needed either.	2016-01-27 10:13:33 +01:00
DjWarmonger	fc62cabb68	Merge pull request #174 from vmarkovtsev/issue/981 ... Fix CGHeroInstance::isInitialized implementation	2016-01-27 09:43:53 +01:00
Vadim Markovtsev	f6679bba50	Fix CGHeroInstance::isInitialized implementation	2016-01-27 09:44:23 +03:00
Zyx-2000	92dd194c97	logger now supports unicode file paths	2016-01-26 22:42:15 +01:00
DjWarmonger	f626c0f9ed	Merge pull request #173 from vmarkovtsev/issue/981 ... Fix 981 reset hero on hiring after retreat/surrender	2016-01-26 21:24:22 +01:00
Vadim Markovtsev	7772b6de74	Fix 981 reset hero on hiring after retreat/surrender	2016-01-26 22:48:31 +03:00
Vadim Markovtsev	40cb48d65e	Replace std::remove_if with vstd::erase_if	2016-01-26 10:19:58 +03:00
ArseniyShestakov	6a7b1a1737	Merge pull request #161 from vmarkovtsev/issue/2076 ... Fix 2076 Grail removal	2016-01-26 09:01:43 +03:00
Arseniy Shestakov	97a8874ed7	CGCreature: fix crash on draw ... Also according to H3 behaviour if there artifact monster guarded it's will be lost on draw.	2016-01-26 08:41:09 +03:00
Vadim Markovtsev	22eb71de03	Remove this-> occurrences in new code	2016-01-25 14:14:32 +03:00
Vadim Markovtsev	a74fbff34f	Fix 2076 Grail removal	2016-01-25 12:38:11 +03:00
Vadim Markovtsev	afa95312ba	Fix 2139 captured spell scroll descriptions	2016-01-25 08:49:26 +03:00
ArseniyShestakov	b19e082f37	Merge pull request #166 from vmarkovtsev/issue/1723 ... Fix 1723 quest crash on combined arts	2016-01-23 23:23:07 +03:00
Vadim Markovtsev	a266154b26	Fix 2014 cursor must disappear during movement and Magi's Eye	2016-01-23 00:35:41 +03:00
Vadim Markovtsev	11bce2908d	Fix 1723 quest crash on combined arts	2016-01-22 12:56:25 +03:00
Vadim Markovtsev	e8db456beb	Reset obelisks upon game end ... Otherwise, the static variables are preserved and lead to wrong values in next new game.	2016-01-20 13:02:52 +03:00
Vadim Markovtsev	1a2cd36df8	Initialize obelisks count to 0 ... Otherwise every time player starts with a random number.	2016-01-20 12:43:07 +03:00
Vadim Markovtsev	bb3a31f3ff	Mark obelisk visited for all players in the team	2016-01-20 11:14:03 +03:00