Commit Graph

51595 Commits

Author SHA1 Message Date
Lyu Zong-Hong
dfecf5d40a Use VAssignGenericAmount dialog to assign DividedAsYouChoose values 2021-06-18 11:21:23 +09:00
Andreas Bendel
db3919ab90 Update de-DE.properties
translated lblAssignCombatDamageAsChoose and lblAssignCombatDamageToCreature
2021-06-17 19:11:54 +00:00
Michael Kamensky
5193447625 Merge branch 'sld_update' into 'master'
SLD update

See merge request core-developers/forge!4895
2021-06-17 18:56:21 +00:00
paul_snoops
42c5b890a7 SLD update 2021-06-17 19:24:00 +01:00
Michael Kamensky
31192889d1 Merge branch 'fixes' into 'master'
Minor card fixes

See merge request core-developers/forge!4894
2021-06-17 17:50:21 +00:00
tool4EvEr
b5e55a3a47 Minor card fixes 2021-06-17 17:05:16 +02:00
Michael Kamensky
5e39a2979b Merge branch 'update_damage_replacement_cards' into 'master'
Update some damage replacement related cards

See merge request core-developers/forge!4893
2021-06-17 09:48:53 +00:00
Michael Kamensky
be3c26676e Merge branch 'update_illusionary_terrain' into 'master'
Update Illusionary Terrain and Vision Charm

See merge request core-developers/forge!4892
2021-06-17 09:48:30 +00:00
Alumi
20dc234ec1 Update Illusionary Terrain and Vision Charm 2021-06-17 09:48:30 +00:00
Lyu Zong-Hong
cd29194824 Update some damage replacement related cards 2021-06-17 15:44:12 +09:00
Michael Kamensky
777514dc7d Merge branch 'fixes' into 'master'
Small Card fixes

See merge request core-developers/forge!4891
2021-06-17 02:58:47 +00:00
tool4EvEr
28ee56baea Small Card fixes 2021-06-16 20:02:56 +02:00
Michael Kamensky
cc362cec5c Merge branch 'fix_trigger_damage_map' into 'master'
Fix crash when triggered ability is using damage map

See merge request core-developers/forge!4889
2021-06-16 15:04:26 +00:00
Michael Kamensky
b698b49256 Merge branch 'triggers' into 'master'
AddToCombat: add missing block trigger

See merge request core-developers/forge!4887
2021-06-16 15:04:14 +00:00
Michael Kamensky
0b74be743a Merge branch 'fixes' into 'master'
Minor fixes

See merge request core-developers/forge!4890
2021-06-16 15:04:03 +00:00
Michael Kamensky
d844df988f Merge branch 'misc_card_panel' into 'master'
[Desktop] Add MiscCardPanel to render player avatar when assigning trample damage or divide shields

See merge request core-developers/forge!4888
2021-06-16 15:03:38 +00:00
tool4EvEr
410ceb2bfc Fix facedown reveal 2021-06-16 16:32:43 +02:00
tool4EvEr
da1dbfc9cf Add AI hint 2021-06-16 16:19:34 +02:00
Lyu Zong-Hong
06fa495b0c Fix crash when triggered ability is using damage map by redirect them to the underlying sa 2021-06-16 20:48:50 +09:00
Lyu Zong-Hong
21d5aeca09 Add MiscCardPanel to render player avatar when assigning trample damage or divide shields 2021-06-16 18:14:10 +09:00
leriomaggio
b1134ef070 Updated menu for card filters on mobile with latest Edition Types 2021-06-16 07:26:05 +01:00
leriomaggio
e8b6e066e3 Updated types in CardEdition enum 2021-06-16 07:25:38 +01:00
Michael Kamensky
c7d7f5c622 Merge branch 'paycheat' into 'master'
Fix casting SA while refusing to pay CostSacrifice

See merge request core-developers/forge!4881
2021-06-16 03:15:52 +00:00
Sol
50221ef138 Update Modern.txt 2021-06-16 01:38:54 +00:00
tool4EvEr
d59d5b3b46 AddToCombat: add missing block triggers 2021-06-15 21:26:13 +02:00
Michael Kamensky
6fadafa19a Merge branch 'net_decks' into 'master'
Small net decks update

See merge request core-developers/forge!4886
2021-06-15 17:45:19 +00:00
Michael Kamensky
400eb62c76 Merge branch 'fixes' into 'master'
Small fixes

Closes #1891 and #1890

See merge request core-developers/forge!4885
2021-06-15 17:45:13 +00:00
paul_snoops
68d78acc00 Small net decks update 2021-06-15 17:29:29 +01:00
tool4EvEr
b3fe2a55db Improve AI 2021-06-15 18:15:16 +02:00
tool4EvEr
9697d697bd Multiplayer improvements 2021-06-15 18:09:12 +02:00
tool4EvEr
b1b06dd0f4 Fix Reflect 2021-06-15 17:41:02 +02:00
tool4EvEr
9dada96de3 Clean up 2021-06-15 17:25:00 +02:00
tool4EvEr
93d80b3ee5 Basic SkipPhase AI 2021-06-15 17:01:59 +02:00
tool4EvEr
f584c581d8 Improve AI hint 2021-06-15 16:46:22 +02:00
tool4EvEr
001106ea7b Small fixes 2021-06-15 16:36:33 +02:00
leriomaggio
6f14d1d37a Remapping as per Alumi suggestions in Discord chat
In short, these are the new changes:
- new Boxed set category separated from Reprint
- Reprint now only includes masters editions
- Commander now only includes commander sets
- Multiplayer sets (new) now includes Game Night and Archenemy and
  Planechase
- Game Night mapped to multiplayer
- Myster Boost mapped to Draft innovation
2021-06-15 08:47:25 +01:00
Michael Kamensky
43c39ec231 Merge branch 'update_quest_worlds' into 'master'
Revert worlds.txt back to use only sets intended by the author

See merge request core-developers/forge!4884
2021-06-15 05:24:01 +00:00
Lyu Zong-Hong
9da49cfce1 Revert worlds.txt back to use only sets intended by the author 2021-06-15 14:05:50 +09:00
Michael Kamensky
a3e302eee1 Merge branch 'stuff' into 'master'
Cleanup some cards

See merge request core-developers/forge!4879
2021-06-15 03:30:36 +00:00
Michael Kamensky
5c8fbd3c7e Merge branch 'fix' into 'master'
couple little MH2 fixes

See merge request core-developers/forge!4880
2021-06-15 03:29:59 +00:00
Michael Kamensky
414aa96463 Merge branch 'afr_14' into 'master'
AFR - 14 June

See merge request core-developers/forge!4882
2021-06-15 03:29:49 +00:00
Michael Kamensky
4a25ad9c6a Merge branch 'taxi' into 'master'
Fix Dermotaxi

See merge request core-developers/forge!4883
2021-06-15 03:28:26 +00:00
tool4EvEr
56eda948d6 Fix Dermotaxi 2021-06-15 02:32:13 +02:00
Northmoc
4df7433dfa tashas_hideous_laughter.txt 2021-06-14 18:32:56 -05:00
Northmoc
9cb95f8f35 flumph.txt 2021-06-14 18:32:56 -05:00
tool4EvEr
1c0c0ad38d Fix casting SA while refusing to pay CostSacrifice 2021-06-15 01:28:46 +02:00
Northmoc
84af4d6344 terminal_agony.txt fix cost 2021-06-14 15:37:54 -05:00
Northmoc
d92e2123a2 combine_chrysalis.txt +YouCtrl 2021-06-14 15:35:35 -05:00
tool4EvEr
f447ab64ce Cleanup some cards 2021-06-14 20:45:52 +02:00
leriomaggio
404840de61 Merge remote-tracking branch 'upstream/master' into editions-type-review 2021-06-14 13:14:17 +01:00