Michael Kamensky
|
e578742f9b
|
Merge branch 'master' into 'master'
translate new setting(simplified chinese)
See merge request core-developers/forge!3531
|
2020-12-23 08:02:25 +00:00 |
|
Michael Kamensky
|
21bb0b57e7
|
Merge branch 'khm21' into 'master'
KHM - 21 Dec
See merge request core-developers/forge!3524
|
2020-12-23 08:02:22 +00:00 |
|
CCTV-1
|
38309086f3
|
translate new setting
|
2020-12-23 12:46:38 +08:00 |
|
swordshine
|
0a93b358ad
|
Merge branch 'typos' into 'master'
magma_phoenix.txt typo
See merge request core-developers/forge!3530
|
2020-12-23 02:13:09 +00:00 |
|
Tim Mocny
|
eb1be895b9
|
Merge branch 'patch-6' into 'master'
Update de-DE.properties
See merge request core-developers/forge!3527
|
2020-12-22 21:37:20 +00:00 |
|
Northmoc
|
ecc6a65b1d
|
Show card owner if being controlled by a different player
|
2020-12-22 16:17:04 -05:00 |
|
Andreas Bendel
|
d402de260c
|
Update de-DE.properties
translation - lblAutoCacheSize and nlAutoCacheSize
|
2020-12-22 19:47:02 +00:00 |
|
Northmoc
|
dab5922aad
|
magma_phoenix.txt typo
|
2020-12-22 12:32:15 -05:00 |
|
Northmoc
|
b49b075ce0
|
warchanter_skald.txt and token
|
2020-12-22 10:28:13 -05:00 |
|
Northmoc
|
4461eb70b2
|
surtland_elementalist.txt (medusa)
|
2020-12-22 10:28:12 -05:00 |
|
Northmoc
|
dc6532a184
|
pyre_of_heroes.txt +DeckNeeds
|
2020-12-22 10:28:12 -05:00 |
|
Northmoc
|
d5821b9d15
|
pyre_of_heroes.txt (medusa)
|
2020-12-22 10:28:11 -05:00 |
|
Northmoc
|
4e70ccac2b
|
armed_and_armored.txt AI just in case
|
2020-12-22 10:28:11 -05:00 |
|
Northmoc
|
684e3351b1
|
armed_and_armored.txt (medusa)
|
2020-12-22 10:28:10 -05:00 |
|
Northmoc
|
a87d79c189
|
giants_grasp.txt (Ral)
|
2020-12-22 10:28:10 -05:00 |
|
Northmoc
|
8a832cfc68
|
Ral contrib
|
2020-12-22 10:28:09 -05:00 |
|
Northmoc
|
91854d366e
|
canopy_tactician.txt (Ral)
|
2020-12-22 10:28:09 -05:00 |
|
Northmoc
|
31bca9eec3
|
starnheim_aspirant.txt (Marvel)
|
2020-12-22 10:28:08 -05:00 |
|
Michael Kamensky
|
d0609e8b71
|
Merge branch 'khm18' into 'master'
KHM - 18 Dec
See merge request core-developers/forge!3517
|
2020-12-22 06:04:57 +00:00 |
|
Hans Mackowiak
|
f95f0d4832
|
AbilityFactory: fix Fuse with iHasSVars
|
2020-12-21 20:40:20 +01:00 |
|
Northmoc
|
b026a7094d
|
- RemoveDeck:All for now
|
2020-12-21 11:31:12 -05:00 |
|
Northmoc
|
a0a49c2335
|
realmwalker.txt
|
2020-12-21 11:31:11 -05:00 |
|
Northmoc
|
d4d5f81b69
|
sarulf_realm_eater.txt
|
2020-12-21 11:31:11 -05:00 |
|
Northmoc
|
4b3a62f523
|
youthful_valkyrie.txt (Marvel)
|
2020-12-21 11:31:10 -05:00 |
|
Northmoc
|
29113f5066
|
valkyrie_harbinger.txt (Marvel)
|
2020-12-21 11:31:10 -05:00 |
|
Northmoc
|
aa48a545b0
|
cleaving_reaper.txt (Marvel)
|
2020-12-21 11:31:09 -05:00 |
|
Northmoc
|
1e3bc63ae3
|
renegade_reaper.txt (Marvel)
|
2020-12-21 11:31:09 -05:00 |
|
Northmoc
|
000b13780d
|
rampage_of_the_valkyries.txt (Marvel)
|
2020-12-21 11:31:08 -05:00 |
|
Northmoc
|
08c6c24c5f
|
magda_brazen_outlaw.txt (Marvel)
|
2020-12-21 11:31:08 -05:00 |
|
Anthony Calosa
|
7b44b4f680
|
Merge branch 'master' into 'master'
[Android] Option for Auto Cache size
See merge request core-developers/forge!3523
|
2020-12-21 16:03:58 +00:00 |
|
Anthony Calosa
|
c1cdcdcdfb
|
-[Android] Option for Auto Cache size
|
2020-12-22 00:00:17 +08:00 |
|
Hans Mackowiak
|
54c8fd74eb
|
SpellAbility: remove totalManaSpent variable
|
2020-12-20 11:10:41 +01:00 |
|
Hans Mackowiak
|
0d701224bf
|
Player: fix KeywordCollection iterating KeywordInterfaces
|
2020-12-20 10:41:40 +01:00 |
|
Hans Mackowiak
|
9df8679ed4
|
Merge branch '1678-use-hash-set-instead-of-enum-set-for-keyword-sets' into 'master'
Resolve "Use hash set instead of enum set for Keyword sets"
Closes #1678
See merge request core-developers/forge!3521
|
2020-12-20 08:40:16 +00:00 |
|
Hans Mackowiak
|
f670e131f9
|
Resolve "Use hash set instead of enum set for Keyword sets"
|
2020-12-20 08:40:16 +00:00 |
|
Hans Mackowiak
|
3c243556e2
|
Merge branch 'fixes' into 'master'
Fixes
See merge request core-developers/forge!3522
|
2020-12-20 07:04:51 +00:00 |
|
Tim Mocny
|
0d5b1ee324
|
Fixes
|
2020-12-20 07:04:51 +00:00 |
|
Michael Kamensky
|
ba482c2754
|
Merge branch 'modalPermSpells' into 'master'
MDFC: fix SpellPerm for Kaldheim
See merge request core-developers/forge!3520
|
2020-12-20 05:01:09 +00:00 |
|
Hans Mackowiak
|
a321e51583
|
MDFC: fix SpellPerm for Kaldheim
|
2020-12-19 12:35:58 +01:00 |
|
Hans Mackowiak
|
e801ff94e5
|
AnimateAi: fix mandatory needs to use getTargetableCards
|
2020-12-19 08:50:21 +01:00 |
|
Michael Kamensky
|
3e51fffb57
|
Merge branch 'IHasSVars' into 'master'
IHasSVars interface to connect CardTraitBase -> Card -> CardState
See merge request core-developers/forge!3519
|
2020-12-19 04:37:07 +00:00 |
|
Hans Mackowiak
|
cb6f4c1431
|
IHasSVars interface to connect CardTraitBase -> Card -> CardState
|
2020-12-18 21:36:59 +01:00 |
|
swordshine
|
301508d5ec
|
Merge branch 'khm17' into 'master'
KHM - 17 Dec
See merge request core-developers/forge!3515
|
2020-12-18 01:53:18 +00:00 |
|
swordshine
|
98cf7d3aaf
|
Merge branch 'fix' into 'master'
Cleanup Fix: Commune with Lava
See merge request core-developers/forge!3516
|
2020-12-18 01:53:01 +00:00 |
|
Northmoc
|
3a15945a37
|
KHM initial editions
|
2020-12-17 17:27:25 -05:00 |
|
Northmoc
|
2ccd690c2d
|
+ SubAbility$ Cleanup
|
2020-12-17 17:26:51 -05:00 |
|
Michael Kamensky
|
79e38ed5da
|
Merge branch 'khm15' into 'master'
KHM - 15 Dec
See merge request core-developers/forge!3512
|
2020-12-17 05:52:40 +00:00 |
|
Northmoc
|
610c8f8f38
|
MDFC lands
|
2020-12-15 19:40:02 -05:00 |
|
Northmoc
|
9e492c9fe2
|
showdown_of_the_skalds.txt
|
2020-12-15 19:31:46 -05:00 |
|
swordshine
|
573e7decf6
|
Merge branch 'sengir' into 'master'
sengir_the_dark_baron.txt +TriggerZones +AI
See merge request core-developers/forge!3511
|
2020-12-15 04:24:20 +00:00 |
|