external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 31 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

5679 Commits

Author SHA1 Message Date
Hythonia
89186afff5 Enable "Count$Monarch.X.Y" 2020-10-29 09:02:07 +00:00
Hythonia
ec0c826bf2 Add "isNotMonarch" property 2020-10-29 08:48:27 +00:00
Hans Mackowiak
188c623365 CharmEffect: hotfix for getCardForUi 2020-10-29 03:07:32 +01:00
Northmoc
78d7976908 profane_transfusion.txt and support 2020-10-28 11:21:20 -04:00
CCTV-1
9d30bf9343 Merge remote-tracking branch 'upstream/master' into display_localization_cardname 2020-10-28 18:11:11 +08:00
Michael Kamensky
4ae50b56b3 Merge branch 'oath-of-nissa-fix' into 'master' 
Conversion matrices weren't setup properly.

See merge request core-developers/forge!3298
 2020-10-28 04:27:19 +00:00
friarsol
34a2f2502a Conversion matrices weren't setup properly. 2020-10-27 21:29:21 -04:00
Northmoc
183bb7759c djinn_of_wishes.txt fix 2020-10-26 19:44:55 -04:00
Hans Mackowiak
617ca47c19 AbilityUtils: fix possible NPE when sa is null 2020-10-24 10:42:49 +02:00
Hans Mackowiak
c0bb61b0b0 Reveal: also reveal cards for the AI too 2020-10-24 10:42:03 +02:00
Anthony Calosa
63e67b0aa5 [Mobile] Prevent Conceding while on Mulligan 
closes issue #1376
 2020-10-22 20:36:59 +08:00
Anthony Calosa
2ef07f7a9c [Mobile] Update Stack Description 
-adds Optional Costs payment to Stack Description text.
 2020-10-22 18:58:28 +08:00
Anthony Calosa
fcb76f341b Reveal cards to human player and add game log when the cards from Command Zone moves to Player's hand. 
closes issue #1550
 2020-10-22 11:26:55 +08:00
Anthony Calosa
4b318bda5a Reveal transformed cards to human player/controller 
closes issue #382
 2020-10-21 12:30:04 +08:00
Michael Kamensky
abc6bb02c0 Merge branch 'newBranch' into 'master' 
[Mobile] Don't stack token creature with different PT

See merge request core-developers/forge!3281
 2020-10-21 04:04:19 +00:00
Anthony Calosa
df64794372 [Mobile] Don't stack token creature with different PT 
- ie Shark Typhoon produces same shark token with different PT
 2020-10-21 06:53:15 +08:00
Hythonia
29841b18a4 Fix CostAdjustment.java #2 2020-10-20 17:01:10 +00:00
Hythonia
2ba11ae009 Fix CostAdjustment.java 2020-10-20 16:59:23 +00:00
Hythonia
0ad0c048b5 RaiseTo param for cost adjustment (Trinisphere) 2020-10-20 14:03:59 +00:00
Anthony Calosa
d3bfef974d [Mobile] Add Delirium Indicator 
-the highlight selector for graveyard tab will change color to Active Phase Color (color according to theme color) if the player has delirium
 2020-10-20 09:43:41 +08:00
Anthony Calosa
e8635fc873 Show suspended card to human player 2020-10-15 15:54:58 +08:00
Anthony Calosa
fbf3c79c15 Fix Split Cards Display 
-Shows correct name & colors on card views, choice list and show correct border colors when an effect like Painter's Servant is in play...
 2020-10-14 21:30:55 +08:00
Anthony Calosa
4bcbbf81d7 Merge remote-tracking branch 'core/master' into newBranch 2020-10-14 16:27:29 +08:00
Anthony Calosa
999e533a63 Update tint 
fix issue ##1608
 2020-10-14 16:25:51 +08:00
Michael Kamensky
499c934f05 Merge branch 'master' into 'master' 
Fix a NPE in AnimateAi and CardFactoryUtil.

Closes #1607

See merge request core-developers/forge!3265
 2020-10-14 04:29:18 +00:00
Michael Kamensky
0ba785bf11 - Fix a NPE in AnimateAi and CardFactoryUtil. 2020-10-14 07:27:41 +03:00
Michael Kamensky
ad5dc98d2b Merge branch 'master' into 'master' 
[Bug] - Allow games that throw exceptions or timer runs out to allow GameOutcomes to return with a NPE being thrown

See merge request core-developers/forge!3264
 2020-10-14 04:21:48 +00:00
Arona Daal
58ed7d572f [Bug] - Allow games that throw exceptions or timer runs out to allow GameOutcomes to return with a NPE being thrown 2020-10-14 04:21:48 +00:00
Northmoc
87f02d051a Forsaken Monument granting C when Moxes tapped for mana! 2020-10-12 19:59:53 -04:00
Northmoc
145669bb38 more "this spell" 2020-10-07 16:04:28 -04:00
Northmoc
3c61d6a9e3 lowercase first letter only, after bFlag only 2020-10-07 16:04:27 -04:00
Northmoc
5a9e7ab57d "this spell" instead of "CARDNAME" 2020-10-07 16:04:27 -04:00
Northmoc
45e3feb575 Support "Return" phrasing in StackDesc 2020-10-07 14:35:59 -04:00
Michael Kamensky
db45511859 Merge branch 'twd' into 'master' 
Walking Dead Secret Lair (adding NICKNAME)

See merge request core-developers/forge!3215
 2020-10-07 04:10:41 +00:00
Northmoc
16c5828b13 rick_steadfast_leader.txt and NICKNAME ReplacementEffect support 2020-10-06 15:36:39 -04:00
Northmoc
24eb24d20d more NICKNAME support 2020-10-06 15:36:39 -04:00
Northmoc
43f1d1a6ac preliminary NICKNAME work 2020-10-06 15:34:16 -04:00
Northmoc
6b1f1536d9 commas in the lists 2020-10-06 15:33:57 -04:00
Tim Mocny
1f29fb7bf3 Lava Burst! Whippoorwill! 2020-10-06 14:59:38 +00:00
Michael Kamensky
bcfd25ce6e Revert "Copy Permanent Spell turns into token" 
This reverts commit 1ce1d43e27
 2020-10-06 07:21:10 +00:00
Northmoc
83e8afb48c ReplacementEffect.java add EFFECTSOURCE replacement to Description strings 2020-10-05 10:05:12 -04:00
Michael Kamensky
fb16232c9f Merge branch '1605-6-broken-tests-as-of-10-04-2020' into 'master' 
Resolve "6 Broken Tests as of 10/04/2020"

Closes #1605

See merge request core-developers/forge!3231
 2020-10-05 06:46:22 +00:00
Hans Mackowiak
1ce1d43e27 Copy Permanent Spell turns into token 2020-10-05 08:12:50 +02:00
Hans Mackowiak
011a5dddeb CardType: add flag to show when its used incomplete in Animate Effects 2020-10-05 08:07:18 +02:00
Anthony Calosa
65f0c4dc30 Fix facedown cards ie manifested cards with back side for viewing 2020-10-05 10:45:35 +08:00
Anthony Calosa
d478e9c5a1 Various GUI fixes 
Fix choice list card image display for Modal, Split, Adventure and special case for Aftermath.
Fix cards exiled facedown with backside show their original state when viewing the hidden card.
 2020-10-05 05:46:29 +08:00
Michael Kamensky
784455c9df Merge branch 'cardTypeMimicFixes' into 'master' 
CardType: sanisfySubtypes each time its changed, moved shareTypeWith functions into CardType

See merge request core-developers/forge!3222
 2020-10-04 04:13:32 +00:00
Sol
8957bc5fc4 Merge branch 'manyChoices' into 'master' 
GUI: make many call getChoices and not order

See merge request core-developers/forge!3217
 2020-10-04 01:25:41 +00:00
Hans Mackowiak
e281f1e5ec CardType: sanisfySubtypes each time its changed, moved shareTypeWith functions into CardType 2020-10-03 10:04:10 +02:00
Hans Mackowiak
5854a2ff36 GUI: make many call getChoices and not order 2020-10-03 08:29:57 +02:00