Commit Graph

36673 Commits

Author SHA1 Message Date
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
Seravy
a24cffa9df Makes the maximal amount of bonus for life total difference optional 2018-02-08 13:12:35 +01: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
689e5eecc4 Add options to control how much extra credits are given for accumulated wins 2018-02-08 12:04:07 +01: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
Agetian
32facbbc74 - Indirect aura attachment: check by aura controller if aura activating player check fails, fixes Sovereign of Lost Alara not being able to attach a Cartouche. 2018-01-31 08:00:26 +03:00
Michael Kamensky
7696b9d69c Merge branch 'assorted-fixes' into 'master'
- AiController: a more robust check for potential targets (e.g. Wicked Akuba)

See merge request core-developers/forge!161
2018-01-31 04:57:08 +00:00
Michael Kamensky
d2e1d5aacb Merge branch 'patch-3' into 'master'
Masters 25

See merge request core-developers/forge!163
2018-01-31 04:18:08 +00:00
Michael Kamensky
e70affe6c3 Merge branch 'upcoming_rix2' into 'master'
Updates to card-based deck generation data and improvements to handling of…

See merge request core-developers/forge!162
2018-01-31 04:17:05 +00:00
Rob Schnautz
d38f9c39e4 Add new file 2018-01-30 23:02:54 +00:00
austinio7116
f7209ef32c Updates to card-based deck generation data and improvements to handling of non-basic land selection in those decks 2018-01-30 22:33:40 +00:00
Agetian
1f10ba936a Merge remote-tracking branch 'origin/assorted-fixes' into assorted-fixes 2018-01-30 23:36:36 +03:00
Agetian
0332975a9a - Reset activations when cloning things with Saheeli Rai (fixes e.g. Saheeli Rai cloning a Saheeli Rai under Liquimetal Coating not able to activate its abilities) 2018-01-30 23:18:07 +03:00
Agetian
369c4f77a0 - AiController: a more robust check for potential targets in order to avoid the AI activating an ability it can't legally target due to restrictions (e.g. Wicked Akuba). 2018-01-30 19:26:14 +03:00
Michael Kamensky
d8a284ebb9 Merge branch 'unstable-basic-lands' into 'master'
- Render Unstable basic lands borderless.

See merge request core-developers/forge!160
2018-01-30 16:22:08 +00:00
Agetian
dca62ce725 - AiController: a more robust check for potential targets in order to avoid the AI activating an ability it can't legally target due to restrictions (e.g. Wicked Akuba). 2018-01-30 19:20:24 +03:00