3060 Commits

Author	SHA1	Message	Date
Agetian	bc63cdd52a	- Code simplification.	2018-05-02 15:07:04 +03:00
Agetian	270e25083a	- Trigger an unexpected behavior warning instead of crashing the game.	2018-05-02 08:35:09 +03:00
Agetian	9d66d36a78	- Clarification in ManaReflectedEffect.	2018-05-02 07:15:26 +03:00
Agetian	a4133a07a8	- Cleanup and var rename in ManaReflectedEffect.	2018-05-02 07:14:57 +03:00
Agetian	ea547dfd4d	- Removed an empty line.	2018-05-02 07:04:33 +03:00
Agetian	c66a8c20d2	- Integrating a reformatted fix by Seravy which makes Mox Amber AI playable (as well as Reflecting Pool) and fixes auto mana payment for these and other cards that use ManaReflected.	2018-05-02 06:55:59 +03:00
Agetian	d664f8abcd	- Integrating a reformatted fix by Seravy which makes Mox Amber AI playable (as well as Reflecting Pool) and fixes auto mana payment for these and other cards that use ManaReflected.	2018-05-02 06:55:45 +03:00
Sol	1a3308017a	Revert "Merge branch 'temp_dev6' into 'master'" ... This reverts merge request !499	2018-05-01 01:11:29 +00:00
Sol	64e8dd35c2	Merge branch 'temp_dev6' into 'master' ... Allow for Seeded RNG in simulation games! See merge request core-developers/forge!499	2018-05-01 01:01:30 +00:00
Michael Kamensky	3eead9da4e	Merge branch 'saga2' into 'master' ... Saga: use better state based action See merge request core-developers/forge!502	2018-04-30 06:24:17 +00:00
Hanmac	cc654b56a1	GameAction: add canBeSacrificed check, no need to do the other checks later	2018-04-30 07:17:11 +02:00
Hanmac	66ac3ee63c	WA: fixed Saga abilities	2018-04-30 06:51:01 +02:00
Sol	ab2d284dee	Merge branch 'temp_dev5' into 'master' ... Remove unusual "reproducable" attack declaration from AI See merge request core-developers/forge!498	2018-04-30 00:16:30 +00:00
Michael Kamensky	f72c5aa59c	Merge branch 'temp_dev4' into 'master' ... Android updates See merge request core-developers/forge!491	2018-04-29 20:16:28 +00:00
Hanmac	910dc4fb26	Saga: use better state based action: it only cares about chapter abilities, and get the final chapter nr from the triggers	2018-04-29 20:59:16 +02:00
Chris H	758dbb689a	When playing non-team matches, display Player name as winner in Game Recap screen	2018-04-28 23:22:23 -04:00
Meerkov	792fdad4be	Tiny Update: Removes dead code. ... Just removes some code that does nothing. (cherry picked from commit b462c41dff99f0173b7e228f826ca0bf0d8103cb)	2018-04-28 17:01:42 +00:00
Meerkov	0a717bb9be	Fix more RNG. ... (cherry picked from commit 61dd5661a728e08ae14911a3518cd1e10d574037)	2018-04-28 16:54:53 +00:00
Agetian	084f45393e	- Code tweak suggested by Hanmac.	2018-04-28 15:08:53 +03:00
Agetian	90a1a5f058	- (Experimental) Attempting to fix the interaction of text-changing abilities with keyworded effects that use overriding abilities (e.g. Fabricate and Artificial Evolution).	2018-04-28 13:56:53 +03:00
Agetian	ce165f4234	- Updating DrainMana ability description.	2018-04-28 13:42:51 +03:00
Agetian	445625ba1e	- Removing references to mana pool in other parts of the code.	2018-04-28 13:34:16 +03:00
Meerkov	8f68266585	Update Guava to 24.1 ... This updates Guava 16 to 24.1. Currently 16 is a 4 year old version, so there are a lot of bug fixes. The Android .pom has 24.1-android instead of 24.1-jre, for compatability reasons. I did not test the android build, however the desktop build works. Also resovles two warnings and drops a "TODO" on a comment that was highlighting a possible bug but wasn't easily marked to discover later. (cherry picked from commit be578af80467c1850d9dcec0af6fe18840fff7e9)	2018-04-28 08:42:22 +00:00
Michael Kamensky	7df7703c50	Merge branch 'assorted-fixes' into 'master' ... - Fix the implementation of Exalted. See merge request core-developers/forge!483	2018-04-26 04:45:21 +00:00
Agetian	33bc3557e5	- Fix the implementation of Exalted.	2018-04-26 07:44:38 +03:00
austinio7116	acef14aadc	Merge branch 'fix_outcome_memory_leak' into 'master' ... Memory leak within a match See merge request core-developers/forge!458	2018-04-25 22:35:02 +00:00
Chris H	f7a739a023	Fix incompatibilities with Android API	2018-04-23 15:21:41 -04:00
Agetian	9ffad0437a	- Updating the card cache directly is no longer needed after the fix in CardFactoryUtil is complete.	2018-04-23 22:04:15 +03:00
Agetian	844c083ee4	- Attempting to fix issues with Suspend not working in different ways (not being able to cast a spell with suspend, not being able to resuspend a card returned from graveyard).	2018-04-23 20:35:44 +03:00
Chris H	ade17c5eaf	Fix Memory leak within a match	2018-04-22 15:18:22 -04:00
Michael Kamensky	78525a830b	Merge branch 'assorted-fixes' into 'master' ... Added NPE prevention for situations where AI evaluation for targeting cards with Shroud in MoJhoSto crashes the game. See merge request core-developers/forge!455	2018-04-21 20:16:58 +00:00
Agetian	819301c7d8	- FIXME: Added NPE prevention for situations where targeting cards with Shroud would be tested, but the SA activator would be null at this point (seems to happen for the AI in MoJhoSto matches; probably needs a more thorough long-term solution).	2018-04-21 19:58:03 +03:00
Blacksmith	0d375ecd93	[maven-release-plugin] prepare for next development iteration	2018-04-21 01:18:35 +00:00
Blacksmith	970f684345	[maven-release-plugin] prepare release forge-1.6.9	2018-04-21 01:18:32 +00:00
Hanmac	c47da9acdd	PlayEffect: don't cast to CardCollection	2018-04-20 13:01:29 +02:00
austinio7116	a43907fe14	Reversed date ordering when checking deck formats so that when only one of each subtype is shown the earliest valid format is used	2018-04-20 06:46:26 +01:00
Michael Kamensky	5844de9b3c	Merge branch 'assorted-fixes' into 'master' ... Fixed the AI hanging the game in AF ChooseSource in corner cases See merge request core-developers/forge!440	2018-04-20 04:33:41 +00:00
Agetian	a1a7390d80	- Fixed the AI hanging the game when trying to choose a source in absence of a creature in combat on the opponent's battlefield.	2018-04-20 07:13:25 +03:00
austinio7116	2cfd036466	Standard formats checked and effective dates added from RIX back to Avacyn Restored ... Corrected effective date parsing to match format files and reversed date order so latest formats appear first	2018-04-19 20:54:11 +01:00
maustin	53a03b94d4	Merge branch 'master' into historicformats ... # Conflicts: # forge-game/src/main/java/forge/game/GameFormat.java	2018-04-18 23:00:56 +01:00
Michael Kamensky	3bb69e356c	Merge branch 'healinggrace' into 'master' ... ReplaceDamage: new Effect for reducing Damage inside ReplacementEffect Closes #268 See merge request core-developers/forge!427	2018-04-18 18:20:17 +00:00
Michael Kamensky	e5d436c295	Merge branch 'master' into 'master' ... Memory Leaks, Unused code, compiler warnings, etc. See merge request core-developers/forge!423	2018-04-18 15:40:37 +00:00
Hanmac	211157c0d0	ReplaceDamage: new Effect for reducing Damage inside ReplacementEffect	2018-04-18 17:24:59 +02:00
Michael Kamensky	e186356591	Merge branch 'torgaar' into 'master' ... Add Torgaar (DOM) See merge request core-developers/forge!424	2018-04-18 04:23:00 +00:00
Chris H	f3afaf9c51	Add Torgaar (DOM)	2018-04-17 23:08:53 -04:00
Meerkov	6efd631fd8	Declares a serialVersionUID. ... Lots of classes here are serializable, but warn due to missing UID. Serializables are supposed to have a UID for version compatability. Fixes a bunch of compiler warnings. Also adds in "default:" branch to a few switches which were warning due to missing cases.	2018-04-17 16:48:18 -07:00
Meerkov	db3e4d9e83	Fixes ~50 compiler warnings for unused libraries.	2018-04-17 16:06:00 -07:00
Meerkov	338ba5afdc	Fixes some compile errors in Eclipse due to empty folders.	2018-04-17 15:50:53 -07:00
maustin	f2ae137947	Merge branch 'master' into historicformats ... # Conflicts: # forge-game/src/main/java/forge/game/GameFormat.java	2018-04-17 21:29:03 +01:00
Michael Kamensky	f51b80739a	Merge branch 'master' into 'master' ... Re-merge request for RNG Changes etc See merge request core-developers/forge!422	2018-04-17 15:35:05 +00:00