Commit Graph

55234 Commits

Author SHA1 Message Date
Michael Kamensky
b1a563c518 - Update ANNOUNCEMENTS.txt 2021-12-28 09:28:00 +03:00
Michael Kamensky
8592a92445 Merge branch 'master' into 'master'
Added puzzles PS_VOW1-3.

See merge request core-developers/forge!5989
2021-12-28 06:06:44 +00:00
Michael Kamensky
41ace72d44 - Added puzzles PS_VOW1-3. 2021-12-28 09:06:04 +03:00
Michael Kamensky
b28e51ae59 Merge branch 'y22_trt' into 'master'
Y22: Town-razer Tyrant and support

See merge request core-developers/forge!5974
2021-12-28 04:16:11 +00:00
Michael Kamensky
7d3a7e4479 Merge branch 'manaAbilityComboRework' into 'master'
Mana: use Combo for X or Y mana abilities

See merge request core-developers/forge!5983
2021-12-28 04:15:55 +00:00
Michael Kamensky
5e25029e38 Merge branch 'shardAlternateCost' into 'master'
AlternateCost for Mirrodin Shards

See merge request core-developers/forge!5985
2021-12-28 04:14:24 +00:00
Michael Kamensky
9f5b2a986c Merge branch 'y22_uc' into 'master'
Y22: Unexpected Conversion, Grizzled Huntmaster and support

See merge request core-developers/forge!5975
2021-12-28 04:13:38 +00:00
Michael Kamensky
4d4b73430b Merge branch 'y22_hw' into 'master'
Y22: Hollowhenge Wrangler and support

See merge request core-developers/forge!5978
2021-12-28 04:12:56 +00:00
Michael Kamensky
e9ecc785e8 Merge branch 'y22_24' into 'master'
Y22 - last few cards

See merge request core-developers/forge!5986
2021-12-28 04:12:48 +00:00
Michael Kamensky
ae8bd0e4d0 Merge branch 'y22_rav' into 'master'
Y22: Ravenous Pursuit and support

See merge request core-developers/forge!5940
2021-12-28 04:12:39 +00:00
Michael Kamensky
96d5fd55e7 Merge branch 'sands' into 'master'
Fix Reverse the Sands

Closes #2021

See merge request core-developers/forge!5984
2021-12-28 04:11:54 +00:00
Northmoc
e92f581ff4 add roll++ to RollDiceEffect, PlanarDice 2021-12-27 22:33:19 -05:00
Northmoc
81d55782cc add "YouRollThisTurn" to Count calculations 2021-12-27 22:32:22 -05:00
Northmoc
7d7cd50e06 add numRollsThisTurn to Player 2021-12-27 22:31:26 -05:00
Northmoc
a5492788a4 the_space_family_goblinson.txt 2021-12-27 22:24:11 -05:00
Northmoc
0b10306dbe CardFactory: allow for calculations in "SetPower" and "SetToughness" 2021-12-27 17:07:12 -05:00
tool4EvEr
e0766ee449 Fix illegal distributions 2021-12-27 23:07:12 +01:00
Northmoc
97796a4a99 saw_in_half.txt 2021-12-27 17:06:24 -05:00
Northmoc
00150739d5 tenacious_pup.txt 2021-12-27 14:07:25 -05:00
Northmoc
74737991e8 soulstealer_axe.txt 2021-12-27 13:27:10 -05:00
Northmoc
32db44c61a settle_the_wilds.txt 2021-12-27 13:24:59 -05:00
Northmoc
2af4b81464 remove unneeded param 2021-12-27 13:04:45 -05:00
Hans Mackowiak
b57e29ba21 AlternateCost for Mirrodin Shards 2021-12-27 15:10:46 +01:00
tool4EvEr
ef926235ef Fix Reverse the Sands 2021-12-27 12:06:29 +01:00
Hans Mackowiak
69dd82ed20 Merge branch 'cardview' into 'master'
Fix cards in hand being hidden when proceeding to second game

See merge request core-developers/forge!5982
2021-12-27 08:47:49 +00:00
Michael Kamensky
250f3d6441 Merge branch 'replaceCounterRework' into 'master'
ReplaceAddCounter: do adding multiple counters as one replacement

Closes #2043

See merge request core-developers/forge!5981
2021-12-27 04:58:05 +00:00
Hans Mackowiak
312f11606f Mana: use Combo for X or Y mana abilities 2021-12-27 00:30:34 +01:00
tool4EvEr
c35798eac8 Fix cards in hand being hidden when proceeding to second game 2021-12-26 22:36:21 +01:00
Michael Kamensky
9d40201137 Merge branch 'fix' into 'master'
Simulation: fix for Pack Rat tokens (bad diff because of missing CMC)

See merge request core-developers/forge!5980
2021-12-26 15:33:17 +00:00
Hans Mackowiak
f2d77ab77b ReplaceAddCounter: do adding multiple counters as one replacement 2021-12-26 16:11:35 +01:00
tool4EvEr
2e1b799aee Clean up 2021-12-26 12:58:21 +01:00
tool4EvEr
c1d796754a Simulation: fix for Pack Rat tokens (bad diff because of missing CMC) 2021-12-26 12:45:28 +01:00
Michael Kamensky
ee2aef95da Merge branch 'revealedMayLookAt' into 'master'
Player: replace Hand revealed with MayLookAt

See merge request core-developers/forge!5967
2021-12-25 13:27:48 +00:00
Hans Mackowiak
84f3c9f393 Player: replace Hand revealed with MayLookAt 2021-12-25 13:27:46 +00:00
Michael Kamensky
c6a5d74e4c Merge branch 'forcepay' into 'master'
Support mandatory mana payments

Closes #2045

See merge request core-developers/forge!5972
2021-12-25 10:12:39 +00:00
tool4EvEr
643e0c98fc Rename variables 2021-12-25 10:54:38 +01:00
Michael Kamensky
bb38f5112c Merge branch 'CantSetSchemesStatic' into 'master'
Player: Static for CantBecomeMonarch

See merge request core-developers/forge!5968
2021-12-25 05:59:16 +00:00
Hans Mackowiak
ae04642d0d Player: Static for CantBecomeMonarch 2021-12-25 05:59:15 +00:00
tool4EvEr
732f35629b Final clean up 2021-12-24 23:45:56 +01:00
Michael Kamensky
cfcbbffc42 Merge branch 'y22_23' into 'master'
Y22 - 24 Dec

See merge request core-developers/forge!5977
2021-12-24 20:26:22 +00:00
Michael Kamensky
2a2677f19a Merge branch 'typo' into 'master'
fix some typos

See merge request core-developers/forge!5976
2021-12-24 20:26:06 +00:00
Northmoc
926f20f76e AnimateEffectBase update booleans 2021-12-24 14:31:47 -05:00
Northmoc
800aec12c1 get rid of weird picture line prismatic_geoscope.txt 2021-12-24 13:49:03 -05:00
Northmoc
798c269bab grizzled_huntmaster.txt 2021-12-24 12:45:51 -05:00
Northmoc
e17119ed76 MakeCardEffect update "Amount" to allow for X 2021-12-24 12:45:11 -05:00
Northmoc
f1297b446c dream_devourer.txt spacing 2021-12-24 12:08:05 -05:00
Northmoc
1a046da310 SpellAbilityRestriction support "AdditionalActivationZone" 2021-12-24 11:35:03 -05:00
Northmoc
3ca73778e7 hollowhenge_wrangler.txt 2021-12-24 11:34:31 -05:00
Northmoc
5707ce0795 citystalker_connoisseur.txt 2021-12-24 11:05:41 -05:00
Northmoc
559189cf5d veteran_ghoulcaller.txt 2021-12-24 10:46:25 -05:00