Commit Graph

47330 Commits

Author SHA1 Message Date
Anthony Calosa
0c08facd80 [Mobile] HomeScreen update 2021-02-03 18:50:06 +08:00
Hans Mackowiak
79319aa10d GameAction: can't copy when going to Stack 2021-02-03 06:22:53 +01:00
Michael Kamensky
82e03a9a54 Merge branch 'master' into 'master'
update simplified chinese translation

See merge request core-developers/forge!3707
2021-02-03 05:16:59 +00:00
Michael Kamensky
ff83ca383a Merge branch 'undefined' into 'master'
KHM Quakebringer

See merge request core-developers/forge!3717
2021-02-03 04:58:53 +00:00
Michael Kamensky
c0b6858c03 Merge branch 'khm2' into 'master'
KHM - 2 Feb

See merge request core-developers/forge!3712
2021-02-03 04:53:33 +00:00
Michael Kamensky
803bf1d7ad Merge branch 'Williams-master-patch-04290' into 'master'
Kolvori Thoughness fix

See merge request core-developers/forge!3719
2021-02-03 04:52:42 +00:00
Michael Kamensky
b48e885aa5 Merge branch 'show_sideboard_origin' into 'master'
Show sideboard origin zone when in subgame

See merge request core-developers/forge!3720
2021-02-03 04:52:32 +00:00
Sol
7777036fdf Merge branch 'kaldheim-blocks' into 'master'
Update Kaldheim in a bunch of places

See merge request core-developers/forge!3722
2021-02-03 04:19:24 +00:00
friarsol
4beed4811c Update Kaldheim in a bunch of places 2021-02-02 23:18:48 -05:00
Lyu Zong-Hong
7290ec1778 Show sideboard origin zone when in subgame 2021-02-03 12:02:32 +09:00
CCTV-1
901cce6fa9 translate subgame strings. 2021-02-03 08:32:41 +08:00
CCTV-1
83f29416ef Merge remote-tracking branch 'upstream/master' 2021-02-03 08:26:22 +08:00
Northmoc
6ff7129945 niko_defies_destiny.txt little tweaks 2021-02-02 17:52:14 -05:00
Northmoc
1f09ee342a haunting_voyage.txt 2021-02-02 17:51:33 -05:00
John
10def81829 Update kolvori_god_of_kinship_the_ringhart_crest.txt 2021-02-02 22:33:40 +00:00
Anthony Calosa
03c8db6617 Merge branch 'master' into 'master'
[Mobile] update layout

See merge request core-developers/forge!3718
2021-02-02 22:13:37 +00:00
Anthony Calosa
cf3cd47ad4 [Mobile] update layout 2021-02-03 06:12:12 +08:00
John
dfabd73335 Update quakebringer.txt 2021-02-02 21:31:34 +00:00
John
4ee96bf643 Quakebringer 2021-02-02 21:28:48 +00:00
Northmoc
a5905b9d1e alrund_god_of_the_cosmos_hakka_whispering_raven.txt 2021-02-02 16:10:54 -05:00
Northmoc
a0132b7441 egon_god_of_death_throne_of_death.txt 2021-02-02 16:10:54 -05:00
Northmoc
0621adb786 reflections_of_littjara.txt 2021-02-02 16:10:53 -05:00
Anthony Calosa
a4fdd5631a Merge branch 'master' into 'master'
[Mobile] add Shahrazad support

See merge request core-developers/forge!3715
2021-02-02 19:38:44 +00:00
Anthony Calosa
524ac3ae0c [Mobile] add Shahrazad support 2021-02-03 03:37:44 +08:00
Hans Mackowiak
5b80f48461 ~ fix the_three_seasons 2021-02-02 20:19:46 +01:00
Michael Kamensky
86c6f3012d Merge branch 'undefined' into 'master'
KHM-Contributions 1 Feb

See merge request core-developers/forge!3699
2021-02-02 18:37:10 +00:00
John
a011518b89 Add new file 2021-02-02 18:25:27 +00:00
John
989b0661d7 Update harald_unites_the_elves.txt 2021-02-02 17:32:30 +00:00
John
196ac120b5 Update harald_king_of_skemfar.txt 2021-02-02 17:31:48 +00:00
Michael Kamensky
24eca47d98 Merge branch 'Williams-master-patch-12145' into 'master'
KHM Foretell Scripts

See merge request core-developers/forge!3711
2021-02-02 17:30:18 +00:00
John
8d773e6002 Add new file 2021-02-02 17:11:57 +00:00
Michael Kamensky
2c96bc245e Merge branch 'exchangeControlTrickster' into 'master'
ExchangeControl: add Optional and two Targets also TargetsWithSameCardType

See merge request core-developers/forge!3705
2021-02-02 17:06:19 +00:00
Hans Mackowiak
72f2c8b2cb ExchangeControl: add Optional and two Targets also TargetsWithSameCardType 2021-02-02 17:06:19 +00:00
Michael Kamensky
93fa70348d Merge branch 'twosat-master-patch-68492' into 'master'
Update de-DE.properties

See merge request core-developers/forge!3713
2021-02-02 17:05:58 +00:00
Michael Kamensky
eb6b9a821e Merge branch 'forgetOnCast' into 'master'
ForgetOnMoved: extra logic for cast stuff to not forget when cast is canceled

See merge request core-developers/forge!3714
2021-02-02 17:05:50 +00:00
Hans Mackowiak
350e2cf480 ForgetOnMoved: extra logic for cast stuff to not forget when cast is canceled 2021-02-02 17:05:50 +00:00
John
01333191b5 Update tergrids_shadow.txt 2021-02-02 16:35:42 +00:00
John
afabc1c9a3 Update rise_of_the_dread_marn.txt 2021-02-02 16:35:08 +00:00
John
5ccad6b424 Update return_upon_the_tide.txt 2021-02-02 16:34:40 +00:00
John
64ec8e8866 Update ravenform.txt 2021-02-02 16:33:59 +00:00
John
93f47cf639 Update dwarven_reinforcements.txt 2021-02-02 16:33:26 +00:00
John
fd887fbc1d Update doomskar_oracle.txt 2021-02-02 16:31:58 +00:00
John
74648c8e84 Update alrunds_epiphany.txt 2021-02-02 16:31:22 +00:00
Andreas Bendel
e671305740 Update de-DE.properties
translated subgame strings
2021-02-02 16:27:42 +00:00
Michael Kamensky
acbd82ef7f Merge branch 'replaceAddCounterValidSource' into 'master'
ReplaceAddCounter: add ValidSource and extend ValidObject

See merge request core-developers/forge!3706
2021-02-02 16:18:05 +00:00
Michael Kamensky
b2cf3444e4 Merge branch 'shahrazad' into 'master'
Shahrazad

See merge request core-developers/forge!3709
2021-02-02 16:00:32 +00:00
Alumi
3d8749e5e1 Shahrazad 2021-02-02 16:00:30 +00:00
Michael Kamensky
344a509d28 Merge branch 'foretell' into 'master'
Foretell: add Keyword

See merge request core-developers/forge!3679
2021-02-02 15:59:46 +00:00
Hans Mackowiak
4cbeca4cb3 Foretell: add Keyword 2021-02-02 15:59:46 +00:00
John
105ac4130a Skull raid 2021-02-02 15:40:28 +00:00