5270 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ArseniyShestakov	ac57eaf61d	Merge pull request #141 from vcmi/fix/oneWeekTurnsRemain ... Bonus system: add turnsRemain support for ONE_WEEK duration	2015-11-24 13:08:03 +03:00
ArseniyShestakov	b48d65ad57	addNewBonus: add turnsRemain check for N_TURNS, N_DAYS and ONE_WEEK	2015-11-20 14:37:57 +03:00
ArseniyShestakov	f99ffbd074	Bonus system: use duration helpers in selecters	2015-11-20 13:24:48 +03:00
ArseniyShestakov	6d395bcba7	Bonus system: add turnsRemain support for ONE_WEEK duration	2015-11-20 12:11:35 +03:00
AlexVinS	d6bb599bc8	Another ffmpeg api fix	2015-11-14 03:59:16 +03:00
AlexVinS	cdec29e413	Merge branch 'ffmpeg-cleanup' into develop	2015-11-12 15:47:02 +03:00
ArseniyShestakov	4e11d81673	CGWhirlpool: fix random exit chooser	2015-11-12 01:23:27 +03:00
AlexVinS	c9ad7167d1	another try to fix travis build.	2015-11-11 16:27:04 +03:00
AlexVinS	e20f861727	try to fix travis build. ... What an ancient version of ffmpeg does it have?	2015-11-11 15:44:17 +03:00
AlexVinS	f9dfa8d0c2	try to fix libav 9.18	2015-11-11 15:18:05 +03:00
AlexVinS	33c933c208	All "old" APIs are deprecated in ffmgeg 2.2.3 - remove them entirely	2015-11-11 13:07:56 +03:00
AlexVinS	4b94efe6b5	Hopefully proper fix for ffmpeg on MSVS	2015-11-11 12:41:28 +03:00
DjWarmonger	5fadb239f2	Merge pull request #134 from edeksumo/Fix-Defence-Ani ... Let's try this.	2015-11-11 09:43:51 +01:00
DjWarmonger	d95a999e23	Fixed ffmpeg compilation on Visual Studio.	2015-11-11 09:41:28 +01:00
ArseniyShestakov	96897acc46	CWillLastDays: add condition for permanent durations ... Accidentally missed them in pull request	2015-11-09 19:05:22 +03:00
ArseniyShestakov	b8ccb5916c	Merge pull request #139 from ArseniyShestakov/fixDaysBonusDuration ... Bonus system: N_DAYS duration support and new CWillLastDays selector	2015-11-09 17:17:12 +03:00
ArseniyShestakov	7f0b0bd1b5	Bonus system: use updateBonuses in battleTurnPasseed	2015-11-09 15:48:07 +03:00
ArseniyShestakov	ee1c5e452f	Bonus system: add CWillLastDays selector	2015-11-09 15:01:58 +03:00
ArseniyShestakov	5bfbd8526b	Bonus system: fix N_DAYS bonus duration	2015-11-09 14:18:36 +03:00
ArseniyShestakov	74198a537b	CGameHandler::setOwner: fix InfoWindow text on last town loss	2015-11-09 00:54:59 +03:00
ArseniyShestakov	866a0a1fc0	VCAI: little improvement for 2a59cb6191	2015-11-08 23:02:59 +03:00
ArseniyShestakov	a49950e958	Fix 2292. Fix chat on adventure map, increase maxOutputPerLine	2015-11-08 22:16:58 +03:00
edeksumo	ba1062ed3c	Formating2 ... Change ani to anim	2015-11-07 23:30:01 +01:00
Ivan Savenko	3aa5360ac6	Merge pull request #135 from josch/develop ... Replace deprecated FFmpeg API for compatibility with ffmpeg 2.9	2015-11-07 11:23:30 +02:00
ArseniyShestakov	7eebcb9d60	Artifacts: replace few more ints by ArtifactID	2015-11-07 11:46:58 +03:00
AlexVinS	e645b46aed	Revert "Merge pull request #124 from vcmi/issue/1372" ... This reverts commit da01af319b, reversing changes made to 8b6b4e2e0b.	2015-11-07 11:35:02 +03:00
ArseniyShestakov	bd12989ad6	Artifacts: use ArtifactID instead of ints	2015-11-06 21:54:51 +03:00
Andreas Cadhalpun	f80c1410b3	Replace deprecated FFmpeg API for compatibility with ffmpeg 2.9	2015-11-05 12:38:04 +01:00
edeksumo	dd525da153	Formatting	2015-11-04 23:37:53 +01:00
Alexander Shishkin	da01af319b	Merge pull request #124 from vcmi/issue/1372 ... Issue/1372	2015-11-04 10:39:40 +03:00
edeksumo	75a76c0bf0	FixDefenceAni	2015-11-04 00:19:40 +01:00
ArseniyShestakov	8b6b4e2e0b	Fix header case for Linux to Windows cross compilation using MingGW	2015-11-03 14:40:36 +03:00
AlexVinS	4b5cb3599a	Do not try to rise demons from war machines	2015-11-03 02:20:26 +03:00
AlexVinS	6a9dc78dcd	[WiP]Added some checks for RISE_DEMONS action.	2015-11-03 02:18:36 +03:00
AlexVinS	fbebbf39f3	Fix zero size stack summoned in case of basic resurrection.	2015-11-03 02:18:35 +03:00
AlexVinS	f6b9015324	Use constant for summoned creature slot	2015-11-03 02:18:34 +03:00
AlexVinS	c94bea51e3	Update army in case of summoned creatures	2015-11-03 02:18:33 +03:00
AlexVinS	b024237e8a	Remove stack instancies of removed stacks	2015-11-03 02:18:32 +03:00
DjWarmonger	349f16a359	Version bump.	2015-11-02 17:28:54 +01:00
DjWarmonger	d7b70da27e	Merge branch 'develop' of https://github.com/vcmi/vcmi into develop	2015-11-02 16:40:39 +01:00
DjWarmonger	c047fea44c	Updated changelog. To be released as VCMI 0.98e.	2015-11-02 16:39:57 +01:00
edeksumo	460227ec23	GitIgnore	2015-11-02 12:08:42 +01:00
AlexVinS	34cc9c78f7	[c::b] update projects	2015-11-01 00:01:41 +03:00
DjWarmonger	621c62b44e	Don't crash when spell school level is higher than 3 (which is another bug)	2015-10-31 21:15:40 +01:00
DjWarmonger	5ef02aaf88	Updated MSVS project.	2015-10-31 15:08:13 +01:00
DjWarmonger	17071c6ec8	Merge pull request #125 from ArseniyShestakov/newMovementSystem ... Okay, time to merge this.	2015-10-31 13:56:22 +01:00
ArseniyShestakov	a0a55974ea	Fix issue 2320. Town events for buildings should now work	2015-10-28 08:46:43 +03:00
ArseniyShestakov	c4ea0c7ff2	CPathfinder: don't include RegisterTypes	2015-10-27 17:42:31 +03:00
ArseniyShestakov	92fee1bdbf	CPathfinder: shorten options struct declaration	2015-10-27 03:50:38 +03:00
ArseniyShestakov	6b34eb729e	Move all pathfinding-related code into new file	2015-10-27 03:34:47 +03:00