Michael Kamensky
|
833395fb92
|
Merge branch 'dnaga' into 'master'
desiccated_naga.txt AI update
See merge request core-developers/forge!2859
|
2020-06-08 14:48:06 +00:00 |
|
Michael Kamensky
|
52b5271af5
|
Merge branch 'M21.6' into 'master'
liliana_death_mage.txt
See merge request core-developers/forge!2860
|
2020-06-08 14:47:57 +00:00 |
|
Northmoc
|
b8a7696f40
|
liliana_death_mage.txt
|
2020-06-08 09:34:18 -04:00 |
|
Northmoc
|
3cb80c43bf
|
desiccated_naga.txt AI update
|
2020-06-08 09:25:27 -04:00 |
|
Sol
|
225247d9dc
|
Merge branch 'trackerRevealLKI' into 'master'
PlayerControllerHuman: fix reveal on LKI card list
See merge request core-developers/forge!2848
|
2020-06-07 14:44:16 +00:00 |
|
Hans Mackowiak
|
2db862ce2d
|
PlayerControllerHuman: fix reveal on LKI card list
|
2020-06-07 14:44:16 +00:00 |
|
Andreas Bendel
|
e0a1990014
|
Update de-DE.properties
Typo in translation of lblSelectUpToNumCardFromPlayerZone
|
2020-06-07 09:33:10 +00:00 |
|
Michael Kamensky
|
68a559552d
|
Merge branch 'M21.6' into 'master'
M21 - 6 June
See merge request core-developers/forge!2856
|
2020-06-06 15:26:21 +00:00 |
|
Michael Kamensky
|
2ddcb34a08
|
Merge branch 'chandra' into 'master'
Chandra SSB
See merge request core-developers/forge!2855
|
2020-06-06 15:24:33 +00:00 |
|
Michael Kamensky
|
28f794743c
|
Merge branch 'M21.5' into 'master'
M21 - 5 June
See merge request core-developers/forge!2853
|
2020-06-06 15:24:30 +00:00 |
|
Tim Mocny
|
5b830aeb37
|
M21 - 5 June
|
2020-06-06 15:24:28 +00:00 |
|
Northmoc
|
499f33ed69
|
teferis_protege.txt
|
2020-06-06 11:02:40 -04:00 |
|
Northmoc
|
46ead353d0
|
ss3
|
2020-06-06 10:37:03 -04:00 |
|
Michael Kamensky
|
36c04efbff
|
Merge branch 'trampleFix' into 'master'
PlayerControllerHuman: fix trample assign to defender, fix trample counter
See merge request core-developers/forge!2854
|
2020-06-06 09:50:49 +00:00 |
|
Hans Mackowiak
|
653d214027
|
PlayerControllerHuman: fix trample assign to defender, fix trample counter
|
2020-06-06 09:10:05 +02:00 |
|
Michael Kamensky
|
f60fdf3fa5
|
Merge branch 'M21.4' into 'master'
M21 - 4 June
See merge request core-developers/forge!2851
|
2020-06-06 03:35:43 +00:00 |
|
Tim Mocny
|
b3015128a1
|
M21 - 4 June
|
2020-06-06 03:35:43 +00:00 |
|
Sol
|
2c038396b6
|
Update retribution_of_the_ancients.txt
|
2020-06-05 16:17:28 +00:00 |
|
Michael Kamensky
|
2370c2c8ba
|
Merge branch 'counterTypeNetwork' into 'master'
CounterType: needs to be serializable for Network
See merge request core-developers/forge!2852
|
2020-06-05 05:56:19 +00:00 |
|
Hans Mackowiak
|
d743bd5168
|
CounterType: needs to be serializable for Network
|
2020-06-05 07:42:15 +02:00 |
|
Michael Kamensky
|
4880448102
|
Merge branch 'migrate.upcoming' into 'master'
Migrate remaining IKO/C20 from upcoming
See merge request core-developers/forge!2850
|
2020-06-04 17:49:38 +00:00 |
|
Northmoc
|
b34fd44cfd
|
Migrate remaining IKO/C20 from upcoming
|
2020-06-04 12:08:34 -04:00 |
|
Michael Kamensky
|
4acfd71123
|
Merge branch 'references' into 'master'
References cleanups
Closes #1395
See merge request core-developers/forge!2813
|
2020-06-02 02:50:34 +00:00 |
|
Tim Mocny
|
dd72be2f7a
|
References cleanups
|
2020-06-02 02:50:34 +00:00 |
|
Michael Kamensky
|
b140ca57be
|
Merge branch 'patch-7' into 'master'
Update Secret Lair Drop Series.txt
See merge request core-developers/forge!2845
|
2020-06-02 02:49:53 +00:00 |
|
Michael Kamensky
|
14f2b25c45
|
Merge branch 'patch-8' into 'master'
Update Amalia Sheran Sharm 1.dck
Closes #1440
See merge request core-developers/forge!2846
|
2020-06-02 02:49:47 +00:00 |
|
Michael Kamensky
|
8bfcd1815a
|
Merge branch 'sedgeSliverFix' into 'master'
Card: fix addChangedCardTraits when multiple StaticAbilities has the same timestamp
See merge request core-developers/forge!2849
|
2020-06-02 02:49:04 +00:00 |
|
Sol
|
95a8f5c031
|
Update pyrewild_shaman.txt
|
2020-06-02 02:34:22 +00:00 |
|
Hans Mackowiak
|
1b40987bbd
|
Card: fix addChangedCardTraits when multiple StaticAbilities has the same timestamp
|
2020-06-01 22:04:55 +02:00 |
|
Sol
|
febeaf4eec
|
Merge branch '1Junbnr' into 'master'
1 June bannings
See merge request core-developers/forge!2847
|
2020-06-01 19:40:07 +00:00 |
|
Tim Mocny
|
1079ad8e83
|
1 June bannings
|
2020-06-01 19:40:07 +00:00 |
|
Tim Mocny
|
d67a1e7534
|
Update Amalia Sheran Sharm 1.dck
|
2020-06-01 14:20:10 +00:00 |
|
Tim Mocny
|
46b3c622f0
|
Update Secret Lair Drop Series.txt
|
2020-06-01 14:15:43 +00:00 |
|
Michael Kamensky
|
8714399b51
|
Merge branch '1441-avoid-bad-performance-pattern-involving-interger-parseint' into 'master'
Resolve "Avoid bad performance pattern involving Interger.parseInt"
Closes #1441
See merge request core-developers/forge!2844
|
2020-05-31 14:22:26 +00:00 |
|
Hans Mackowiak
|
19c07f5bef
|
Resolve "Avoid bad performance pattern involving Interger.parseInt"
|
2020-05-31 14:22:25 +00:00 |
|
Michael Kamensky
|
33e7cde2d6
|
Merge branch 'sld' into 'master'
SLD summer drops
Closes #1438
See merge request core-developers/forge!2842
|
2020-05-31 05:25:55 +00:00 |
|
Michael Kamensky
|
12d6790495
|
Merge branch 'cycling' into 'master'
flourishing_fox.txt fix
Closes #1435
See merge request core-developers/forge!2843
|
2020-05-31 05:25:47 +00:00 |
|
Northmoc
|
37f2e75dc4
|
flourishing_fox.txt fix
|
2020-05-30 20:17:13 -04:00 |
|
Northmoc
|
019969d804
|
SLD summer drops
|
2020-05-30 20:08:15 -04:00 |
|
Michael Kamensky
|
8564d30efc
|
Merge branch 'wrappedAbilityCleanup' into 'master'
WrappedAbility & Trigger: some cleanup
Closes #1400
See merge request core-developers/forge!2841
|
2020-05-30 17:19:31 +00:00 |
|
Hans Mackowiak
|
51c15a5a4c
|
WrappedAbility & Trigger: some cleanup
|
2020-05-30 08:29:53 +02:00 |
|
Michael Kamensky
|
3a475f44e4
|
Merge branch 'cultivate' into 'master'
Cultivate and etc round 2
See merge request core-developers/forge!2836
|
2020-05-30 03:50:58 +00:00 |
|
Tim Mocny
|
47f2123286
|
Cultivate and etc round 2
|
2020-05-30 03:50:57 +00:00 |
|
Hans Mackowiak
|
65ef844444
|
Merge branch '1439-cardtype-kills-performance' into 'master'
Resolve "CardType kills performance"
Closes #1439
See merge request core-developers/forge!2840
|
2020-05-29 08:32:19 +00:00 |
|
Hans Mackowiak
|
57b4135f95
|
CardType: use stringTo Maps as Cache again
|
2020-05-29 09:44:59 +02:00 |
|
Michael Kamensky
|
3d32915d9f
|
Merge branch 'guiChoiceFixGameCache' into 'master'
Player Human: fix chooseSingleEntityForEffect
See merge request core-developers/forge!2839
|
2020-05-29 07:19:44 +00:00 |
|
Hans Mackowiak
|
379f9699e8
|
Player Human: fix chooseSingleEntityForEffect
|
2020-05-29 09:12:08 +02:00 |
|
Hans Mackowiak
|
0e831f88b9
|
Merge branch '1434-iko-shredded-sails-incorrect-dmg-to-flying-creature' into 'master'
Resolve "[IKO] Shredded Sails, incorrect dmg to flying creature"
Closes #1434
See merge request core-developers/forge!2838
|
2020-05-28 08:45:59 +00:00 |
|
Hans Mackowiak
|
8e0c1f4fe3
|
Update shredded_sails.txt
|
2020-05-28 07:15:42 +00:00 |
|
Hans Mackowiak
|
d7293c7830
|
Update boot_nipper.txt
|
2020-05-27 19:29:36 +00:00 |
|