Commit Graph

44606 Commits

Author SHA1 Message Date
Anthony Calosa
3cdbf3eb67 Update FControlGameEventHandler
some method don't exist on mobile port and are specifically for desktop so let those routine run for its specific platform
2020-04-21 17:50:25 +08:00
Michael Kamensky
1f7faa773c Merge branch 'gavi' into 'master'
Gavi, Nest Warden

See merge request core-developers/forge!2656
2020-04-20 12:05:33 +00:00
Tim Mocny
f27748eeca Gavi, Nest Warden 2020-04-20 12:05:32 +00:00
Michael Kamensky
789019fff1 Merge branch 'c20.19s' into 'master'
C20 - 19 April (Svaldan)

See merge request core-developers/forge!2727
2020-04-20 07:54:05 +00:00
Tim Mocny
88d768f8b7 C20 - 19 April (Svaldan) 2020-04-20 07:54:04 +00:00
Michael Kamensky
e2f7faa4d7 Merge branch 'drannithfix' into 'master'
Drannith Magistrate - stop command zone casting

See merge request core-developers/forge!2730
2020-04-20 07:49:08 +00:00
Tim Mocny
344792d91c Drannith Magistrate - stop command zone casting 2020-04-20 07:49:08 +00:00
Michael Kamensky
879322d3b0 Merge branch 'c20.19' into 'master'
C20 - 19 April

See merge request core-developers/forge!2728
2020-04-20 07:43:45 +00:00
Tim Mocny
e9a93a0f8d C20 - 19 April 2020-04-20 07:43:45 +00:00
Michael Kamensky
a9482c349e Merge branch 'selective_adaptation' into 'master'
Selective Adaption - Causing lag?

See merge request core-developers/forge!2731
2020-04-20 04:52:44 +00:00
Tim Mocny
2c8bc0b582 Selective Adaption - Causing lag? 2020-04-20 04:52:44 +00:00
Michael Kamensky
62ba27d09f Merge branch 'fireflux_squad' into 'master'
Fireflux Squad (C20)

See merge request core-developers/forge!2723
2020-04-20 04:15:20 +00:00
Tim Mocny
d6efcee188 Fireflux Squad (C20) 2020-04-20 04:15:19 +00:00
Michael Kamensky
4744f11e69 Merge branch 'newBranch' into 'master'
Update KeywordCard, add Flash Icon, try to prevent rotate bug

See merge request core-developers/forge!2715
2020-04-19 16:28:04 +00:00
Michael Kamensky
20549fe0ca Merge branch 'martial_impetus' into 'master'
Martial Impetus and Frontier Warmonger (C20)

See merge request core-developers/forge!2722
2020-04-19 16:07:30 +00:00
Tim Mocny
8c023fbfea Martial Impetus and Frontier Warmonger (C20) 2020-04-19 16:07:29 +00:00
Michael Kamensky
158711f7a9 Merge branch 'c20.17' into 'master'
C20 - 17 April

See merge request core-developers/forge!2721
2020-04-19 16:03:33 +00:00
Tim Mocny
5be2ab9358 C20 - 17 April 2020-04-19 16:03:33 +00:00
Anthony Calosa
99f07c1471 update changes 2020-04-19 21:16:23 +08:00
Michael Kamensky
f7b1a24fdd Merge branch 'c20.18' into 'master'
C20 - 18 April

See merge request core-developers/forge!2724
2020-04-19 05:11:09 +00:00
Tim Mocny
610e0e546a C20 - 18 April 2020-04-19 05:11:09 +00:00
Michael Kamensky
eb02f4acec Merge branch 'cyclingIKO' into 'master'
Cycling: add YouCycledThisTurn, OnlyFirst for Trigger and ValidCause for ReplaceDraw

Closes #1344

See merge request core-developers/forge!2725
2020-04-19 03:24:10 +00:00
Hans Mackowiak
ef95f02fa2 Cycling: add YouCycledThisTurn, OnlyFirst for Trigger and ValidCause for ReplaceDraw 2020-04-19 03:24:10 +00:00
Sol
6b38bc4b7f Merge branch 'update-formats' into 'master'
Update IKO into Format files

See merge request core-developers/forge!2726
2020-04-19 00:39:34 +00:00
friarsol
57e788a69d Update IKO into Format files 2020-04-18 20:29:06 -04:00
Anthony Calosa
e2c28897d1 update additional 2020-04-18 22:13:24 +08:00
Anthony Calosa
34cb7ff9de updated code 2020-04-18 20:57:18 +08:00
Anthony Calosa
07123286aa add reset (on libgdx discord they said before transforming, you need to reset) 2020-04-18 19:39:57 +08:00
Anthony Calosa
017f9f1984 revert previous attempt to fix the rotate bug 2020-04-18 18:11:27 +08:00
Anthony Calosa
06b9143d57 update endtransform 2020-04-18 17:43:13 +08:00
Anthony Calosa
b1e9f4a110 startRotateTransform 2020-04-18 16:14:49 +08:00
Anthony Calosa
d24fa32175 add flash indicator for desktop 2020-04-18 05:57:17 +08:00
Anthony Calosa
1f7dade4f9 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-18 05:56:27 +08:00
Michael Kamensky
58e99ca69b Merge branch 'iko16' into 'master'
IKO edition - Yidaro rarity fix

See merge request core-developers/forge!2720
2020-04-17 15:05:11 +00:00
Tim Mocny
ca43cf8934 IKO edition - Yidaro rarity fix 2020-04-17 15:05:11 +00:00
Michael Kamensky
56d14d25eb Merge branch 'winota' into 'master'
★Winota

See merge request core-developers/forge!2707
2020-04-17 13:08:58 +00:00
Tim Mocny
bf548096f1 ★Winota 2020-04-17 13:08:57 +00:00
Michael Kamensky
e53e9a5bdf Merge branch 'iko14a' into 'master'
Extinction Event

See merge request core-developers/forge!2711
2020-04-17 11:53:34 +00:00
Northmoc
64f1ad9778 extinction_event.txt 2020-04-17 07:43:34 -04:00
Michael Kamensky
c3621cc8e6 Merge branch 'master' into 'master'
Added Ikoria planeswalker achievements by Marek.

See merge request core-developers/forge!2719
2020-04-17 06:32:53 +00:00
Agetian
250f4484ce - Added Ikoria planeswalker achievements by Marek. 2020-04-17 08:11:36 +03:00
Michael Kamensky
4d65ab429d Merge branch 'kathril' into 'master'
Kathril, Aspect Warper

See merge request core-developers/forge!2718
2020-04-17 03:54:54 +00:00
Tim Mocny
2cfb4917b1 Kathril, Aspect Warper 2020-04-17 03:54:54 +00:00
Michael Kamensky
4bcb516abd Merge branch 'ikoc20translation' into 'master'
Add IKO and C20 Card Translations

See merge request core-developers/forge!2717
2020-04-17 03:54:46 +00:00
Anthony Calosa
29c4d6d4d1 limit rotate transform to overlay and child objects 2020-04-17 06:54:14 +08:00
Michael Kamensky
a7b3d18f66 Merge branch 'c20.14' into 'master'
C20 - 14 April

See merge request core-developers/forge!2712
2020-04-16 16:46:01 +00:00
Tim Mocny
32256a398a C20 - 14 April 2020-04-16 16:46:01 +00:00
klaxnek
14e6baf455 Add IKO and C20 Card Translations
Fixed cardnamesTranslations.py to support adding new patched cards.
2020-04-16 18:19:59 +02:00
klaxnek
24e7cc7999 Merge remote-tracking branch 'core-developers/master' 2020-04-16 17:57:58 +02:00
Sol
210a6637bb Merge branch 'iko14b' into 'master'
IKO edition/booster update

See merge request core-developers/forge!2713
2020-04-16 01:13:51 +00:00