Commit Graph

48805 Commits

Author SHA1 Message Date
Michael Kamensky
cfe9f8e6e6 Merge branch 'master' into 'master'
Fix Heliod's Intervention AI

See merge request core-developers/forge!4313
2021-03-30 16:23:24 +00:00
Michael Kamensky
72f768cca4 - Fix Heliod's Intervention AI 2021-03-30 19:22:46 +03:00
Anthony Calosa
53bc91d399 Merge branch 'master' into 'master'
refactor CardDB

See merge request core-developers/forge!4312
2021-03-30 15:44:06 +00:00
Anthony Calosa
ca63763d04 refactor CardDB
use filterentries instead of declaring maps
2021-03-30 23:42:33 +08:00
Anthony Calosa
930c27a890 Merge branch 'Williams-master-patch-81518' into 'master'
Update returned_pastcaller.txt

See merge request core-developers/forge!4311
2021-03-30 11:24:28 +00:00
John
2caec7be0e Update returned_pastcaller.txt 2021-03-30 10:44:50 +00:00
Bug Hunter
8a5692e9df Merge branch 'TRT-master-patch-00357' into 'master'
ActivateAbilityAi: small revert/align for multiplayer

See merge request core-developers/forge!4309
2021-03-30 07:58:56 +00:00
Bug Hunter
5cf96b1154 Update forge-ai/src/main/java/forge/ai/ability/ActivateAbilityAi.java 2021-03-30 07:56:46 +00:00
Michael Kamensky
2d392de9ef Merge branch 'spellAbilityAdditionalAbilities' into 'master'
SpellAbility: use SpellAbility for additionalAbilities so Trigger can have cost

See merge request core-developers/forge!4303
2021-03-30 04:47:45 +00:00
Hans Mackowiak
f53aff1882 SpellAbility: use SpellAbility for additionalAbilities so Trigger can have cost 2021-03-30 04:47:44 +00:00
Michael Kamensky
0cf6cbf3bc Merge branch 'proliferate' into 'master'
Fix AI killing itself with poison + proliferate

See merge request core-developers/forge!4307
2021-03-30 04:12:46 +00:00
Michael Kamensky
28b428a6f1 Merge branch 'Williams-master-patch-92703' into 'master'
STX more cards

See merge request core-developers/forge!4300
2021-03-30 04:12:10 +00:00
tool4EvEr
3ccce18f23 Fix AI killing itself with poison + proliferate 2021-03-29 23:27:38 +02:00
Bug Hunter
6971d320ae Merge branch 'fixRemembered' into 'master'
Fix RememberDiscarded

See merge request core-developers/forge!4304
2021-03-29 17:03:48 +00:00
John
2dd6305e54 Add new file 2021-03-29 17:02:42 +00:00
tool4EvEr
baf5479d0b Fix RememberDiscarded 2021-03-29 18:52:13 +02:00
John
f1030c2f10 Add new file 2021-03-29 16:31:09 +00:00
John
1f1639e661 Update quintorius_field_historian.txt 2021-03-29 16:10:06 +00:00
John
04d3445834 Add new file 2021-03-29 16:05:58 +00:00
John
1559a14e39 Add new file 2021-03-29 15:58:22 +00:00
John
fbbc6aa005 Update quintorius_field_historian.txt 2021-03-29 15:31:58 +00:00
John
9c573b9bfd Update returned_pastcaller.txt 2021-03-29 15:01:17 +00:00
John
96bbe2c7dc Update returned_pastcaller.txt 2021-03-29 14:59:55 +00:00
John
ec9f6b82d9 Update quintorius_field_historian.txt 2021-03-29 14:58:26 +00:00
John
2c120c3c45 Add new file 2021-03-29 14:58:03 +00:00
John
b911f5c45b Update returned_pastcaller.txt 2021-03-29 14:56:38 +00:00
John
6366a22ff3 Update returned_pastcaller.txt 2021-03-29 14:55:17 +00:00
John
5fc819d8f5 Add new file 2021-03-29 14:43:15 +00:00
John
df9d1ddcbf Add new file 2021-03-29 14:00:44 +00:00
Anthony Calosa
eed7b282d3 Merge branch 'master' into 'master'
Refactor carddb for Deck Editor/Workshop Catalog

Closes #1436

See merge request core-developers/forge!4298
2021-03-29 13:44:55 +00:00
Anthony Calosa
fc6237cd29 update advance filter
support alternate parts limited to card names, keywords, rules text, types and subtypes
2021-03-29 21:26:14 +08:00
John
c473e634e0 Add new file 2021-03-29 12:20:38 +00:00
John
28866fc1dc Add new file 2021-03-29 12:17:00 +00:00
John
8028e8ca12 Add new file 2021-03-29 12:13:42 +00:00
Anthony Calosa
28d1cc2055 Merge remote-tracking branch 'core/master' 2021-03-29 18:30:55 +08:00
Anthony Calosa
cffd99b68d update advance filter 2021-03-29 18:30:09 +08:00
Michael Kamensky
ac92a92090 Merge branch 'targetselection' into 'master'
TargetSelection: Fix stack peeking detection

See merge request core-developers/forge!4295
2021-03-29 08:00:21 +00:00
Bug Hunter
28dbb309cf TargetSelection: Fix stack peeking detection 2021-03-29 08:00:21 +00:00
Michael Kamensky
7b585aaa05 Merge branch 'descriptions' into 'master'
Fix alternate state descriptions when viewed from original

See merge request core-developers/forge!4277
2021-03-29 07:59:43 +00:00
Bug Hunter
82f0c85bd0 Fix alternate state descriptions when viewed from original 2021-03-29 07:59:43 +00:00
Michael Kamensky
1c0a7d8475 Merge branch 'Williams-master-patch-39368' into 'master'
Update adrix_and_nev_twincasters.txt

See merge request core-developers/forge!4296
2021-03-29 07:58:48 +00:00
Michael Kamensky
5f63b5f907 Merge branch 'card-fixes' into 'master'
Inzerva doesn't target

See merge request core-developers/forge!4297
2021-03-29 07:58:38 +00:00
Anthony Calosa
7459cd65d9 unused variable 2021-03-29 15:23:57 +08:00
Anthony Calosa
0b61ddaff7 fix advance filter for adventure and flip 2021-03-29 15:23:03 +08:00
Anthony Calosa
d554a7ee97 add getUniqueCardsNoAlt for mobile 2021-03-29 13:35:20 +08:00
Anthony Calosa
3d1e130b1e Merge remote-tracking branch 'core/master' 2021-03-29 12:47:11 +08:00
Anthony Calosa
a63e008f84 Merge branch 'kevlahnota-master-patch-97416' into 'master'
fix cards

See merge request core-developers/forge!4299
2021-03-29 04:46:29 +00:00
Anthony Calosa
d76ae27611 fix cards 2021-03-29 04:46:29 +00:00
Anthony Calosa
bf00d79e23 refactor carddb for Deck Editor/Workshop Catalog 2021-03-29 11:19:26 +08:00
Adam Pantel
c08775f3e3 Inzerva doesn't target 2021-03-28 22:03:12 -04:00