Commit Graph

35834 Commits

Author SHA1 Message Date
Rob Schnautz
9768b80736 Upload New File 2018-02-08 22:47:45 +00:00
Rob Schnautz
93185e7e84 Upload New File 2018-02-08 22:47:34 +00:00
Rob Schnautz
18a717e90a Upload New File 2018-02-08 22:47:24 +00:00
Rob Schnautz
99ce255da8 Upload New File 2018-02-08 22:47:10 +00:00
Rob Schnautz
770e328865 Upload New File 2018-02-08 22:46:59 +00:00
Rob Schnautz
2776eaf640 Upload New File 2018-02-08 22:46:48 +00:00
Rob Schnautz
2d825e4095 Upload New File 2018-02-08 22:46:34 +00:00
Rob Schnautz
64cac6cd5a Upload New File 2018-02-08 22:46:16 +00:00
Rob Schnautz
8d7eccf92e Add new directory 2018-02-08 22:45:50 +00:00
Rob Schnautz
01cd80cc2f Add new directory 2018-02-08 22:45:35 +00:00
Rob Schnautz
801e218912 +amonkhet 2018-02-08 22:44:53 +00:00
Rob Schnautz
c1cb19a139 Add new directory 2018-02-08 22:41:02 +00:00
Hans Mackowiak
419f4a354f Merge branch 'assorted-fixes' into 'master'
- Got rid of an esoteric component for logging, switched over to standard err…

See merge request core-developers/forge!177
2018-02-08 17:48:41 +00:00
Agetian
647e9f6a14 - Got rid of an esoteric component for logging, switched over to standard err printout like it's done in most other places. 2018-02-08 15:28:50 +03:00
Michael Kamensky
58d0921696 Merge branch 'morph' into 'master'
Morph: some rework to use better KeywordInterfaces

See merge request core-developers/forge!172
2018-02-08 12:07:45 +00:00
Michael Kamensky
2b3e39cbb8 Merge branch 'regeneration' into 'master'
Regeneration

See merge request core-developers/forge!168
2018-02-08 12:07:41 +00:00
Seravy
36917c0d18 Fixes compile/run bugs in IntelliJ 2018-02-08 10:25:17 +01:00
Michael Kamensky
4421766850 Merge branch 'descriptions' into 'master'
Descriptions for preconstructed decks, premium foil inserts

See merge request core-developers/forge!169
2018-02-08 04:51:50 +00:00
Michael Kamensky
2d2af55849 Merge branch 'patch-3' into 'master'
Update Masters 25.txt

See merge request core-developers/forge!170
2018-02-08 04:51:02 +00:00
Rob Schnautz
906fef89f9 fix rarity 2018-02-08 01:55:55 +00:00
Rob Schnautz
479a468187 Update Masters 25.txt 2018-02-08 01:54:07 +00:00
Rob Schnautz
813e8deb8f description, premium Boltwing Marauder 2018-02-07 20:04:04 +00:00
Rob Schnautz
4c4259ed90 description, premium Havengul Runebinder 2018-02-07 20:01:36 +00:00
Rob Schnautz
b186958422 premium Captivating Vampire 2018-02-07 19:58:51 +00:00
Rob Schnautz
83b41e1479 description 2018-02-07 19:57:47 +00:00
Rob Schnautz
97477644fd description, premium Phyrexian Swarmlord 2018-02-07 19:54:28 +00:00
Rob Schnautz
f3e4f0d1fb description 2018-02-07 19:51:23 +00:00
Rob Schnautz
4175369f96 description, premium Mordant Dragon 2018-02-07 19:45:02 +00:00
Rob Schnautz
f2fcfe582f description, premium Hero of Goma Fada 2018-02-07 19:42:53 +00:00
Rob Schnautz
b2d546be2f description, premium Carnival Hellsteed 2018-02-07 19:40:20 +00:00
Rob Schnautz
a7db0dd75e description 2018-02-07 19:38:14 +00:00
Rob Schnautz
94127c1b76 description 2018-02-07 19:35:37 +00:00
Rob Schnautz
220690d4d0 description, premium Hoard-Smelter Dragon 2018-02-07 19:31:26 +00:00
Hanmac
fb3ffe679b Morph: some rework to use better KeywordInterfaces 2018-02-07 19:40:12 +01:00
Rob Schnautz
b38f7fe4f5 description 2018-02-07 17:16:41 +00:00
Rob Schnautz
110eb2b072 description, premium Elder of Laurels 2018-02-07 17:03:47 +00:00
Michael Kamensky
d474e6b8bb Merge branch 'assorted-fixes' into 'master'
- Do not allow the human to confirm a Reveal cost with 0 revealed cards (e.g. Morph - Reveal a green card when the player has no green card in hand)

See merge request core-developers/forge!167
2018-02-07 16:56:21 +00:00
Rob Schnautz
5b074f4c1c description, premium Malakir Bloodwitch 2018-02-07 16:53:13 +00:00
Rob Schnautz
8e4ab4d398 description 2018-02-07 16:52:23 +00:00
Rob Schnautz
7eb934d5d3 description 2018-02-07 16:51:50 +00:00
Agetian
c3b655f675 - Do not allow the human to confirm a Reveal cost with 0 revealed cards if the minimum is more than zero (fixes e.g. Morph costs with "Reveal a X card" when the human player doesn't have that kind of card in hand). 2018-02-06 22:17:48 +03:00
Hanmac
068efaeba7 Card: RegenEffect: add the Effect as Shield 2018-02-06 13:50:04 +01:00
Hanmac
ff7a0f1ae6 Regeneration Rework:
- Regenerate or RegenerateAll does create an Effect
in Command which does replace Destroy if possible
- Trigger Regenerated will be added to the Effect
if something does care about "regenerated that way"
- new Regeneration Api is the internal effect
that does handle the actual regeneration
- ReplaceDestroy has Section to handle if Regeneration is possible
- CardShields are removed with the option in PlayerController
2018-02-06 12:56:02 +01:00
Michael Kamensky
8b26deb477 Merge branch 'assorted-fixes' into 'master'
- Fixed the AI trying to e.g. Embalm a Vizier of Many Faces ignoring NeedsToPlay

See merge request core-developers/forge!166
2018-02-05 05:34:10 +00:00
Agetian
21fedd0d50 - Fixed Illusion of Choice. 2018-02-05 08:21:02 +03:00
Agetian
ecd4a5dedd - Fixed the AI trying to e.g. Embalm a Vizier of Many Faces ignoring the NeedsToPlay SVar requirement. 2018-02-04 20:24:51 +03:00
Hanmac
047ee71259 Card: Planeswalker + Creature get extra damage
Signed-off-by: Hanmac <hanmac@gmx.de>
2018-02-02 23:52:11 +01:00
Michael Kamensky
1b97eb777c Merge branch 'mobile-release' into 'master'
- Preparing Forge for Android publish 1.6.6.003 [incremental/bugfixes].

See merge request core-developers/forge!165
2018-01-31 10:54:51 +00:00
Agetian
cd31c4e513 - Preparing Forge for Android publish 1.6.6.003 [incremental/bugfixes]. 2018-01-31 13:54:05 +03:00
Hans Mackowiak
1582f5a7bd Merge branch 'assorted-fixes' into 'master'
- Indirect aura attachment: fix Sovereigns of Lost Alara not attaching Cartouches

See merge request core-developers/forge!164
2018-01-31 06:01:00 +00:00