Commit Graph

47424 Commits

Author SHA1 Message Date
Michael Kamensky
b1dc7f3011 Merge branch 'betrayal' into 'master'
add King Narfi's Betrayal

See merge request core-developers/forge!3761
2021-02-05 15:23:00 +00:00
Hans Mackowiak
5a970d449f Merge branch 'reckless_crew' into 'master'
add Reckless Crew

See merge request core-developers/forge!3762
2021-02-05 14:54:35 +00:00
Hans Mackowiak
093c8647ae add Reckless Crew 2021-02-05 15:53:22 +01:00
Michael Kamensky
ff3bd8e7ed Merge branch 'undefined' into 'master'
KHC 3 cards

See merge request core-developers/forge!3759
2021-02-05 14:51:51 +00:00
John
a571f4747b Update elderfang_venom.txt 2021-02-05 14:47:09 +00:00
John
3a2a5d740b Spectral Deluge 2021-02-05 14:18:57 +00:00
Hans Mackowiak
35946678de add King Narfi's Betrayal 2021-02-05 14:58:29 +01:00
John
479bb7e361 Update sage_of_the_beyond.txt 2021-02-05 13:44:50 +00:00
John
86b34f9f3a Sage of the Beyond 2021-02-05 13:43:40 +00:00
Hans Mackowiak
7478c6121b Foretell cast only by owner 2021-02-05 14:06:26 +01:00
Hans Mackowiak
772d1ea6fd Merge branch 'Williams-master-patch-55492' into 'master'
KHM fixes 5 Feb

See merge request core-developers/forge!3758
2021-02-05 12:55:38 +00:00
John
a57662da3d KHM fixes 5 Feb 2021-02-05 12:55:38 +00:00
John
ecb048be03 Elderfang Venom 2021-02-05 12:35:58 +00:00
Anthony Calosa
055a8d7dbe Merge branch 'master' into 'master'
[Mobile] update button text

See merge request core-developers/forge!3757
2021-02-05 11:17:04 +00:00
Anthony Calosa
67c38316de [Mobile] update button text 2021-02-05 19:15:21 +08:00
Anthony Calosa
7e9824df57 Merge branch 'master' into 'master'
[Mobile] update volume selection

See merge request core-developers/forge!3756
2021-02-05 10:57:40 +00:00
Anthony Calosa
041af9b738 [Mobile] update volume selection 2021-02-05 18:51:45 +08:00
Hans Mackowiak
af00e56242 Merge branch 'mystic_reflection' into 'master'
Mystical Reflection

See merge request core-developers/forge!3754
2021-02-05 10:16:39 +00:00
Anthony Calosa
19cd892a0a Merge branch 'master' into 'master'
[Android] update init message

See merge request core-developers/forge!3755
2021-02-05 07:42:57 +00:00
Anthony Calosa
cff21e9ac7 [Android] update init message 2021-02-05 15:40:56 +08:00
Hans Mackowiak
b54edb269c TokenEffectBase: fill table with none zone 2021-02-05 08:36:07 +01:00
Michael Kamensky
113df1d7cf Merge branch 'master' into 'master'
Added KHM achievements by Marek14.

See merge request core-developers/forge!3753
2021-02-05 04:51:22 +00:00
Michael Kamensky
5814c37fc2 - Added KHM achievements by Marek14. 2021-02-05 07:50:06 +03:00
Michael Kamensky
8288913864 Merge branch 'fixAI' into 'master'
Fix AI casting DealDamage cards with X=0

See merge request core-developers/forge!3752
2021-02-05 04:46:02 +00:00
Michael Kamensky
33a6a46e1a Merge branch 'rimestaff' into 'master'
Jorn God of Winter and Kaldrin the Rimestaff

See merge request core-developers/forge!3744
2021-02-05 04:45:50 +00:00
Hans Mackowiak
592f708c00 Jorn God of Winter and Kaldrin the Rimestaff 2021-02-05 04:45:50 +00:00
Michael Kamensky
e2c824216c Merge branch 'blessingOfFrost' into 'master'
add Blessing of Frost

See merge request core-developers/forge!3741
2021-02-05 04:45:32 +00:00
Hans Mackowiak
ff62e8d3c0 add Blessing of Frost 2021-02-05 04:45:32 +00:00
Michael Kamensky
8f12109a50 Merge branch 'moritte' into 'master'
add Moritte of the Frost

See merge request core-developers/forge!3742
2021-02-05 04:45:19 +00:00
Hans Mackowiak
a567e17217 add Moritte of the Frost 2021-02-05 04:45:18 +00:00
Michael Kamensky
ec6075782e Merge branch 'twosat-master-patch-58043' into 'master'
Update de-DE.properties

See merge request core-developers/forge!3749
2021-02-05 04:44:49 +00:00
Michael Kamensky
b0afb50266 Merge branch 'twosat-master-patch-34521' into 'master'
Update CONTRIBUTORS.txt

See merge request core-developers/forge!3750
2021-02-05 04:44:37 +00:00
tool4EvEr
eb5764f69e Fix AI casting X=0 2021-02-04 22:47:35 +01:00
Anthony Calosa
006fcda2c8 Merge branch 'master' into 'master'
[Desktop] align UI

Closes #1709

See merge request core-developers/forge!3751
2021-02-04 20:51:09 +00:00
Anthony Calosa
fe682d87ef [Desktop] align UI
- zoomed card
- winlose overlay
2021-02-05 04:49:25 +08:00
Andreas Bendel
1be186cc0f Update CONTRIBUTORS.txt
added myself (for doing DE translation)
if you think this is wrong then delete me
2021-02-04 19:39:29 +00:00
Andreas Bendel
4bd2e6ed4f Update de-DE.properties
translated new sound control lines
2021-02-04 19:29:44 +00:00
Michael Kamensky
d719a4322b Merge branch 'undefined' into 'master'
KHM In Search of Greatness

See merge request core-developers/forge!3738
2021-02-04 19:12:30 +00:00
Michael Kamensky
435fd79321 Merge branch 'Williams-master-patch-64374' into 'master'
KHM Fixes 4 Feb

See merge request core-developers/forge!3745
2021-02-04 19:10:15 +00:00
Anthony Calosa
1ee5608856 Merge branch 'master' into 'master'
[Mobile] set volume when track changes

See merge request core-developers/forge!3748
2021-02-04 18:28:23 +00:00
Anthony Calosa
d5e1392ae7 [Mobile] set volume when track changes 2021-02-05 02:26:33 +08:00
Anthony Calosa
646173daa1 Merge branch 'master' into 'master'
remove unnecessary conversion

See merge request core-developers/forge!3747
2021-02-04 18:04:50 +00:00
Anthony Calosa
04fd9709ac remove unnecesary conversion 2021-02-05 02:03:03 +08:00
Anthony Calosa
26265a8741 Merge branch 'master' into 'master'
[Mobile] Sound/Music Adjustment

See merge request core-developers/forge!3746
2021-02-04 17:37:48 +00:00
John
32eac91c27 Update the_bears_of_littjara.txt 2021-02-04 17:37:30 +00:00
John
bd9143495d Update valor_of_the_worthy.txt 2021-02-04 17:34:22 +00:00
John
f9788e1a98 Update draugrs_helm.txt 2021-02-04 17:33:02 +00:00
Anthony Calosa
96a2ccc3a5 [Mobile] Sound/Music Adjustment 2021-02-05 01:32:00 +08:00
Anthony Calosa
3fb0f28dde Merge branch 'master' into 'master'
Update SoundEffect

See merge request core-developers/forge!3743
2021-02-04 17:28:05 +00:00
Anthony Calosa
3f66e67eea Update SoundEffect
-replace wav to mp3
-converted the mp3 files to have smaller size
2021-02-04 22:49:03 +08:00