Commit Graph

37905 Commits

Author SHA1 Message Date
Rob Schnautz
ef758638af Update veteran_explorer.txt 2018-05-24 01:41:14 +00:00
Rob Schnautz
0b2331b0e6 Functional update (Dominaria) 2018-05-24 01:27:36 +00:00
Rob Schnautz
8d114e42f1 Fix function, Oracle, stack text, and update Oracle. 2018-05-24 00:28:41 +00:00
austinio7116
89fef80d05 Using brawl banlist wherever needed 2018-05-23 22:18:58 +01:00
austinio7116
c9a0058042 Experimental MTG Arena style double hand filtering 2018-05-23 21:35:33 +01:00
Hans Mackowiak
740884847f Merge branch 'patch-1' into 'master'
Integer.max can't be used use Math.max

See merge request core-developers/forge!575
2018-05-23 20:17:35 +00:00
Hans Mackowiak
5a68bc4b79 Integer.max can't be used use Math.max 2018-05-23 20:17:07 +00:00
Michael Kamensky
f3006fd8e2 Merge branch 'patch-1' into 'master'
fixed Deprecated warning

Closes #565

See merge request core-developers/forge!574
2018-05-23 05:25:09 +00:00
Rob Schnautz
0b616164c4 Battlebond Oracle updates (non-functional) 2018-05-22 22:14:48 +00:00
Rob Schnautz
3cfaa8ad99 Battlebond Oracle update (nonfunctional) 2018-05-22 22:09:45 +00:00
Hans Mackowiak
187256cdb7 fixed Deprecated warning 2018-05-22 15:25:42 +00:00
Michael Kamensky
adc2d95b1f Merge branch 'suspendHaste' into 'master'
Suspend: reworked suspend

See merge request core-developers/forge!573
2018-05-22 05:39:40 +00:00
Hanmac
2973214976 CardTraitBase: make sVars cloneable, use in SpellAbility 2018-05-21 22:45:03 +02:00
Michael Kamensky
f8418f689f Merge branch 'mergebranch' into 'master'
Fixed BoosterUtils Extended format issue in quests by renaming final extended format .txt file

See merge request core-developers/forge!572
2018-05-21 19:25:22 +00:00
Hanmac
8d03b23eb4 Suspend: reworked suspend, no need for SuspendCast anymore, Haste is done as Pump Effect 2018-05-21 18:14:20 +02:00
austinio7116
d1dd1c7530 Fixed BoosterUtils Extended format issue in quests by renaming final extended format .txt file 2018-05-21 17:13:02 +01:00
Michael Kamensky
9aeed6ac31 Merge branch 'counterGameCheck' into 'master'
Put Counter Effects check Game State

Closes #548

See merge request core-developers/forge!568
2018-05-20 17:14:43 +00:00
Michael Kamensky
fcc8a8f9ce Merge branch 'mergebranch' into 'master'
Fixed missing Extended format required for quests if Historic mode switched off in settings

See merge request core-developers/forge!571
2018-05-20 17:09:53 +00:00
austinio7116
67e5ae9ee0 Attempt to fix BoosterUtils Extended format issue in quests 2018-05-20 17:59:52 +01:00
austinio7116
2b49f70ae3 Attempt to fix BoosterUtils Extended format issue in quests 2018-05-20 17:55:45 +01:00
Michael Kamensky
7813483a08 Merge branch 'dom-puzzles' into 'master'
Added puzzle PS_DOM3.

See merge request core-developers/forge!569
2018-05-20 10:12:39 +00:00
Agetian
045b303deb - Added puzzle PS_DOM3. 2018-05-20 13:12:10 +03:00
Hanmac
57af402bcf cards: PutCounter use Triggered LKICopy 2018-05-20 11:37:28 +02:00
Hanmac
e4b7c105b1 cards: update Monstrosity using TriggeredCount 2018-05-20 11:33:43 +02:00
Hanmac
3b5d273409 CounterEffects: use gameState and timestamp checks 2018-05-20 11:33:18 +02:00
austinio7116
07c29999c6 Merge branch 'historicmerge' into 'master'
Completed historic formats from Schnautzr, the Wurmcaller

See merge request core-developers/forge!567
2018-05-20 06:51:21 +00:00
austinio7116
9dc7632e68 Completed historic formats from Schnautzr, the Wurmcaller 2018-05-20 07:47:38 +01:00
Michael Kamensky
442ffdcb37 Merge branch 'brawlcolourless' into 'master'
Brawl deck generators make use of new colourless rules for basic lands

See merge request core-developers/forge!565
2018-05-20 04:19:46 +00:00
Michael Kamensky
f02ba82471 Merge branch 'basicLandAbility' into 'master'
Card: move Abilities to Card and only create them once

See merge request core-developers/forge!560
2018-05-20 03:40:05 +00:00
schnautzr
f628a4aa65 All historic DCI formats through Dominaria are now added. 2018-05-19 20:30:48 -05:00
schnautzr
20b80bced6 Formats through Ixalan. 2018-05-19 20:10:09 -05:00
schnautzr
801193edde Formats through Kaladesh. 2018-05-19 19:08:00 -05:00
schnautzr
8eaf76734e Formats through Shadows over Innistrad. Marked Ice Age and Extended as retired and deleted several Extended formats that never existed. 2018-05-19 18:23:42 -05:00
schnautzr
9a1dcd3cda Formats through Battle for Zendikar. 2018-05-19 17:26:25 -05:00
austinio7116
553cec6d60 Brawl deck generators make use of new colourless rules for basic lands 2018-05-19 22:25:01 +01:00
schnautzr
c333fec6c4 Formats through Khans of Tarkir. Fixed Extended formats. Rotated Theros Extended formats. 2018-05-19 15:56:59 -05:00
schnautzr
7e9efd9c30 Formats through Theros. 2018-05-19 15:02:56 -05:00
Hanmac
8e7f055b59 try Spell.performanceMode only for other player, enable Bestow and Morph 2018-05-19 10:26:45 +02:00
Hanmac
ece779c88e unSuppress basicLandAbilities 2018-05-19 10:21:01 +02:00
Hanmac
c1da970c47 Card: move Abilities to Card and only create them once 2018-05-19 10:21:01 +02:00
Michael Kamensky
3505047c9b Merge branch 'brawlruleschanges' into 'master'
New Brawl rules updates

See merge request core-developers/forge!564
2018-05-19 05:25:26 +00:00
schnautzr
1338af9720 Formats through Return to Ravnica. 2018-05-18 20:25:15 -05:00
schnautzr
e0dd4d3b4f Formats through Innistrad and 1/1/12 changes. Rename Duelists' Convocation to DCI. 2018-05-18 19:26:56 -05:00
austinio7116
1458184500 New Brawl rules updates 2018-05-18 23:29:15 +01:00
austinio7116
52fe47c3ee Merge branch 'master' into 'master'
Prevent views flickering during gameplay from state-based effects.

See merge request core-developers/forge!563
2018-05-18 18:58:24 +00:00
Alexei Svitkine
1a81f24c45 remove unrelated changes 2018-05-18 10:58:52 -04:00
Alexei Svitkine
63210a42b0 fix merge 2018-05-18 10:58:02 -04:00
Alexei Svitkine
09900a3457 Merge remote-tracking branch 'upstream/master' 2018-05-18 10:53:23 -04:00
Alexei Svitkine
7071be93f7 fix unit tests with anti flicker fixes, by having CurrentState be
settable when frozen if it's null
2018-05-18 10:40:30 -04:00
Alexei Svitkine
96a7d7d0d2 Prevent views flickering during gameplay when state-based affects
change card state (e.g. Painter's Servant, Ambush Commander, etc)
2018-05-18 10:02:16 -04:00