rory
|
d311231c96
|
move CantPayGenericCosts higher up in mana restrictions so that the activated restriction doesn't short circuit for loop
|
2020-05-19 21:58:13 -04:00 |
|
rory
|
b2018aafe6
|
Jegantha, the Wellspring
|
2020-05-19 21:58:13 -04:00 |
|
Northmoc
|
7ab4d13507
|
Vintage.txt Lurrus fix
|
2020-05-19 21:58:13 -04:00 |
|
friarsol
|
25fb9857d8
|
Synchronize activator Round 2
|
2020-05-19 21:53:33 -04:00 |
|
Sol
|
fa610b4bfd
|
Merge branch 'revert-c793065c' into 'master'
Revert "Merge branch 'synchronize-activator-restriction' into 'master'"
See merge request core-developers/forge!2823
|
2020-05-19 12:01:48 +00:00 |
|
Sol
|
2af1895e26
|
Revert "Merge branch 'synchronize-activator-restriction' into 'master'"
This reverts merge request !2821
|
2020-05-19 11:45:47 +00:00 |
|
Michael Kamensky
|
b919ccb50c
|
Merge branch 'master' into 'master'
Fix a typo in code.
See merge request core-developers/forge!2822
|
2020-05-19 07:50:26 +00:00 |
|
Agetian
|
87ed2140b4
|
- Fix a typo in code.
|
2020-05-19 10:38:06 +03:00 |
|
Michael Kamensky
|
b9d5326c30
|
Merge branch 'tokenCopyInvestigateRework' into 'master'
Effects: Effects that create Tokens now use common base class
Closes #1379 and #1350
See merge request core-developers/forge!2816
|
2020-05-19 03:46:43 +00:00 |
|
Hans Mackowiak
|
0af1085f79
|
Effects: Effects that create Tokens now use common base class
|
2020-05-19 03:46:43 +00:00 |
|
swordshine
|
c793065cae
|
Merge branch 'synchronize-activator-restriction' into 'master'
Synchronize activator restriction
See merge request core-developers/forge!2821
|
2020-05-19 01:11:22 +00:00 |
|
swordshine
|
248a2447d2
|
Merge branch 'may2020bnr' into 'master'
18 May 2020 bans
See merge request core-developers/forge!2820
|
2020-05-19 01:08:37 +00:00 |
|
Tim Mocny
|
df2932bec5
|
18 May 2020 bans
|
2020-05-19 01:08:37 +00:00 |
|
friarsol
|
b7fb854389
|
Fix Personal Incarnation activator missing owner
|
2020-05-18 20:42:03 -04:00 |
|
Michael Kamensky
|
7c322e1e33
|
Merge branch 'quest-menu-update' into 'master'
Quest menu update
See merge request core-developers/forge!2817
|
2020-05-18 03:29:30 +00:00 |
|
Sol
|
74b3ecd8ce
|
Quest menu update
|
2020-05-18 03:29:30 +00:00 |
|
Michael Kamensky
|
82060740c6
|
Merge branch 'fix-get-best-land' into 'master'
Fix FindBestLand ai
Closes #1415
See merge request core-developers/forge!2818
|
2020-05-18 03:24:22 +00:00 |
|
friarsol
|
45b1b3f38b
|
Convert all Activator Restrictions to a combined key/value
|
2020-05-17 23:16:52 -04:00 |
|
Michael Kamensky
|
f72526fa08
|
Merge branch 'fix-capricopian' into 'master'
Fix Capricopian
Closes #1411
See merge request core-developers/forge!2819
|
2020-05-18 03:13:35 +00:00 |
|
friarsol
|
e96fa0cc96
|
Fix Capricopian
|
2020-05-17 21:40:09 -04:00 |
|
friarsol
|
7966684424
|
Fix FindBestLand ai
|
2020-05-17 21:12:03 -04:00 |
|
Michael Kamensky
|
56b5a6d3c2
|
Merge branch 'master' into 'master'
IKO and C20 initial AI hints.
See merge request core-developers/forge!2815
|
2020-05-17 17:59:06 +00:00 |
|
Agetian
|
0516693eec
|
- IKO and C20 initial AI hints.
|
2020-05-17 20:49:03 +03:00 |
|
Michael Kamensky
|
8c40ba9ef3
|
Merge branch '1407-lazav-dimir-mastermind-causes-npe' into 'master'
Resolve ""Lazav, Dimir Mastermind" causes NPE"
Closes #1407
See merge request core-developers/forge!2814
|
2020-05-16 16:53:31 +00:00 |
|
Hans Mackowiak
|
b12f97daa2
|
TriggerChangesZone: Trigger on leaving the battlefield look back in time using LKI
|
2020-05-15 14:15:34 +02:00 |
|
Michael Kamensky
|
2e319a4c9b
|
Merge branch 'discardLengFix' into 'master'
Fix Discard cost with Library of Leng
See merge request core-developers/forge!2812
|
2020-05-14 08:26:18 +00:00 |
|
Hans Mackowiak
|
7b151bf78a
|
Fix Discard cost with Library of Leng
|
2020-05-14 08:26:18 +00:00 |
|
Michael Kamensky
|
f091c0592e
|
Merge branch 'master' into 'master'
Fix AI cheating with ChooseTypeEffect
Closes #1410
See merge request core-developers/forge!2811
|
2020-05-14 05:31:04 +00:00 |
|
Agetian
|
76ade204bb
|
- Fix AI cheating with ChooseTypeEffect
|
2020-05-14 08:24:03 +03:00 |
|
swordshine
|
046f2a58d9
|
Merge branch 'patch-6' into 'master'
Update de-DE.properties
See merge request core-developers/forge!2810
|
2020-05-14 00:51:04 +00:00 |
|
Andreas Bendel
|
a0e2de0aec
|
Update de-DE.properties
more than 100 new lines tranlated
|
2020-05-13 22:10:41 +00:00 |
|
Michael Kamensky
|
fffb01a81c
|
Merge branch 'companion-ai' into 'master'
Add "AI" for Companion choosing
Closes #1406
See merge request core-developers/forge!2809
|
2020-05-13 05:16:08 +00:00 |
|
friarsol
|
022875f07a
|
Add "AI" for Companion choosing
|
2020-05-12 21:26:41 -04:00 |
|
Michael Kamensky
|
e60daf0536
|
Merge branch 'brawl' into 'master'
Add IKO to Brawl
See merge request core-developers/forge!2808
|
2020-05-12 16:58:48 +00:00 |
|
Tim Mocny
|
b17c4a188c
|
Add IKO to Brawl
|
2020-05-12 16:58:48 +00:00 |
|
Michael Kamensky
|
da32b24fa8
|
Merge branch 'costPaymentMatrixFix' into 'master'
CostPayment: reset CardMatrix after being used
Closes #1408
See merge request core-developers/forge!2807
|
2020-05-12 10:19:29 +00:00 |
|
Hans Mackowiak
|
d25825c595
|
CostPayment: reset CardMatrix after being used
|
2020-05-12 10:19:29 +00:00 |
|
Michael Kamensky
|
15eca3f80a
|
Merge branch 'tokenPermanentFix' into 'master'
Effects and Emblems are not token, cards on the field without card types are sill permanents
See merge request core-developers/forge!2806
|
2020-05-12 06:57:53 +00:00 |
|
Hans Mackowiak
|
3f428ee7d4
|
Effects and Emblems are not token, cards on the field without card types are sill permanents
|
2020-05-12 06:57:53 +00:00 |
|
swordshine
|
df9b462353
|
Merge branch 'patch-6' into 'master'
Update de-DE.properties
See merge request core-developers/forge!2803
|
2020-05-12 06:28:10 +00:00 |
|
Sol
|
c4a1f22584
|
Merge branch 'newBranch' into 'master'
Fix CardArtCache,LoadingCache Dispose Textures
See merge request core-developers/forge!2805
|
2020-05-11 15:23:08 +00:00 |
|
swordshine
|
369a366b4f
|
Merge branch 'master' into 'master'
translate some text
See merge request core-developers/forge!2502
|
2020-05-11 10:57:49 +00:00 |
|
Anthony Calosa
|
bcb626872f
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2020-05-11 11:13:38 +08:00 |
|
Anthony Calosa
|
deb0d7e2f1
|
Fix CardArtCache,LoadingCache Dispose Textures
|
2020-05-11 10:22:13 +08:00 |
|
Sol
|
75ab38836e
|
Update combine_guildmage.txt
|
2020-05-11 01:48:06 +00:00 |
|
Andreas Bendel
|
68cece62c3
|
Update de-DE.properties
Typo fixes
|
2020-05-10 21:34:10 +00:00 |
|
Michael Kamensky
|
6362390e6a
|
Merge branch 'master' into 'master'
Fix NPE in chooseCardName (AI)
Closes #1404
See merge request core-developers/forge!2801
|
2020-05-10 16:30:20 +00:00 |
|
Agetian
|
e7f0b33dd2
|
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
|
2020-05-10 19:03:28 +03:00 |
|
Agetian
|
b0300edc9f
|
- Fix NPE in chooseCardName (AI)
|
2020-05-10 19:03:01 +03:00 |
|
Michael Kamensky
|
d8a5e573da
|
Merge branch 'spellCopyPaidFix' into 'master'
SpellAbility: copy PaidHash when copy spell ability
See merge request core-developers/forge!2800
|
2020-05-10 15:32:08 +00:00 |
|