external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,079 Commits 31 Branches 187 Tags
2cda73ad77ee07c3115cca08901bbedd169985d1
Commit Graph

37079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
maustin
64928efb54 Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements 2018-03-11 07:25:55 +00:00
austinio7116
9ca0d7244e Fixes to ensure deckchooser AI status is set correctly before decks are generated and that the list of card-based decks is updated to show only AI playable cards as required. 2018-03-11 07:25:43 +00:00
maustin
acb412b8f1 Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements 
# Conflicts:
#	forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
#	forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
#	forge-gui/src/main/java/forge/interfaces/IUpdateable.java
 2018-03-11 07:21:00 +00:00
austinio7116
4dd52e6f82 Fixes to ensure deckchooser AI status is set correctly before decks are generated and that the list of card-based decks is updated to show only AI playable cards as required. 2018-03-11 07:20:03 +00:00
swordshine
23fcaaf5d0 - DOM: Added Darigaaz Reincarnated 2018-03-11 13:19:46 +08:00
swordshine
cd9702fd03 - DOM: Added Karn, Scion of Urza, Jhoira's Familiar, Jodah, Archmage Eternal, Mishra's Self-Replicator, and Mox Amber 2018-03-11 11:59:27 +08:00
swordshine
082cfc164d - DOM: Added Primevals' Glorious Rebirth 2018-03-11 10:04:54 +08:00
swordshine
b94181c796 Merge branch 'patch' into 'master' 
ExchangeLife Variant for Evra, Halcyon Witness, Tree of Redemption, and Tree of Perdition

See merge request core-developers/forge!280
 2018-03-11 01:55:52 +00:00
austinio7116
13ad244be1 Fixes to ensure deckchooser AI status is set correctly before decks are generated and that the list of card-based decks is updated to show only AI playable cards as required. 2018-03-10 20:23:34 +00:00
maustin
ec1ad333cd Merge branch 'master' into deckgenimprovements 2018-03-10 20:21:50 +00:00
swordshine
ac75e554a9 - Added Karn's Temporal Sundering 2018-03-10 22:39:41 +08:00
swordshine
c249ed5f9f - DOM: Added "Legendary Sorcery" Urza's Ruinous Blast 2018-03-10 22:29:26 +08:00
swordshine
795c071e64 - DOM: Added Evra, Halcyon Witness 2018-03-10 18:05:40 +08:00
swordshine
fc130ebfb5 - DOM: Added Baird, Steward of Argive, Benalish Marshal, and Charge 2018-03-10 15:46:54 +08:00
swordshine
a0bf4f2da0 Merge branch 'patch' into 'master' 
- DOM: added "Historic"

See merge request core-developers/forge!279
 2018-03-10 07:24:00 +00:00
swordshine
2f57a39fcc - DOM: added "Historic" and Jhoira, Weatherlight Captain 2018-03-10 15:04:31 +08:00
Hans Mackowiak
211d6c793a Merge branch 'assorted-fixes' into 'master' 
- A quick fix for ReplacementEffect hasRun on copied REs.

See merge request core-developers/forge!278
 2018-03-08 22:35:40 +00:00
Agetian
79344ddad2 Merge remote-tracking branch 'origin/assorted-fixes' into assorted-fixes 2018-03-08 22:27:45 +03:00
Agetian
50a551f875 - A quick fix for ReplacementEffect hasRun on copied REs. 2018-03-08 22:21:12 +03:00
Agetian
884715054b - A quick fix for ReplacementEffect hasRun on copied REs. 2018-03-08 22:20:42 +03:00
Sol
9a3bc52ffb Merge branch 'network-play' into 'master' 
Network Play

See merge request core-developers/forge!277
 2018-03-08 02:15:10 +00:00
Jamin W. Collins
7615f333e1 disclose and enforce DEV_MODE state in network play 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-07 17:25:15 -07:00
Jamin W. Collins
d9913ffb1e broadcast message on player leaving, like joins 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-07 17:25:15 -07:00
Sol
534a161dc0 Merge branch 'fixes' into 'master' 
Fixes

See merge request core-developers/forge!276
 2018-03-07 21:46:27 +00:00
Hans Mackowiak
83b1965733 Merge branch 'master' into 'fixes' 2018-03-07 13:59:49 +00:00
Hanmac
d9df1243b6 mark effect as final 2018-03-07 07:04:57 +01:00
Hanmac
b88365e475 SpellAbility fixed some changes 2018-03-07 07:04:00 +01:00
Sol
090d4dc2c5 Merge branch 'assorted-fixes' into 'master' 
Attempting to fix "Copy to Clipboard" not copying e.g. dual partner commanders.

See merge request core-developers/forge!274
 2018-03-07 04:02:00 +00:00
Sol
97e17a7754 Merge branch 'a25draftingfixes' into 'master' 
A25draftingfixes

See merge request core-developers/forge!275
 2018-03-07 03:58:41 +00:00
Sol
a5db48c719 Merge branch 'deckgenimprovements' into 'master' 
Card-based deck generation improvements and refactoring

See merge request core-developers/forge!260
 2018-03-07 03:52:05 +00:00
Hanmac
65d65c9e5f Treasure map: update code using Branch to remove trigger 2018-03-06 22:18:23 +01:00
Hanmac
c5c3591471 TokenEffect: use sa instead of root 2018-03-06 22:11:35 +01:00
Hanmac
a47c3cf004 SetStateEffect: check for StoredTransform svar 2018-03-06 22:11:22 +01:00
Hanmac
f76c60e867 CommanderDeckGenerator: fixed getCommanderDecks 2018-03-06 22:10:20 +01:00
Hanmac
58bba637ca SimulateMatch: fixed simulateSingleMatch 2018-03-06 22:10:11 +01:00
Hanmac
59063bc194 CardTraitBase: use GameObject so it works with SpellAbility too 2018-03-06 22:08:27 +01:00
Hanmac
2e33b3162c AbilityUtils: fixed getSpellAbilities if sa is null 2018-03-06 22:07:53 +01:00
Hanmac
1e7755b877 CloneEffect: setOriginalHost instead of setHostCard 2018-03-06 22:06:44 +01:00
Hanmac
7b8e92ace2 CardFactoryUtil: use AdditionalAbilityList with better check for Fabricate 2018-03-06 22:06:24 +01:00
Hanmac
e25247d0e5 SpellAbility: add IsTargeting property, fixed additional abilities for clone 2018-03-06 22:03:00 +01:00
Hanmac
93dc3338c1 SpellAbility: isValid check for root 2018-03-06 22:01:51 +01:00
austinio7116
fcd392eec1 Added Masters 25 to draft blockdata for drafting and corrected Konming Sleeping Dragon quotes and rarity of Akroma 2018-03-06 19:50:36 +00:00
maustin
81b002ad63 Merge branch 'master' into deckgenimprovements 2018-03-06 19:47:06 +00:00
maustin
70feec2f5a Merge remote-tracking branch 'origin/master' 2018-03-06 19:46:33 +00:00
Agetian
4ddb73e8d2 - When copying deck to clipboard, do not attempt to check the validity of zone sizes to avoid situations when exceptional, but legal deck compositions (such as two partner Commanders) are not allowed / not fully copied. 2018-03-06 22:13:04 +03:00
austinio7116
ca099e077b Ensuring that non-AI cards are excluded from the list of card-based decks that can be selected for an AI player 2018-03-05 12:43:05 +00:00
austinio7116
30048e7a82 Moved repeated AI slot check logic into single boolean 2018-03-05 08:26:06 +00:00
Michael Kamensky
2ee05f46e7 Merge branch 'masters-25' into 'master' 
Masters 25 booster box

See merge request core-developers/forge!272
 2018-03-05 04:07:18 +00:00
Seravy
3ea30a4461 Basic lands from drafts, except foils, do not get added to the player's inventory, to avoid generating an infinite lands through "add basic land". This both removes potential abuse by selling them, and eliminates the annoyance of having these lands wasting space in your inventory. 2018-03-04 23:53:27 +01:00
Seravy
83bae5ad74 Sold basic lands that could have been added through "Add basic land" will not be removed from decks. 2018-03-04 23:36:48 +01:00