Commit Graph

51595 Commits

Author SHA1 Message Date
Michael Kamensky
4049a3eea3 Merge branch 'fixnpe' into 'master'
Fix NPE when AI can only attack PW without Ultimates

See merge request core-developers/forge!4877
2021-06-14 04:18:34 +00:00
tool4EvEr
36f3165688 Fix NPE 2021-06-13 23:19:34 +02:00
leriomaggio
b79fc195a1 Updaetd PROMO type from (old) PROMOS 2021-06-13 20:39:42 +01:00
leriomaggio
78bc621f3c Sets filter on mobile now consider the new Edition Type groups 2021-06-13 20:24:19 +01:00
leriomaggio
b8aaf8fb68 New Card Types categories also for custom editions
Card Editions now includes updated Types, following the new remapping.

Moreover, a new option to CardEdition.Reader has been added (in the constructor) in order to account for custom editions.

So far this new "reading mode" accounts for type that is "forced" always to be "THIRDPARTY" so to guarantee consistent sets filtering (so far only on Mobile platform).
This new option is integrated in StaticData when instantiating the collection for CustomEditions.
2021-06-13 20:23:34 +01:00
leriomaggio
cd4ce0d3ab Draft Update Editions' Type and Date w/ Scryfall
All Types and Release Date of Forge editions have been updated
according to Scryfall oracle database.
In more details, Scryfall categories have been remapped
so to have the less impact on previous types, whilst
allowing for a better and consistent editions grouping.

This is still WIP and classes (names and matches) can still be
subject to change.
2021-06-13 18:35:09 +01:00
Michael Kamensky
32891863ad Merge branch 'pumpAI' into 'master'
getPumpedCreature: Fix new ID for copy

Closes #1885

See merge request core-developers/forge!4876
2021-06-13 12:49:47 +00:00
Michael Kamensky
77d88b66e8 Merge branch 'smallfixes' into 'master'
Small fixes sequel

See merge request core-developers/forge!4875
2021-06-13 10:59:19 +00:00
tool4EvEr
ff801fe747 Small fixes 2021-06-13 11:31:00 +02:00
tool4EvEr
73016d1fe0 Fix new ID for copy 2021-06-13 11:23:12 +02:00
Michael Kamensky
733962a935 Merge branch 'fixing' into 'master'
Small fixes

See merge request core-developers/forge!4874
2021-06-13 03:54:56 +00:00
tool4EvEr
3f3a90b360 Clean StackDescriptions 2021-06-12 22:22:18 +02:00
tool4EvEr
ec739b40de Fix Fumarole 2021-06-12 22:16:11 +02:00
tool4EvEr
50d3e8cef4 Clean up 2021-06-12 21:58:45 +02:00
tool4EvEr
fa095007cf Small fixes 2021-06-12 21:29:59 +02:00
Michael Kamensky
db3bde4bbb Merge branch 'master' into 'master'
Prepare Forge for Android publish 1.6.42.001 [incremental].

See merge request core-developers/forge!4873
2021-06-12 13:42:42 +00:00
Michael Kamensky
37bb9279f1 - Prepare Forge for Android publish 1.6.42.001 [incremental]. 2021-06-12 16:41:22 +03:00
Michael Kamensky
4e1c6cb678 [maven-release-plugin] prepare for next development iteration 2021-06-12 16:30:00 +03:00
Michael Kamensky
7e1fd332e0 [maven-release-plugin] prepare release forge-1.6.42 forge-1.6.42 2021-06-12 16:29:51 +03:00
Michael Kamensky
58f369e6e5 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-12 16:25:34 +03:00
Michael Kamensky
368c2f9796 [maven-release-plugin] prepare for next development iteration 2021-06-12 16:13:39 +03:00
Michael Kamensky
d658df35d6 [maven-release-plugin] prepare release forge-1.6.41 forge-1.6.41 2021-06-12 16:13:31 +03:00
Michael Kamensky
4b6edee3e6 Merge branch 'master' into 'master'
Add Planeswalker achievements for MH2 by Marek14

See merge request core-developers/forge!4872
2021-06-12 13:01:44 +00:00
Michael Kamensky
91ae1036de - Add planeswalker achievements for MH2. 2021-06-12 16:00:33 +03:00
Michael Kamensky
c20165df92 Merge branch '1842-panharmonicon-trigger-lingering' into 'master'
Resolve "Panharmonicon trigger lingering"

Closes #1842

See merge request core-developers/forge!4708
2021-06-12 12:57:51 +00:00
Hans Mackowiak
9bdd4b9351 StaticAbilityPanharmonicon: add LastStateBattlefield to Trigger RunParams for stuff that destroys in sequence 2021-06-12 12:57:51 +00:00
Michael Kamensky
c1efe047a3 Merge branch 'announcements-update' into 'master'
Integrations to Announcements.

See merge request core-developers/forge!4870
2021-06-12 12:49:45 +00:00
Michael Kamensky
13e57e25f6 Merge branch 'abilitytext' into 'master'
Fix CantBlockBy ability text not updating

See merge request core-developers/forge!4871
2021-06-12 12:49:19 +00:00
leriomaggio
5345bee294 FIXED typo in Modern Horizons edition name 2021-06-12 12:46:33 +00:00
tool4EvEr
e9b0902fe0 Fix CantBlockBy ability text not updating 2021-06-12 14:44:47 +02:00
leriomaggio
de21053398 Update ANNOUNCEMENTS.txt 2021-06-12 12:43:06 +00:00
leriomaggio
27c993831e Integrations to Announcements. 2021-06-12 13:28:35 +01:00
Sol
3dddca9c1e Merge branch 'paul_snoops-master-patch-02299' into 'master'
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!4869
2021-06-12 12:05:16 +00:00
Snoops
0effbb805a Update ANNOUNCEMENTS.txt 2021-06-12 10:23:16 +00:00
Michael Kamensky
20225a78cb Merge branch 'paul_snoops-master-patch-68635' into 'master'
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!4868
2021-06-12 09:27:48 +00:00
Snoops
c8cedbd0af Update ANNOUNCEMENTS.txt 2021-06-12 09:20:29 +00:00
Michael Kamensky
844098a302 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-12 11:28:43 +03:00
Michael Kamensky
08454489b4 Merge branch 'net_decks' into 'master'
Net decks updates

See merge request core-developers/forge!4861
2021-06-12 08:28:02 +00:00
Michael Kamensky
71110568fc Merge branch 'askai' into 'master'
Add Ask AI button

See merge request core-developers/forge!4867
2021-06-12 04:18:22 +00:00
Michael Kamensky
9990f0ad1a Merge branch 'aiPW' into 'master'
Attack Planeswalker prioritization

See merge request core-developers/forge!4866
2021-06-12 04:17:10 +00:00
Bug Hunter
735a966312 Attack Planeswalker prioritization 2021-06-12 04:17:09 +00:00
tool4EvEr
828d4e17c9 Add Ask AI button 2021-06-11 23:25:57 +02:00
paul_snoops
233c1f6d00 Merge branch 'master' into net_decks 2021-06-11 22:24:22 +01:00
Sol
dbe1683ba9 Merge branch 'zabaz' into 'master'
Zabaz: add Cause to ReplaceAddCounter

See merge request core-developers/forge!4863
2021-06-11 12:29:46 +00:00
Bug Hunter
a5b7f93971 Merge branch 'fixnpe' into 'master'
Fix CostTapType NPE

See merge request core-developers/forge!4865
2021-06-11 10:34:21 +00:00
tool4EvEr
d853ca6615 Fix CostTapType NPE 2021-06-11 12:33:37 +02:00
Michael Kamensky
418d2bf012 Merge branch 'update_card_translations' into 'master'
Update card translations

See merge request core-developers/forge!4862
2021-06-11 10:07:29 +00:00
Lyu Zong-Hong
030f1f4056 Update Japanese translations 2021-06-11 16:56:17 +09:00
Churrufli
45f598e0b9 Oathbreaker Net Decks implementation 2021-06-11 09:07:41 +02:00
Hans Mackowiak
fc82dbb9aa Zabaz: add Cause to ReplaceAddCounter 2021-06-11 08:31:30 +02:00