Michael Kamensky
5438abe24e
Merge branch 'triggerDamageAllExtend' into 'master'
...
TriggerDamageAll: add triggered objects for Sources and Targets, AbilityUtils supports Sets now
Closes #1620
See merge request core-developers/forge!3307
2020-10-30 03:43:47 +00:00
Hans Mackowiak
ffc4cfebec
TriggerDamageAll: add triggered objects for Sources and Targets, AbilityUtils supports Sets now
2020-10-29 14:32:47 +01:00
swordshine
8aabeb0d75
Merge branch 'profane' into 'master'
...
CMR: Profane Transfusion and support
See merge request core-developers/forge!3302
2020-10-29 11:16:58 +00:00
swordshine
16fac06695
Merge branch 'cmr28' into 'master'
...
CMR :: 28 Oct
See merge request core-developers/forge!3305
2020-10-29 11:14:46 +00:00
swordshine
0f95d631c2
Merge branch 'master' into 'master'
...
CMR: Court of Cunning + support
See merge request core-developers/forge!3306
2020-10-29 11:13:41 +00:00
Hythonia
322e26c7bf
Revert "Add "isNotMonarch" property"
...
This reverts commit ec0c826bf2
2020-10-29 10:51:19 +00:00
Hythonia
79daf02db6
Fix "Count$Monarch"
2020-10-29 10:50:38 +00:00
Hythonia
e01fae1daf
Fix Court of Cunning
2020-10-29 10:42:36 +00:00
Hythonia
fef9ca7690
Add court_of_cunning.txt
2020-10-29 09:08:20 +00:00
Hythonia
89186afff5
Enable "Count$Monarch.X.Y"
2020-10-29 09:02:07 +00:00
Hythonia
ec0c826bf2
Add "isNotMonarch" property
2020-10-29 08:48:27 +00:00
Michael Kamensky
691f6f27dc
Merge branch 'patch-6' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!3304
2020-10-29 06:44:44 +00:00
Michael Kamensky
a7790cf94b
Merge branch 'master' into 'master'
...
translate new setting
See merge request core-developers/forge!3299
2020-10-29 06:44:41 +00:00
Hans Mackowiak
188c623365
CharmEffect: hotfix for getCardForUi
2020-10-29 03:07:32 +01:00
Northmoc
e55238e0af
radiant_serra_archangel.txt
2020-10-28 20:11:53 -04:00
Northmoc
7dfd0adb7e
magus_of_the_order.txt
2020-10-28 20:11:41 -04:00
Northmoc
fd683e73c6
eyeblight_cullers.txt
2020-10-28 20:11:28 -04:00
Andreas Bendel
670d5345d6
Update de-DE.properties
...
Translation of new AltLifeDisplay entries
2020-10-28 21:08:11 +00:00
Sol
2c7068457b
Merge branch 'update-mana-conversion' into 'master'
...
Update cards for Conversion strings
See merge request core-developers/forge!3301
2020-10-28 17:57:08 +00:00
Northmoc
81a1ca8dd4
profane_transfusion.txt add Cleanup
2020-10-28 11:21:21 -04:00
Northmoc
78d7976908
profane_transfusion.txt and support
2020-10-28 11:21:20 -04:00
friarsol
ec10c006dc
Update cards for Conversion strings
2020-10-28 10:06:37 -04:00
CCTV-1
e13759dc7b
translate new setting
2020-10-28 18:06:47 +08:00
Michael Kamensky
4ae50b56b3
Merge branch 'oath-of-nissa-fix' into 'master'
...
Conversion matrices weren't setup properly.
See merge request core-developers/forge!3298
2020-10-28 04:27:19 +00:00
Michael Kamensky
53ed2d98a4
Merge branch 'newBranch' into 'master'
...
[Mobile] Add alternate preference for displaying player life, experience, energy and poison counters
See merge request core-developers/forge!3297
2020-10-28 04:26:54 +00:00
friarsol
34a2f2502a
Conversion matrices weren't setup properly.
2020-10-27 21:29:21 -04:00
Anthony Calosa
fde28d1fea
Add alternate preference for displaying life, experience, energy and poison counters
2020-10-28 06:19:12 +08:00
Sol
a733a157b6
Merge branch 'wishes' into 'master'
...
djinn_of_wishes.txt fix
See merge request core-developers/forge!3295
2020-10-27 16:59:50 +00:00
Michael Kamensky
130a7e0d33
Merge branch 'patch-6' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!3294
2020-10-27 04:09:33 +00:00
Northmoc
183bb7759c
djinn_of_wishes.txt fix
2020-10-26 19:44:55 -04:00
Andreas Bendel
8a292df8c3
Update de-DE.properties
...
lblGauntletProgress
2020-10-26 20:29:48 +00:00
Michael Kamensky
54032c4bdb
Merge branch 'master' into 'master'
...
update translation
See merge request core-developers/forge!3293
2020-10-26 14:07:05 +00:00
CCTV-1
4fa9856244
Merge remote-tracking branch 'upstream/master'
2020-10-26 14:56:46 +08:00
CCTV-1
f61329c4fe
translate "Gauntlet Progress"
2020-10-25 20:20:49 +08:00
Michael Kamensky
156ccc8535
Merge branch 'revealFixes' into 'master'
...
Reveal fixes and NPE
See merge request core-developers/forge!3291
2020-10-24 15:32:37 +00:00
Hans Mackowiak
4cd297b6c8
Rushing River: fix missing Reference
2020-10-24 10:45:23 +02:00
Hans Mackowiak
617ca47c19
AbilityUtils: fix possible NPE when sa is null
2020-10-24 10:42:49 +02:00
Hans Mackowiak
c0bb61b0b0
Reveal: also reveal cards for the AI too
2020-10-24 10:42:03 +02:00
Anthony Calosa
cee0ec6d5b
Merge branch 'newBranch' into 'master'
...
Fix leftsplit manacost display
See merge request core-developers/forge!3290
2020-10-23 22:38:30 +00:00
Anthony Calosa
152c7dd564
Fix leftsplit manacost display
2020-10-24 06:32:25 +08:00
Anthony Calosa
f33382a4fc
Merge branch 'newBranch' into 'master'
...
revert accidental change here, this is device specific
See merge request core-developers/forge!3289
2020-10-23 10:47:20 +00:00
Anthony Calosa
02181593cc
revert accidental change here, this is device specific
2020-10-23 18:46:11 +08:00
Anthony Calosa
df6d8488a9
Merge branch 'newBranch' into 'master'
...
[Mobile] Minor Improvements
See merge request core-developers/forge!3288
2020-10-23 10:10:41 +00:00
Anthony Calosa
2709968e25
Merge remote-tracking branch 'core/master' into newBranch
2020-10-23 18:00:36 +08:00
Anthony Calosa
e80d6d66d0
Update Libgdx Dependency
...
-update to 1.9.11, and use specific nightly build for gdx (pre 1.9.12, fixes for glyph, etc..) for mobile version (newer nightly build than August 13, 2020 changed the android path so unless we adopt scoped storage, we can't upgrade to newer libgdx versions)
2020-10-23 18:00:08 +08:00
Anthony Calosa
e82ae6f507
preload nonAI Decks
2020-10-23 17:54:36 +08:00
Anthony Calosa
04be4ce993
Refactor ReplaceAll
2020-10-23 17:51:57 +08:00
Anthony Calosa
1e3be648ca
Minimum Column Count
2020-10-23 17:50:03 +08:00
Michael Kamensky
0cc174fe99
Merge branch 'themed-chaos-drafts' into 'master'
...
Themed Chaos Drafts
See merge request core-developers/forge!3283
2020-10-23 08:03:37 +00:00
Michael Kamensky
4835e4c1d8
Merge branch 'newBranch' into 'master'
...
[Mobile] Prevent Conceding while on Mulligan
Closes #1376
See merge request core-developers/forge!3287
2020-10-23 07:59:47 +00:00
