external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
maustin
2018-02-26 23:45:17 +00:00
parent 23ed82c0ba 6883ef1e9f
commit d25437c8e0
13 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.7-SNAPSHOT</version>
<version>1.6.8-SNAPSHOT</version>
</parent>
<artifactId>forge-ai</artifactId>

2
forge-core/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.7-SNAPSHOT</version>
<version>1.6.8-SNAPSHOT</version>
</parent>
<artifactId>forge-core</artifactId>

2
forge-game/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.7-SNAPSHOT</version>
<version>1.6.8-SNAPSHOT</version>
</parent>
<artifactId>forge-game</artifactId>

1
forge-game/src/main/java/forge/game/card/CardState.java
View File

@@ -172,6 +172,7 @@ public class CardState extends GameObject {
for (KeywordInterface k : intrinsicKeyword0) {
intrinsicKeywords.insert(k.copy(card, lki));
}
card.updateKeywordsCache(this);
}
public final KeywordInterface addIntrinsicKeyword(final String s, boolean initTraits) {

2
forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
View File

@@ -174,6 +174,8 @@ public abstract class ReplacementEffect extends TriggerReplacementBase {
if (!lki) {
res.setId(nextId());
}
res.setHostCard(host);
res.setActiveZone(validHostZones);
res.setLayer(getLayer());

2
forge-gui-android/pom.xml
View File

@@ -19,7 +19,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.7-SNAPSHOT</version>
<version>1.6.8-SNAPSHOT</version>
</parent>
<artifactId>forge-gui-android</artifactId>

2
forge-gui-desktop/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.7-SNAPSHOT</version>
<version>1.6.8-SNAPSHOT</version>
</parent>
<artifactId>forge-gui-desktop</artifactId>

2
forge-gui-ios/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.7-SNAPSHOT</version>
<version>1.6.8-SNAPSHOT</version>
</parent>
<artifactId>forge-gui-ios</artifactId>

2
forge-gui-mobile-dev/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.7-SNAPSHOT</version>
<version>1.6.8-SNAPSHOT</version>
</parent>
<artifactId>forge-gui-mobile-dev</artifactId>

2
forge-gui-mobile/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.7-SNAPSHOT</version>
<version>1.6.8-SNAPSHOT</version>
</parent>
<artifactId>forge-gui-mobile</artifactId>

2
forge-gui/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.6.7-SNAPSHOT</version>
<version>1.6.8-SNAPSHOT</version>
</parent>
<artifactId>forge-gui</artifactId>

25
forge-gui/release-files/CHANGES.txt
View File

@@ -1,27 +1,2 @@
- New Quest World: Amonkhet -
A new quest world submitted by Schnautzr is available, based on the Amonkhet block. It's a small quest world featuring a variety of decks and challenges with cards from Amonkhet and Hour of Devastation.
- New Quest World: Invasion -
A new quest world submitted by Seravy is available, based on the Invasion block.
- Quest Mode: Foil cards in decks -
In Quest mode, planeswalkers provided in planeswalker decks will now be foil, as they are in their paper counterparts. Also, in certain other decks, certain cards are foiled if they are foiled in the original official paper release.
- Boxed Set Support -
Support for several boxed sets has been added, namely, Anthologies (ATH), Battle Royale (BRB), Beatdown (BTD), Deckmasters: Garfield vs. Finkel (DKM), and Duels of the Planeswalkers special decks set (DPA).
- MTGO Sets -
Five new sets are available which are indexed by Scryfall and which are MTGO exclusive are now supported in Forge: Commander Theme Decks (TD0), Magic Online Deck Series (TD1), Duel Decks: Mirrodin Pure vs. New Phyrexia (TD2), Legendary Cube (PZ1), and Treasure Chests (PZ2)
- Option to foil cards in deck editor (Desktop Forge) -
A new set of context menu commands has been added to the deck editor which allows to foil the cards in deck ("Foil card", "Foil 4 copies of card", "Foil X copies of card"). This option is currently only available in desktop Forge.
- Online Multiplayer -
Online Multiplayer is once again (mostly) functional. We've successfully played mutliple games between both local network and remote (over the Internet) opponents. However, that is not to say that it's completely bug free. For a list of known issues and guidance on setting it up, please see: https://git.cardforge.org/core-developers/forge/wikis/Network-based-Multiplayer.
- Download Pictures -
Improvements to Download Pictures and Auto fetcher
- Bug fixes -
As always, this release of Forge features an assortment of bug fixes and improvements based on user feedback during the previous release run.

2
pom.xml
View File

@@ -5,7 +5,7 @@
<artifactId>forge</artifactId>
<packaging>pom</packaging>
<name>Forge Parent</name>
<version>1.6.7-SNAPSHOT</version>
<version>1.6.8-SNAPSHOT</version>
<description>
Forge lets you play the card game Magic: The Gathering against a computer opponent