external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,899 Commits 32 Branches 187 Tags
0aea9ce1535abb2e402a8c992094c18de7af9f3c
Commit Graph

36899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Way
572ecef291 Tabs to spaces 2018-03-12 21:06:05 -04:00
swordshine
4968d3efa6 Merge branch 'patch' into 'master' 
Added a few Dominaria cards

See merge request core-developers/forge!283
 2018-03-13 00:55:05 +00:00
swordshine
7d4f334ec7 Merge branch 'fabricate-index-out-of-bounds' into 'master' 
Fabricate: if the only option is to create servo tokens, just do that

See merge request core-developers/forge!285
 2018-03-13 00:53:59 +00:00
swordshine
4a11faf7d1 Merge branch 'ai-energy-check' into 'master' 
Make AI check energy when testing if it can pay for a mana ability

See merge request core-developers/forge!284
 2018-03-13 00:52:19 +00:00
swordshine
88f8840ef5 Merge branch 'deckgenimprovements' into 'master' 
Deckgenimprovements

See merge request core-developers/forge!281
 2018-03-13 00:51:21 +00:00
Luke Way
ce99b1093a -- Statically initialize value lookup map. This avoids problems when running simulations in multiple threads. 
-- Replace Maps.newTreeMap with new HashMap<>().  newTreeMap is not necessary in Java 7+, and there's no need for a tree map here.
 2018-03-12 13:38:46 -04:00
Luke Way
ab39d632fd Convert sysout to game log 2018-03-12 13:10:03 -04:00
Luke Way
7be473f99d Convert sysout to game log 2018-03-12 12:58:29 -04:00
Luke Way
2c5a845d1a Fabricate: if the only option is to create servo tokens, just do that. Avoids IndexOutOfBoundsException. 2018-03-12 12:56:17 -04:00
Luke Way
86e81d3584 Make AI check energy when testing if it can pay for a mana ability 2018-03-12 12:52:47 -04:00
swordshine
2120d4493e - DOM: Added Tiana, Ship's Caretaker 2018-03-12 09:51:14 +08:00
swordshine
57c9c2fe90 - Fixed Firesong and Sunspeaker: the trigger should check the root spellability 
- FIXME: forge.game.card.CardDamageMap.triggerDamageDoneOnce(boolean) should add the source spellability to fix spells with Lifelink
 2018-03-12 09:32:39 +08:00
swordshine
0251d5776e - DOM: Fixed Firesong and Sunspeaker so cycling Renewed Faith wouldn't trigger it 2018-03-12 09:10:18 +08:00
austinio7116
b0d5834396 Improved human/AI deck switching to remember and reload selected deck if still available 2018-03-11 20:22:36 +00:00
swordshine
7b837b4468 - DOM: Added a few cards 2018-03-11 23:23:29 +08:00
swordshine
67064b3275 - DOM: Added Oath of Teferi 2018-03-11 20:16:13 +08:00
swordshine
6f60bb264a - DOM: Added 3 cards 2018-03-11 19:28:34 +08:00
swordshine
b560df49a3 - DOM: Added Firesong and Sunspeaker 2018-03-11 18:23:47 +08:00
swordshine
d8b31ec4bc - DOM: Added a few cards 2018-03-11 17:09:04 +08:00
swordshine
90fc791aac Merge branch 'patch' into 'master' 
Legendary Sorcery

See merge request core-developers/forge!282
 2018-03-11 08:48:26 +00:00
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