Commit Graph

3382 Commits

Author SHA1 Message Date
swordshine
a061282a54 Update some scripts 2019-04-19 12:49:51 +08:00
swordshine
3c6d82b2e8 Merge branch 'patch' into 'master'
Add more WAR cards

See merge request core-developers/forge!1547
2019-04-18 00:18:03 +00:00
swordshine
445c0b2c75 Update some triggers 2019-04-17 20:12:39 +08:00
swordshine
0ba040750e Add Chandra, Fire Artisan 2019-04-17 13:39:24 +08:00
Adam Pantel
4821e50025 Allow TriggeredObject in filtering 2019-04-16 15:57:52 -04:00
Hans Mackowiak
b6f023c57c - DiscardAi: find the first opponent that can discard to the effect, don't try to cast on players who have Tamiyo, Collector of Tales-like effect. 2019-04-16 05:05:13 +00:00
Hans Mackowiak
01d1eacdce Resolve "IllegalArgumentException: No element named Battlefield,Graveyard in enum Zone" 2019-04-14 12:26:28 +00:00
Sol
bfae7b8951 Merge branch 'patch' into 'master'
Fix Ral, Storm Conduit (SpellCopy trigger)

See merge request core-developers/forge!1524
2019-04-13 19:56:36 +00:00
Hans Mackowiak
2617795e37 War: Proliferate: rework effect now put each counter type on it 2019-04-10 10:23:00 +00:00
Hanmac
64f17935e5 Amass: add new Keyword Action for War of the Spark 2019-04-10 08:13:22 +02:00
swordshine
765586b8b0 Fix Ral, Storm Conduit (SpellCopy trigger) 2019-04-10 10:32:30 +08:00
churrufli
cc19b2b39e Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-04-09 14:21:03 +02:00
Chris H
e0101ebb7b Fix counterbalance crashing on an empty library 2019-04-08 20:58:47 -04:00
Blacksmith
405cbd5ab3 [maven-release-plugin] prepare for next development iteration 2019-04-07 19:48:55 +00:00
Blacksmith
5b39be5fe9 [maven-release-plugin] prepare release forge-1.6.23 2019-04-07 19:48:50 +00:00
churrufli
ada8d59b2c Update language properties 2019-04-06 22:53:38 +02:00
Agetian
9c39d159e9 - Spellskite should grab its magnet target from DefinedMagnet. 2019-03-28 17:34:53 +03:00
Adam Pantel
ae772e99a7 Enchant fix 2019-03-23 14:35:00 -04:00
Michael Kamensky
fd1e8c1e7e Merge branch 'token-multiple-art' into 'master'
Allow multiple art for tokens based on edition files

See merge request core-developers/forge!1473
2019-03-22 04:27:45 +00:00
Chris H
dc917643b5 Allow multiple art for tokens based on edition files 2019-03-21 20:58:46 -04:00
Hanmac
dece031e13 SpellAbilityEffect: fix getCards when only spell is targeted 2019-03-19 08:23:09 +01:00
Hans Mackowiak
255a07fa2e TokenInfo: add TokenPower & TokenToughness into token script 2019-03-16 18:26:47 +00:00
Hanmac
56c1a0e6d1 CardFactoryUtil: TokenScript for Fabricate and Living Weapon 2019-03-13 20:04:42 +01:00
Blacksmith
c3346c737e [maven-release-plugin] prepare for next development iteration 2019-03-10 13:57:44 +00:00
Blacksmith
db3c4d2d2f [maven-release-plugin] prepare release forge-1.6.22 2019-03-10 13:57:39 +00:00
Hanmac
393207c9d8 Card: fixed LandAbility + FaceDown + MayPlay 2019-03-09 13:59:21 +01:00
tehdiplomat
f7d40687b6 Log after clashing so players know what happened to top of library 2019-03-08 10:11:15 -05:00
Hanmac
9067d676eb GameAction: register from LKI to fix leave the battlefield 2019-03-07 20:34:32 +01:00
Agetian
3f15be2732 - Fix inverse logic in TokenEffect (fixes e.g. Estrid, the Masked -1 ability) 2019-03-05 09:10:48 +03:00
Alessandro
b7508b8c3a ManaBurn sound working again 2019-03-02 16:10:13 +01:00
swordshine
f38ec8d4a0 - Update Lavinia, Azorius Renegade for multiplayer 2019-02-26 16:59:25 +08:00
Hanmac
fe4ce14a4b TriggerChangesZone: this check only for nonStatic Trigger 2019-02-24 15:59:36 +01:00
schnautzr
4ddf811118 Replace unmappable characters. 2019-02-23 11:37:28 -06:00
Hanmac
9bf908ccb4 GameAction: fix die trigger for non-Original
TriggerChangesZone: fix leave battlefield on hidden
2019-02-23 14:50:08 +01:00
Hanmac
0c2cfdce34 TokenInfo: fix if script is null 2019-02-23 13:47:40 +01:00
Sol
d2917f0e43 Merge branch '850-untilyournextturn-incorrectly-ends-during-your-next-cleanup-phase' into 'master'
Resolve "UntilYourNextTurn incorrectly ends during your next cleanup phase"

Closes #850

See merge request core-developers/forge!1409
2019-02-22 12:58:14 +00:00
Krazy
893cc3b08f Merge branch 'eclipse-cleanup' into 'master'
Eclipse cleanup

Closes #844

See merge request core-developers/forge!1399
2019-02-22 02:09:05 +00:00
Hanmac
9e6d9e8e30 PumpEffect: fixed Until Parameter for Player 2019-02-21 16:19:12 +01:00
Sol
b544718140 Merge branch 'master' into 'master'
Use PeekAndReveal for Sunbird's Invocation

Closes #841

See merge request core-developers/forge!1395
2019-02-18 16:47:42 +00:00
Blacksmith
4ed17e1e16 [maven-release-plugin] prepare for next development iteration 2019-02-17 19:51:17 +00:00
Blacksmith
a70136c98c [maven-release-plugin] prepare release forge-1.6.21 2019-02-17 19:51:13 +00:00
Peter F. Patel-Schneider
2b0fc5a00a generalize card showing in PlayEffect 2019-02-15 10:59:12 -05:00
Peter F. Patel-Schneider
f63e59fbda PlayEffect has ShowRemembered parameter which shows remembered cards if playing cards selected from a zone 2019-02-15 08:49:16 -05:00
Tim Scott
7f16a3dce2 Remove Eclipse-specific files and directories. Maven-based build configurations can be easily imported by (at least) Eclipse 2018-12. Hint: File > Import > Maven > Existing Maven Projects > Navigate to root forge folder.
Tweak base pom.xml to allow for error-free Eclipse compilation.
2019-02-14 21:26:23 -06:00
Michael Kamensky
bf0e0a94e4 Merge branch 'master' into 'master'
fix digging with change number of 0

See merge request core-developers/forge!1394
2019-02-14 16:32:22 +00:00
Peter F. Patel-Schneider
3a71e2e948 fix digging with change number of 0 2019-02-14 11:04:11 -05:00
Agetian
ab56e1f7d4 - Add several APIs to the timestamp check in Wrapped Ability, fixes e.g. Toothy LTB trigger. 2019-02-13 10:05:05 +03:00
Michael Kamensky
64c9f7ffb3 Merge branch '832-state-based-actions-check-conflict-with-upkeep-trigger' into 'master'
Resolve "State Based Actions check conflict with Upkeep trigger"

Closes #832

See merge request core-developers/forge!1380
2019-02-11 13:00:14 +00:00
Hanmac
fcdf49bafd TriggerAttackerBlocked: add TriggeredDefender 2019-02-10 07:42:18 +01:00
Hanmac
4da05f03dc CardFactoryUtil: Aura swap as Keyword 2019-02-09 17:53:05 +01:00