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

51868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tool4EvEr
32b4407b04 Fix mulligan with zero cards 2021-08-05 21:42:04 +02:00
Michael Kamensky
1d4f68d95f Merge branch 'fixes' into 'master' 
Fix Minimus Containment

See merge request core-developers/forge!5182
 2021-08-05 15:59:06 +00: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
Michael Kamensky
118e81d046 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!5181
 2021-08-05 11:42:55 +00:00
CCTV-1
a146996c33 translate new settings. 2021-08-05 16:40:12 +08:00
Michael Kamensky
f6977fad35 Merge branch 'j21_4' into 'master' 
J21 - 4 Aug

See merge request core-developers/forge!5179
 2021-08-05 03:44:32 +00:00
Michael Kamensky
9c71c7914b Merge branch 'twosat-master-patch-87442' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5180
 2021-08-05 03:44:21 +00:00
Andreas Bendel
88e3f473d7 Update de-DE.properties 
translated cbpCardArtFormat and nlCardArtFormat
 2021-08-04 20:08:45 +00:00
Northmoc
a44452f3c9 benalish_partisan.txt 2021-08-04 12:20:19 -04:00
Michael Kamensky
54569bffeb Merge branch 'j21_3' into 'master' 
J21 – Most of the rest

See merge request core-developers/forge!5175
 2021-08-04 14:14:51 +00:00
Michael Kamensky
97fa6f1312 Merge branch 'j21_teyo' into 'master' 
J21 - Teyo, Freyalise, and conjure improvements

See merge request core-developers/forge!5169
 2021-08-04 14:14:15 +00:00
Northmoc
4201fa63db MakeCardEffect - put made card in None zone before moving to destination 2021-08-04 07:48:22 -04:00
Northmoc
caf067ec68 freyalise_skyshroud_partisan.txt 2021-08-04 07:38:22 -04:00
Northmoc
606ded6fc2 fix typo 2021-08-04 07:38:21 -04:00
Northmoc
18b3e14f2e teyo_aegis_adept.txt 2021-08-04 07:38:21 -04:00
Northmoc
80a24a1f93 fix desc typo 2021-08-04 07:37:47 -04:00
Northmoc
53653d5cc6 finish common "perpetually boost creature in hand" cycle 2021-08-04 07:37:46 -04:00
Northmoc
e718903957 bounty_of_the_deep.txt 2021-08-04 07:37:46 -04:00
Northmoc
ca27221188 update Editions file 2021-08-04 07:37:45 -04:00
Northmoc
21e9dd3976 add "Perpetually" to Effect names for fun 2021-08-04 07:37:45 -04:00
Northmoc
dcdf064e43 scion_of_shiv.txt 2021-08-04 07:37:44 -04:00
Northmoc
3103e4d575 baffling_defenses.txt 2021-08-04 07:37:44 -04:00
Northmoc
ea3353ee2c ethereal_grasp.txt 2021-08-04 07:37:44 -04:00
Northmoc
4360cc7fd5 add AI hint 2021-08-04 07:37:43 -04:00
Northmoc
babd2deb71 davriels_withering.txt 2021-08-04 07:37:43 -04:00
Northmoc
7c657dadf1 skyshroud_lookout.txt 2021-08-04 07:37:42 -04: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
Michael Kamensky
048995fb47 Merge branch 'fix_the_deck_of_many_things' into 'master' 
Fix lose effect of The Deck of Many Things

See merge request core-developers/forge!5177
 2021-08-04 05:08:38 +00:00
Michael Kamensky
aa46867e31 Merge branch 'dicesfx' into 'master' 
Sound effect for dice rolling!

See merge request core-developers/forge!5176
 2021-08-04 05:08:28 +00:00
Northmoc
39e9434901 allow "Random" and "RevealValid" in same Reveal 2021-08-03 23:47:06 -04:00
Lyu Zong-Hong
ead0d809cd Fix lose effect of The Deck of Many Things 2021-08-04 10:29:06 +09:00
Northmoc
db4ac4db9d add GameEventRollDie 2021-08-03 21:04:58 -04:00
Northmoc
b0c2421419 royalty-free die roll mp3 from SoundBible.com 2021-08-03 21:04:28 -04:00
Northmoc
62ab654497 add die roll event to RollDiceEffect and RollPlanarDiceEffect 2021-08-03 21:04:00 -04:00
Northmoc
5c033655c7 SoundEffectType.java add RollDie filename 2021-08-03 21:03:18 -04:00
tool4EvEr
5b4653754f Fix same choices 2021-08-03 22:27:58 +02:00
tool4EvEr
8339745956 Clean up 2021-08-03 21:19:23 +02:00
tool4EvEr
444bc8cfdd Clean up 2021-08-03 19:16:08 +02:00
Michael Kamensky
9886a16c6e Merge branch 'davriel' into 'master' 
J21 - fix Davriel, Soul Broker -2 ability

See merge request core-developers/forge!5172
 2021-08-03 13:32:37 +00:00
Northmoc
d54df10ccd davriel_soul_broker.txt limit number of choices for -2 ability 2021-08-03 09:19:58 -04:00
Northmoc
8f53b89b25 support "NumRandomChoices" for davriel_soul_broker.txt 2021-08-03 09:18:01 -04:00
Anthony Calosa
c24f3ed288 Merge branch 'kevlahnota-master-patch-12307' into 'master' 
Update EffectEffect.java

See merge request core-developers/forge!5171
 2021-08-03 10:45:43 +00:00
Anthony Calosa
b9b71e8535 Update EffectEffect.java 2021-08-03 10:45:25 +00:00
Anthony Calosa
7421e59454 Merge branch 'kevlahnota-master-patch-13781' into 'master' 
Revert EffectEffect add set to Emblem imagekey

See merge request core-developers/forge!5170
 2021-08-03 10:43:01 +00:00
Anthony Calosa
356baae747 Revert EffectEffect add set to Emblem imagekey 2021-08-03 10:39:48 +00:00
Michael Kamensky
471a9e1513 Merge branch 'j21_2' into 'master' 
Jumpstart Historic Horizons – 2 Aug

See merge request core-developers/forge!5167
 2021-08-03 03:33:13 +00:00