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 |
|
rory
|
815a0f5da9
|
checking for unique mana symbols correctly considers generic mana costs on split cards
|
2020-05-14 11:51:40 -07: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 |
|
rory
|
77c15b1673
|
move CantPayGenericCosts higher up in mana restrictions so that the activated restriction doesn't short circuit for loop
|
2020-05-11 16:46:48 -07: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 |
|
rory
|
51e945df72
|
Merge branch 'master' into jegantha
|
2020-05-10 11:39:14 -07:00 |
|
rory
|
4eb21594b4
|
Jegantha, the Wellspring
|
2020-05-10 11:34:07 -07: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 |
|
Hans Mackowiak
|
bb84b4a4d4
|
SpellAbility: copy PaidHash when copy spell ability
|
2020-05-10 16:53:34 +02:00 |
|
CCTV-1
|
b66eb6266d
|
translate Companion choose dialog,update translations,update chinese characters.
|
2020-05-10 16:40:24 +08:00 |
|
CCTV-1
|
e0b61e7453
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-10 16:36:25 +08:00 |
|
Michael Kamensky
|
7018beab62
|
Merge branch 'patch-6' into 'master'
Update de-DE.properties
See merge request core-developers/forge!2789
|
2020-05-10 05:28:35 +00:00 |
|
swordshine
|
09fba334d4
|
Merge branch 'fixes' into 'master'
Fixes
Closes #1396
See merge request core-developers/forge!2799
|
2020-05-10 03:11:28 +00:00 |
|
Tim Mocny
|
f6d6e45fed
|
Fixes
|
2020-05-10 03:11:28 +00:00 |
|
Michael Kamensky
|
7d15b021aa
|
Merge branch 'yannik' into 'master'
yannik_scavenging_sentinel.txt fixes
See merge request core-developers/forge!2796
|
2020-05-09 16:57:45 +00:00 |
|
Tim Mocny
|
83774d57df
|
yannik_scavenging_sentinel.txt fixes
|
2020-05-09 16:57:45 +00:00 |
|
Michael Kamensky
|
414665166c
|
Merge branch 'historic' into 'master'
Historic updates
See merge request core-developers/forge!2797
|
2020-05-09 04:07:32 +00:00 |
|
Tim Mocny
|
ab6d856880
|
Historic updates
|
2020-05-09 04:07:31 +00:00 |
|