Commit Graph

38404 Commits

Author SHA1 Message Date
Hanmac
e031ac8176 PartnerWith: extended DeckFormat Predicate 2018-05-27 15:52:18 +02:00
Hanmac
ef96037555 Partner with: fixed , to ; replace 2018-05-27 14:56:45 +02:00
Hanmac
3c1edcef4e cards: added Sylvia and Khorvath as Partner 2018-05-27 13:42:48 +02:00
Hanmac
6481842482 Partner with: added Logic into CardRules and added Trigger 2018-05-27 13:42:16 +02:00
swordshine
048737d9dd - Added some cards 2018-05-27 19:25:37 +08:00
Rob Schnautz
6b040f9bb8 Fix Oracle text (script was already changed) 2018-05-27 05:06:01 +00:00
schnautzr
9a57f1aca5 "any target" 2018-05-26 23:50:10 -05:00
schnautzr
3f99525715 "any target" 2018-05-26 23:12:52 -05:00
Michael Kamensky
0b5067b6e8 Merge branch 'cubes' into 'master'
Added Card Kingdom Starter Cube

See merge request core-developers/forge!593
2018-05-27 04:08:22 +00:00
schnautzr
124a9cec6c "any target" 2018-05-26 19:54:18 -05:00
schnautzr
2c21bd0ffb "any target" 2018-05-26 19:47:21 -05:00
schnautzr
e8cf3a1828 "any target" 2018-05-26 19:26:57 -05:00
austinio7116
faa322f4a7 Added Card Kingdom Starter Cube 2018-05-26 23:36:54 +01:00
maustin
cb1debc8f4 Merge remote-tracking branch 'Austin/filteredhands' into filteredhands
# Conflicts:
#	forge-game/src/main/java/forge/game/GameAction.java
2018-05-26 23:32:35 +01:00
Michael Kamensky
0264571cce Merge branch 'historicformats' into 'master'
Remove Alpha formats

See merge request core-developers/forge!586
2018-05-26 17:47:04 +00:00
schnautzr
35569a69b7 Remove Alpha formats 2018-05-26 12:21:31 -05:00
schnautzr
9a9f5ec268 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into historicformats 2018-05-26 12:19:27 -05:00
Michael Kamensky
2a69451834 Merge branch 'master' into 'master'
Possibility Storm: puzzle PS_DOM4

See merge request core-developers/forge!591
2018-05-26 16:32:26 +00:00
Agetian
5f560c2266 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-05-26 19:29:34 +03:00
Michael Kamensky
10be0a93a4 Merge branch 'tokenRCtrl' into 'master'
Token & CopyPermanent: fixed RE changing controller

See merge request core-developers/forge!590
2018-05-26 16:28:52 +00:00
Hanmac
907825f53b Token & CopyPermanent: fixed RE changing controller 2018-05-26 18:19:15 +02:00
Agetian
755d2476e0 - Move the methods in GameState a little. 2018-05-26 18:45:12 +03:00
Agetian
101727b5da - For now, implement PS_DOM4 with four Islands on the AI's battlefield (more consistent for the AI to be able to cast Crafty Cutpurse across phases). 2018-05-26 18:37:34 +03:00
Agetian
2de0a4d164 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-05-26 18:29:43 +03:00
Michael Kamensky
32d276cb7e Merge branch 'cardTypeIntrinsic' into 'master'
Card type intrinsic

See merge request core-developers/forge!588
2018-05-26 15:26:20 +00:00
Hanmac
95cf25d531 Ageless Sentinels: fixed RemoveCreatureTypes 2018-05-26 17:13:54 +02:00
Agetian
7653f50f9d - Support mana pool modification via GameState. Update PS_DOM4 accordingly. 2018-05-26 17:45:11 +03:00
Hanmac
599407ff14 Cards: more on Animate Types, remove OverwriteTypes 2018-05-26 16:35:07 +02:00
Agetian
b4d57200a6 - Added puzzle PS_DOM4. 2018-05-26 16:48:07 +03:00
Agetian
4e15c2ddd4 - GameState: improve to handle cards that enchant a player (Trespasser's Curse). 2018-05-26 16:47:13 +03:00
Michael Kamensky
1a8b0bded3 Merge branch 'master' into 'master'
BBD: Added some cards

See merge request core-developers/forge!587
2018-05-26 13:27:45 +00:00
swordshine
9650bacca5 - Added some cards 2018-05-26 21:26:30 +08:00
Hanmac
ba29d1cfd9 Cards: use new Remove-Types Params and RemoveIntrinsicAbilities 2018-05-26 15:07:52 +02:00
Hanmac
51a0a9e70a CardType: fixed seting specific SubTypes 2018-05-26 15:07:52 +02:00
austinio7116
70a82fbc45 Removed flicker when filtering starting hand 2018-05-26 13:53:17 +01:00
Michael Kamensky
144f8944e1 Merge branch 'damageAnyTargetFix' into 'master'
fixed any Target Damage

See merge request core-developers/forge!589
2018-05-26 12:34:36 +00:00
Hanmac
8d3c4ff443 add TargetedOrController for spells that target player or planeswalker, extend OwnedBy and ControlledBy 2018-05-26 13:39:48 +02:00
Hanmac
31113133fc Oracle: update base code for their effects 2018-05-26 13:38:55 +02:00
Hanmac
2bf72bca6e fixed any Target Damage 2018-05-26 13:11:29 +02:00
swordshine
1b01336514 - Added some cards 2018-05-26 18:14:24 +08:00
austinio7116
d52deee44e Experimental MTG Arena style double hand filtering 2018-05-26 08:00:50 +01:00
swordshine
d4c25caeef - Added some cards 2018-05-26 13:31:43 +08:00
swordshine
614e98d32a - Updated TypeLists 2018-05-26 13:14:01 +08:00
swordshine
00360e55d2 - Added some cards 2018-05-26 13:02:23 +08:00
Michael Kamensky
8597956aeb Merge branch 'battlebond' into 'master'
Battlebond

See merge request core-developers/forge!585
2018-05-26 04:14:41 +00:00
Michael Kamensky
8c898b79b8 Merge branch 'oracle-updates-functional' into 'master'
Oracle updates functional

See merge request core-developers/forge!584
2018-05-26 03:58:48 +00:00
Michael Kamensky
544cfc5044 Merge branch 'oracle-updates-nonfunctional' into 'master'
Oracle updates nonfunctional

See merge request core-developers/forge!583
2018-05-26 03:58:01 +00:00
schnautzr
e3f0de8f84 Remove Alpha formats. These can be done easily with a filter. 2018-05-25 19:31:32 -05:00
Rob Schnautz
b160281cfe Update boosterboxes.txt 2018-05-25 23:53:15 +00:00
Rob Schnautz
321a44d0e9 booster info 2018-05-25 23:47:51 +00:00