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 |
|
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 |
|