external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18: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
tool4EvEr
7838a9dfba Fix crash when empty 2021-08-07 00:22:56 +02:00
tool4EvEr
32b4407b04 Fix mulligan with zero cards 2021-08-05 21:42:04 +02:00
leriomaggio
9f3e78459e Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-08-05 19:25:52 +01:00
tool4EvEr
bb2c967f6e Fix Minimus Containment on equipment 2021-08-05 17:48:51 +02:00
tool4EvEr
6ccb41cfa6 NPE protection 2021-08-05 17:48:27 +02:00
Northmoc
4201fa63db MakeCardEffect - put made card in None zone before moving to destination 2021-08-04 07:48:22 -04:00
leriomaggio
ead4d134ea Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-08-04 08:51:56 +01:00
Hans Mackowiak
f292ad2fb6 Card fix disabled static ability conditions 2021-08-04 07:21:28 +02:00
Michael Kamensky
49b4db24ea Merge branch 'cleanup' into 'master' 
Clean up some triggers

See merge request core-developers/forge!5173
 2021-08-04 05:10:00 +00:00
Michael Kamensky
904524ea6d Merge branch 'changetargets' into 'master' 
ChangeTargets: Fix same choices

See merge request core-developers/forge!5174
 2021-08-04 05:09:35 +00:00
Michael Kamensky
2d16490aab Merge branch 'reveal' into 'master' 
allow "Random" and "RevealValid" in same Reveal

See merge request core-developers/forge!5178
 2021-08-04 05:08:47 +00:00
Northmoc
39e9434901 allow "Random" and "RevealValid" in same Reveal 2021-08-03 23:47:06 -04:00
Northmoc
db4ac4db9d add GameEventRollDie 2021-08-03 21:04:58 -04:00
Northmoc
62ab654497 add die roll event to RollDiceEffect and RollPlanarDiceEffect 2021-08-03 21:04:00 -04:00
tool4EvEr
5b4653754f Fix same choices 2021-08-03 22:27:58 +02:00
tool4EvEr
444bc8cfdd Clean up 2021-08-03 19:16:08 +02:00
Northmoc
8f53b89b25 support "NumRandomChoices" for davriel_soul_broker.txt 2021-08-03 09:18:01 -04:00
Anthony Calosa
b9b71e8535 Update EffectEffect.java 2021-08-03 10:45:25 +00:00
Anthony Calosa
356baae747 Revert EffectEffect add set to Emblem imagekey 2021-08-03 10:39:48 +00:00
leriomaggio
0e5611cfea Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-08-02 07:49:18 +01:00
tool4EvEr
45ca346703 ManaSpent: check source at time it produced 2021-08-01 16:42:30 +02:00
tool4EvEr
c2e4b8fab0 Fully clean Blessing & Monarch 2021-08-01 09:09:35 +02:00
Michael Kamensky
07d71143b6 Merge branch 'tramplePW' into 'master' 
Trample over PW as Variant of Trample

See merge request core-developers/forge!5153
 2021-08-01 04:53:54 +00:00
Bug Hunter
b7b647746e LegendaryRuleAi: Support SacMe 2021-08-01 03:42:51 +00:00
Hans Mackowiak
c7e6076f8b Trample over PW as Variant of Trample 2021-08-01 01:40:26 +02:00
Michael Kamensky
e0165ef99d Merge branch 'effect' into 'master' 
move updateStateForView after moveTo Command Zone

See merge request core-developers/forge!5148
 2021-07-31 15:04:00 +00:00
Northmoc
5c2b16f35e move updateStateForView after moveTo Command Zone 2021-07-31 08:12:39 -04:00
tool4EvEr
d46a529c74 Fix ClassCastException 2021-07-31 09:59:19 +02:00
Michael Kamensky
1601afdfc0 Merge branch 'costs' into 'master' 
Fix CostSacrifice paying from Effect

See merge request core-developers/forge!5138
 2021-07-31 04:47:24 +00:00
Bug Hunter
a9f5ab8772 Fix CostSacrifice paying from Effect 2021-07-31 04:47:23 +00:00
Michael Kamensky
74038eefb5 Merge branch 'fixnpe' into 'master' 
Fix NPE

See merge request core-developers/forge!5141
 2021-07-31 04:47:09 +00:00
tool4EvEr
39bf803a92 Clean up 2021-07-30 21:39:44 +02:00
tool4EvEr
3445c65eb5 Fix NPE 2021-07-30 20:42:38 +02:00
Michael Kamensky
33377abc9f Merge branch 'managorger' into 'master' 
J21: Managorger Phoenix and support

See merge request core-developers/forge!5140
 2021-07-30 17:01:05 +00:00
Northmoc
46efa00f36 add Count$TriggeredManaCostDevotion.<Color> 2021-07-30 11:10:42 -04:00
Michael Kamensky
b17875b5fd Merge branch 'phase' into 'master' 
Fix failing triggers when removed from combat

See merge request core-developers/forge!5106
 2021-07-30 04:24:51 +00:00
Bug Hunter
358c6986e0 Fix failing triggers when removed from combat 2021-07-30 04:24:48 +00:00
Michael Kamensky
e8113dc203 Merge branch 'costs' into 'master' 
Some cost fixes

See merge request core-developers/forge!5135
 2021-07-30 04:24:45 +00:00
tool4EvEr
39c7c18386 Fix Standstill 2021-07-29 22:01:47 +02:00
tool4EvEr
4980bb235c Fix Strive check 2021-07-29 20:59:18 +02:00
leriomaggio
247fbc57f1 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-29 08:00:28 +01:00
Michael Kamensky
43cf318007 Merge branch 'perpetual' into 'master' 
Jumpstart Historic Horizons – some cards with "perpetual" mechanic

See merge request core-developers/forge!5129
 2021-07-29 05:15:15 +00:00
Michael Kamensky
c213dc0ecd Merge branch 'tome' into 'master' 
Jumpstart Historic Horizons – Tome of the Infinite

See merge request core-developers/forge!5130
 2021-07-29 05:14:38 +00:00
Northmoc
0822a4de0d add "RememberMade" to MakeCardEffect 2021-07-28 16:06:59 -04:00
Northmoc
c9dae7c666 support using ChosenName for MakeCardEffect 2021-07-28 16:06:25 -04:00
Northmoc
09795207ff add "ClearNamedCard" to CleanUpEffect 2021-07-28 16:05:17 -04:00
Northmoc
af5d8cd988 ChooseCardNameEffect - support choosing from list, with support for random too 2021-07-28 16:03:55 -04:00
Northmoc
953430255e - I'm dumb 2021-07-28 10:42:51 -04:00
Northmoc
a14b13164f - clean up line that sets "prompt" 2021-07-28 09:54:07 -04:00
Northmoc
bd7ab26f3e Support "ChoicePrompt" for GenericChoice 2021-07-28 09:36:16 -04:00