Commit Graph

45212 Commits

Author SHA1 Message Date
Michael Kamensky
ecb47ad848 - Fix imports. 2020-08-31 08:06:45 +03:00
Michael Kamensky
627670614a - Internationalization support for Select All. 2020-08-29 15:23:06 +03:00
Michael Kamensky
da7c9ba474 - Add the Select All button to spell shop inventory when the UI allows it (landscape mode, running on desktop), part 2. 2020-08-29 09:06:03 +03:00
Michael Kamensky
9110d11d5c - Add the Select All button to spell shop inventory when the UI allows it (landscape mode, running on desktop). 2020-08-29 09:05:41 +03:00
Michael Kamensky
9e9e7187d1 - Fix quest spell shop crashing due to threading issues when applying advanced filters (patch contributed by Nefigah). 2020-08-29 09:05:05 +03:00
Sol
510e81e39a Update blocks.txt 2020-08-28 11:52:25 +00:00
Michael Kamensky
c24ecfb4f8 Merge branch 'ZNRjace' into 'master'
ZNR :: Jace, Mirror Mage (SetLoyalty param)

See merge request core-developers/forge!3090
2020-08-28 04:29:20 +00:00
Tim Mocny
c981b02f24 ZNR :: Jace, Mirror Mage (SetLoyalty param) 2020-08-28 04:29:20 +00:00
Sol
3e7554c516 Merge branch 'boostercovers' into 'master'
THB/IKO - only 3 booster covers

See merge request core-developers/forge!3092
2020-08-28 01:28:33 +00:00
Sol
322f88832b Merge branch 'patch-12' into 'master'
Update Secret Lair Promos.txt Ugin/Karn

See merge request core-developers/forge!3091
2020-08-28 01:28:22 +00:00
Sol
e038cf21ed Merge branch 'release-827' into 'master'
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!3093
2020-08-28 01:27:50 +00:00
Sol
544ec11a59 Update ANNOUNCEMENTS.txt 2020-08-28 01:19:54 +00:00
Northmoc
4ca9711286 only 3 booster covers 2020-08-27 20:47:40 -04:00
John
6af54d67fb Update Secret Lair Promos.txt Ugin/Karn obtainable in recent secret lairs! 2020-08-27 21:14:05 +00:00
Michael Kamensky
c8204f2f34 Merge branch 'master' into 'master'
update simplified chinese translation

See merge request core-developers/forge!3089
2020-08-27 09:27:57 +00:00
Michael Kamensky
8e5183a57f Merge branch 'master' into 'master'
Assorted AI fixes

See merge request core-developers/forge!3086
2020-08-27 09:27:40 +00:00
Michael Kamensky
b314409ff3 Merge branch 'patch-8' into 'master'
Update worlds.txt

See merge request core-developers/forge!3088
2020-08-27 09:27:20 +00:00
CCTV-1
f349f96387 update simplified chinese translation 2020-08-27 16:51:18 +08:00
Michael Kamensky
5792c0832c Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2020-08-27 11:30:24 +03:00
Paul Hammerton
29bedda120 Update worlds.txt 2020-08-27 07:33:29 +00:00
Michael Kamensky
3bc2cde046 - Fix the AI killing itself with Mystic Forge.
- The AI shouldn't miss the NameCard trigger. However, there's no meaningful AI logic yet, so the AI will just name a random thing for now.
2020-08-27 07:38:49 +03:00
Michael Kamensky
01faa9df26 Merge branch 'ZNRnahiri' into 'master'
ZNR :: Nahiri 'walker and token

See merge request core-developers/forge!3084
2020-08-27 04:21:22 +00:00
Tim Mocny
7dac9a6885 ZNR :: Nahiri 'walker and token 2020-08-27 04:21:21 +00:00
Michael Kamensky
a78abe3bc2 Merge branch 'draft_double_pick' into 'master'
Add double pick for double masters

See merge request core-developers/forge!3085
2020-08-27 04:20:55 +00:00
Michael Kamensky
26d80115d8 Merge branch 'patch-12' into 'master'
Update worlds.txt

See merge request core-developers/forge!3083
2020-08-27 04:19:11 +00:00
friarsol
d3a47ccef7 Add double pick for double masters 2020-08-26 22:52:19 -04:00
Paul Hammerton
7c2a2e9d27 Update worlds.txt 2020-08-26 13:58:06 +00:00
Michael Kamensky
ac10fb6655 Merge branch '1544-first-part-of-unbound-flourishing-not-working' into 'master'
Resolve "First part of Unbound Flourishing not working"

Closes #1544

See merge request core-developers/forge!3079
2020-08-26 05:13:00 +00:00
Michael Kamensky
298b449ddf Merge branch 'athreos' into 'master'
athreos_shroud_veiled.txt exile trigger fix

Closes #1547

See merge request core-developers/forge!3080
2020-08-26 05:11:58 +00:00
Michael Kamensky
1488dedb9f Merge branch 'molten' into 'master'
molten_disaster.txt static fix

Closes #1533

See merge request core-developers/forge!3082
2020-08-26 05:11:41 +00:00
Northmoc
457c2c020f molten_disaster.txt static fix 2020-08-25 14:30:59 -04:00
Hans Mackowiak
ef980babc5 ChangeX: fix Unbound Flourishing 2020-08-25 20:22:17 +02:00
Sol
f2cf4d79a4 Merge branch 'halana' into 'master'
halana_kessig_ranger.txt with ImmediateTrigger

Closes #1548

See merge request core-developers/forge!3081
2020-08-25 18:05:02 +00:00
Northmoc
369edeab4c halana_kessig_ranger.txt 2020-08-25 11:59:43 -04:00
Northmoc
e4e255fbff athreos_shroud_veiled.txt exile trigger fix 2020-08-25 07:58:09 -04:00
Michael Kamensky
4dbd1fdf4b Merge branch 'master' into 'master'
Some more Quest Mode advanced filters specific to InventoryItems

See merge request core-developers/forge!3076
2020-08-25 04:24:32 +00:00
Michael Kamensky
a3e692329a - Some more inventory item filters (buy price, sell price, quest decks). 2020-08-25 07:13:42 +03:00
Michael Kamensky
11f09589e8 - Ampryn Tactician: prefer to always cast in Main1 (AI). 2020-08-25 06:42:58 +03:00
Michael Kamensky
76a2039987 Merge branch 'CMR23' into 'master'
CMR - 23 Aug (a few "easy" cards)

See merge request core-developers/forge!3072
2020-08-25 03:40:09 +00:00
Tim Mocny
e4c8d7c259 CMR - 23 Aug (a few "easy" cards) 2020-08-25 03:40:08 +00:00
Michael Kamensky
17e2a1bf10 Merge branch 'omnath' into 'master'
omnath_locus_of_mana.txt wording/typos

See merge request core-developers/forge!3074
2020-08-25 03:39:12 +00:00
Michael Kamensky
295963d66a Merge branch 'master' into 'master'
Add support for advanced filters for quest spell shop panes.

See merge request core-developers/forge!3073
2020-08-25 03:39:00 +00:00
swordshine
11195c5dc8 Merge branch 'aug24bnr' into 'master'
Historic.txt new ban

See merge request core-developers/forge!3075
2020-08-25 01:17:54 +00:00
Northmoc
bb33487a04 Historic.txt new ban 2020-08-24 20:48:54 -04:00
Northmoc
536f94eff0 omnath_locus_of_mana.txt wording/typos 2020-08-24 20:34:07 -04:00
Michael Kamensky
5482d6b37b - Return null for P/T for sealed products when filtering. 2020-08-24 14:20:09 +03:00
Michael Kamensky
d200a47c5c - Add support for advanced filters for quest spell shop panes (both the shop and the player's inventory). 2020-08-24 13:07:15 +03:00
Michael Kamensky
2dea61015f Merge branch 'patch-10' into 'master'
Update Commander Collection Green

See merge request core-developers/forge!3071
2020-08-24 04:42:31 +00:00
John
8e23f3abb3 Update Commander Collection Green 2020-08-23 09:07:23 +00:00
Michael Kamensky
85e99cffba Merge branch 'patch-10' into 'master'
Commander Collection Green

See merge request core-developers/forge!3070
2020-08-23 07:56:31 +00:00