Commit Graph

17938 Commits

Author SHA1 Message Date
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
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
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
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
444bc8cfdd Clean up 2021-08-03 19:16:08 +02:00
Northmoc
d54df10ccd davriel_soul_broker.txt limit number of choices for -2 ability 2021-08-03 09:19:58 -04:00
Northmoc
131fd8f7cf lumbering_lightshield.txt 2021-08-02 17:26:47 -04:00
Northmoc
d280317ff8 shoreline_scout.txt 2021-08-02 16:03:06 -04:00
Michael Kamensky
a882f56b7e Merge branch 'j21_30' into 'master'
J21 - 30 July

See merge request core-developers/forge!5147
2021-08-02 19:13:25 +00:00
Northmoc
e79fbad31d fix StackDescs 2021-08-02 15:10:27 -04:00
Northmoc
5bd3062ce2 fix spelling 2021-08-02 15:10:26 -04:00
Northmoc
d3a464304d longtusk_stalker.txt 2021-08-02 15:10:26 -04:00
Northmoc
fa70d55432 add whitespace 2021-08-02 15:10:25 -04:00
Northmoc
873ff52224 kiora_the_tides_fury.txt 2021-08-02 15:10:25 -04:00
Northmoc
87e6af657f J21 edition update 2021-08-02 15:10:24 -04:00
Michael Kamensky
7f4f0a18f6 Merge branch 'chicken' into 'master'
Chicken à la King in editions fix

See merge request core-developers/forge!5165
2021-08-02 13:01:39 +00:00
Bug Hunter
47d103f493 Update forge-gui/res/cardsfolder/v/vanish_into_memory.txt 2021-08-02 11:40:48 +00:00
paul_snoops
bf3379279d Chicken à la King in editions fix 2021-08-02 11:03:50 +01:00
Alumi
2c9b3f648d Support art crop in Card Image Renderer 2021-08-02 08:21:23 +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
Bug Hunter
90ffdcba11 Update forge-gui/res/cardsfolder/h/hazorets_monument.txt 2021-08-02 06:36:38 +00:00
Michael Kamensky
ab869853ac Merge branch 'j21_31' into 'master'
Fixing/adding some goofy Skeletons

See merge request core-developers/forge!5154
2021-08-02 04:00:09 +00:00
Northmoc
8bdf7fe388 fix typo in AI hint 2021-08-01 20:58:27 -04:00
Bug Hunter
416f877100 Update forge-gui/res/cardsfolder/e/exploding_borders.txt 2021-08-01 17:20:01 +00:00
Bug Hunter
6a4c35272b Update forge-gui/res/cardsfolder/p/peregrination.txt 2021-08-01 15:47:58 +00:00
tool4EvEr
75f674cfca Fix target 2021-08-01 09:13:55 +02:00
Michael Kamensky
32a6c7e001 - Added puzzle PS_AFR01. 2021-08-01 08:05:54 +03: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
Northmoc
426acedb76 flameskull.txt add Condition 2021-07-31 22:31:24 -04:00
Northmoc
72eb2b4409 boneyard_aberration.txt 2021-07-31 22:31:07 -04:00
Northmoc
1500729128 bone_rattler.txt add ImmediateTrigger 2021-07-31 22:30:50 -04:00
Hans Mackowiak
c7e6076f8b Trample over PW as Variant of Trample 2021-08-01 01:40:26 +02:00
Michael Kamensky
cb7d8e572c Merge branch 'fix' into 'master'
fix vengeful_ancestor.txt second trigger

See merge request core-developers/forge!5149
2021-07-31 15:04:13 +00:00
Bug Hunter
34c98119b3 Update forge-gui/res/cardsfolder/b/battlefield_scavenger.txt 2021-07-31 07:29:51 +00: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
04174c2cea Merge branch 'twosat-master-patch-00612' into 'master'
Update de-DE.properties

See merge request core-developers/forge!5142
2021-07-31 04:46:47 +00:00
Sol
71070e66cd Update birgi_god_of_storytelling_harnfel_horn_of_bounty.txt 2021-07-31 02:31:31 +00:00
Andreas Bendel
d0d220330b Update de-DE.properties
translated new rendering options
2021-07-30 22:02:18 +00:00
Northmoc
4fecc76394 fix vengeful_ancestor.txt second trigger 2021-07-30 15:39:19 -04: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
Michael Kamensky
90fc581d9c Merge branch 'jhh_29' into 'master'
J21 version of Momir and Momir tweak

See merge request core-developers/forge!5139
2021-07-30 17:01:02 +00:00
Northmoc
5ad8efe535 managorger_phoenix.txt 2021-07-30 11:09:01 -04:00
Northmoc
86ed6c7059 momir_vig_simic_visionary_avatar.txt remove unneeded 2021-07-30 11:08:08 -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