Commit Graph

44606 Commits

Author SHA1 Message Date
Sol
538430009b Merge branch 'patch' into 'master'
Update Companion cards

See merge request core-developers/forge!2793
2020-05-09 01:06:50 +00:00
Sol
1db29e8846 Merge branch 'newBranch' into 'master'
Hotfix Android Crash on New User Installation

See merge request core-developers/forge!2794
2020-05-09 01:00:10 +00:00
Sol
6ad5e73089 Merge branch 'recentsets' into 'master'
Some recent set support

See merge request core-developers/forge!2795
2020-05-09 00:56:07 +00:00
Tim Mocny
e4c0a3e6b3 Some recent set support 2020-05-09 00:56:07 +00:00
Anthony Calosa
311c8138d6 Hotfix Android Crash on New User Installation 2020-05-09 06:36:45 +08:00
swordshine
447453977d Update scripts 2020-05-08 22:52:10 +08:00
swordshine
085c9f0042 Add Umori, the Collector 2020-05-08 21:58:28 +08:00
swordshine
ed4be69c93 Update Gyruda 2020-05-08 21:56:39 +08:00
swordshine
97bcf8f9c7 Update more Companion cards based on Northmoc's scripts 2020-05-08 19:49:37 +08:00
swordshine
2fd4f9c31f Update Companion restriction for Lurrus and Zirda 2020-05-08 15:08:18 +08:00
Michael Kamensky
d9ee072064 Merge branch 'totemDamageFix' into 'master'
DamageDealEffect: fix removeDamage

See merge request core-developers/forge!2792
2020-05-08 05:53:19 +00:00
Hans Mackowiak
d1199e2698 DamageDealEffect: fix removeDamage 2020-05-08 05:53:19 +00:00
swordshine
d5b1799cba Update some scripts 2020-05-08 13:08:34 +08:00
Michael Kamensky
a1d241dd6e Merge branch 'companion' into 'master'
Companion

See merge request core-developers/forge!2714
2020-05-08 03:43:23 +00:00
Michael Kamensky
82d11283f7 Merge branch 'lethalDamagePTFix' into 'master'
LethalDamage: update Property when PT or counter changes

See merge request core-developers/forge!2791
2020-05-08 03:38:44 +00:00
Hans Mackowiak
35dd052c93 LethalDamage: update Property when PT or counter changes 2020-05-08 03:38:44 +00:00
Michael Kamensky
09d2e1fb30 Merge branch 'castSALastZoneFix' into 'master'
CastSA: fix LastZone use LKI copy when put on stack

See merge request core-developers/forge!2790
2020-05-08 03:38:11 +00:00
Hans Mackowiak
cc10e91431 CastSA: fix LastZone use LKI copy when put on stack 2020-05-08 03:38:11 +00:00
friarsol
8ab0857750 Add Companion keyword 2020-05-07 22:54:15 -04:00
Andreas Bendel
21989c31a5 Update de-DE.properties 2020-05-06 20:57:06 +00:00
Michael Kamensky
f651cd42f4 Merge branch 'master' into 'master'
Preparing Forge for Android publish 1.6.34.001 [incremental].

See merge request core-developers/forge!2788
2020-05-06 10:50:47 +00:00
Agetian
b628b8ca00 - Preparing Forge for Android publish 1.6.34.001 [incremental]. 2020-05-06 13:17:07 +03:00
Blacksmith
3534f1ec05 Clear out release files in preparation for next release 2020-05-05 16:12:14 +00:00
Blacksmith
98d80a1328 [maven-release-plugin] prepare for next development iteration 2020-05-05 16:05:39 +00:00
Blacksmith
2d3a538f6d [maven-release-plugin] prepare release forge-1.6.34 forge-1.6.34 2020-05-05 16:05:31 +00:00
Blacksmith
573902f51e Update README.txt for release 2020-05-05 16:01:55 +00:00
Sol
47fd6734ab Merge branch 'inputManaCacheFix' into 'master'
InputPayMana: fix ManaInput Dialog using getAbilityToPlay

See merge request core-developers/forge!2787
2020-05-05 01:57:31 +00:00
Hans Mackowiak
4047dfe727 InputPayMana: fix ManaInput Dialog using getAbilityToPlay 2020-05-05 01:57:31 +00:00
Michael Kamensky
64085463d8 Merge branch 'damageTrample' into 'master'
DealDamage: add ExcessDamage

See merge request core-developers/forge!2784
2020-05-04 14:04:02 +00:00
Hans Mackowiak
18154ca0b7 DealDamage: add ExcessDamage 2020-05-04 14:04:02 +00:00
swordshine
0fcbc62801 Merge branch 'eachplyrcounters' into 'master'
Placing counters fixes

See merge request core-developers/forge!2785
2020-05-04 02:12:04 +00:00
Tim Mocny
84455ba61d Placing counters fixes 2020-05-04 02:12:04 +00:00
Michael Kamensky
7c27efbd64 Merge branch 'newBranch' into 'master'
Update Portrait Layout (Mobile)

See merge request core-developers/forge!2781
2020-05-03 19:27:46 +00:00
Michael Kamensky
6246b16372 Merge branch 'patch-5' into 'master'
Update cazur_ruthless_stalker.txt

See merge request core-developers/forge!2783
2020-05-03 17:50:58 +00:00
Tim Mocny
f497f75c3d Update cazur_ruthless_stalker.txt 2020-05-03 17:13:34 +00:00
Anthony Calosa
4a957c240a Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-05-03 18:35:46 +08:00
Michael Kamensky
7910a37902 Merge branch 'delayedPutCounterFix' into 'master'
cards: some fixes with delayed trigger and putcounter

See merge request core-developers/forge!2782
2020-05-03 10:13:06 +00:00
Hans Mackowiak
3b6160cd88 cards: some fixes with delayed trigger and putcounter 2020-05-03 12:06:08 +02:00
Anthony Calosa
ae545ed169 Update Portrait Layout
Fixes team button visibility and deck button text readability.
2020-05-03 17:55:16 +08:00
Michael Kamensky
4406c7ba72 Merge branch 'evenOdd' into 'master'
add ChooseEvenOdd

See merge request core-developers/forge!2780
2020-05-03 04:55:13 +00:00
Hans Mackowiak
b964cc6448 add ChooseEvenOdd 2020-05-03 04:55:13 +00:00
Michael Kamensky
ca4687f79a Merge branch 'fix' into 'master'
rielle_the_everwise.txt static fix

See merge request core-developers/forge!2779
2020-05-02 16:37:34 +00:00
Tim Mocny
42daf6b5ee rielle_the_everwise.txt static fix 2020-05-02 16:37:34 +00:00
Michael Kamensky
f696a5488c Merge branch 'iko-release' into 'master'
Iko release

See merge request core-developers/forge!2778
2020-05-01 04:36:29 +00:00
Michael Kamensky
853aad6e65 Merge branch 'huntedNightmareAI' into 'master'
Hunted Nightmare and AI fix

See merge request core-developers/forge!2777
2020-05-01 04:26:03 +00:00
Hans Mackowiak
3fe1aa45a2 Hunted Nightmare and AI fix 2020-05-01 04:26:03 +00:00
friarsol
d8ebc3b5f7 Migrate C2020 2020-04-30 21:36:36 -04:00
friarsol
23f35854ba Migrate upcoming IKO cards 2020-04-30 21:32:07 -04:00
friarsol
5cecbe63b1 Update release files 2020-04-30 21:29:50 -04:00
Michael Kamensky
ae6e290a33 Merge branch 'triggerDiscardedAll' into 'master'
TriggerDiscardAll: new trigger for Rielle, the Everwise

See merge request core-developers/forge!2776
2020-04-30 09:50:55 +00:00