Commit Graph

55234 Commits

Author SHA1 Message Date
Bug Hunter
d89acc6141 Fix Dementia Sliver 2022-01-23 04:58:24 +00:00
Bug Hunter
36b42d3f4f Merge branch 'staticKeywordX' into 'master'
use StaticAbility for some cases of Keyword X

See merge request core-developers/forge!6070
2022-01-22 15:25:44 +00:00
Hans Mackowiak
0a2303a1dd use StaticAbility for some cases of Keyword X 2022-01-22 15:13:54 +01:00
Anthony Calosa
9a98797189 Merge branch 'kevlahnota-master-patch-25933' into 'master'
Update AbilityUtils.java

See merge request core-developers/forge!6066
2022-01-21 23:41:48 +00:00
Anthony Calosa
f19fb9c333 Update AbilityUtils.java 2022-01-21 23:40:59 +00:00
Anthony Calosa
373b12e9ca Update AbilityUtils.java 2022-01-21 23:37:35 +00:00
Michael Kamensky
1b6bcf4e29 Merge branch 'neo_hotfix' into 'master'
NEO edition hotfix for shops

See merge request core-developers/forge!6062
2022-01-21 14:16:45 +00:00
Michael Kamensky
238c2ec950 Merge branch 'churrufli-master-patch-46885' into 'master'
Update net-decks-brawl.txt add current historic brawl metagame

See merge request core-developers/forge!6064
2022-01-21 14:16:37 +00:00
Michael Kamensky
158a7b4b24 Merge branch 'token' into 'master'
Cleaning up some token generation and a Curse cycle

Closes #1104

See merge request core-developers/forge!6041
2022-01-21 14:16:34 +00:00
Paul Hammerton
27f48d1ded Merge branch 'pauper_bans' into 'master'
Pauper Bans - 21 Jan 2022

See merge request core-developers/forge!6065
2022-01-21 13:31:00 +00:00
Paul Hammerton
3be20306c0 Update Pauper.txt 2022-01-21 10:52:06 +00:00
Churrufli
b26805cb28 Update net-decks-brawl.txt add current historic brawl metagame 2022-01-20 21:20:03 +00:00
Churrufli
415f25f60b Add "Current Historic Brawl Metagame" in Net Decks Brawl Format 2022-01-20 22:14:00 +01:00
Northmoc
5dc0230d98 Curse of GoodStuff cycle with You then TriggeredAttackingPlayerIfOpponent 2022-01-20 12:27:47 -05:00
Northmoc
44eace6311 "=Opponent" -> "IfOpponent" 2022-01-20 12:26:43 -05:00
Northmoc
6a50603465 NEO edition hotfix for shops 2022-01-20 12:11:12 -05:00
Northmoc
ceba4b27b9 more Curse of GoodThing draft refactors 2022-01-20 12:06:42 -05:00
Michael Kamensky
e7e0084adb Merge branch 'johnwilliams7-master-patch-35419' into 'master'
Update Love Your LGS 2021.txt

See merge request core-developers/forge!6061
2022-01-20 12:18:04 +00:00
John Williams
393dcbecb0 Update Love Your LGS 2021.txt 2022-01-20 11:03:00 +00:00
Michael Kamensky
70e55a8a89 Merge branch 'trigclean' into 'master'
Trigger cleanup

See merge request core-developers/forge!6060
2022-01-20 09:18:19 +00:00
Northmoc
01aab963d6 Curses - you get the token first!! 2022-01-19 22:19:36 -05:00
Northmoc
620d22e1ae support "Triggered...=Opponent" filter for getDefinedPlayer 2022-01-19 22:13:06 -05:00
Northmoc
864a05e388 add filter to Curses 2022-01-19 22:13:06 -05:00
Northmoc
7f83282d04 elephant_resurgence.txt 2022-01-19 22:13:05 -05:00
Northmoc
a69b2a5d80 curse_of_disturbance.txt 2022-01-19 22:13:05 -05:00
Northmoc
80b3b5ff53 curse_of_opulence.txt without RepeatEach 2022-01-19 22:13:04 -05:00
Northmoc
387a48322a captive_audience.txt without RepeatEach 2022-01-19 22:13:03 -05:00
Michael Kamensky
0297728478 Merge branch 'mayplay' into 'master'
Fix MayPlay + CharacteristicDefining

See merge request core-developers/forge!6057
2022-01-19 18:49:34 +00:00
Bug Hunter
f9ab5ce812 Fix MayPlay + CharacteristicDefining 2022-01-19 18:49:32 +00:00
tool4EvEr
1ea0c48867 Trigger cleanup 2022-01-19 19:40:21 +01:00
Michael Kamensky
87633bfac2 Merge branch 'lge' into 'master'
LifeGainEffect stack description grammar improvement

See merge request core-developers/forge!6058
2022-01-19 18:13:29 +00:00
Hans Mackowiak
d2700f0235 Merge branch 'contrib' into 'master'
**NEW Contributors!!!

See merge request core-developers/forge!6059
2022-01-19 16:53:33 +00:00
Tim Mocny
e61c095503 **NEW Contributors!!! 2022-01-19 16:53:33 +00:00
Northmoc
9ed0920bb5 LifeGainEffect stack description grammar improvement 2022-01-19 11:44:22 -05:00
Bug Hunter
fa9d754527 Merge branch 'master' into 'master'
Card script tidying

See merge request core-developers/forge!6046
2022-01-19 09:55:13 +00:00
Renato Santos
95a96c0561 Card script tidying 2022-01-19 09:54:57 +00:00
Hans Mackowiak
551be74558 Merge branch 'lightning' into 'master'
Fix Lightning Storm retargeting

See merge request core-developers/forge!6054
2022-01-19 08:05:59 +00:00
Michael Kamensky
6b41b66eff Merge branch 'zenith' into 'master'
Fix Zeniths + Flashback

Closes #2055

See merge request core-developers/forge!6055
2022-01-19 04:21:55 +00:00
Michael Kamensky
ff74e5c48c Merge branch 'TRT-master-patch-44700' into 'master'
Update forge-gui/res/cardsfolder/s/sigarda_host_of_herons.txt

See merge request core-developers/forge!6056
2022-01-19 04:21:52 +00:00
Bug Hunter
3742c6ddfa Update forge-gui/res/cardsfolder/s/sigarda_host_of_herons.txt 2022-01-18 22:25:31 +00:00
tool4EvEr
df87ad8cf7 Fix Zeniths + Flashback 2022-01-18 23:16:26 +01:00
tool4EvEr
1374f75ab7 Fix Lightning Storm retargeting 2022-01-18 21:05:35 +01:00
Michael Kamensky
00e32ef06b Merge branch 'master' into 'master'
fix caves of koilos displayed mana

See merge request core-developers/forge!6053
2022-01-18 04:23:46 +00:00
Dirk Leichsenring
5660816e96 fix caves of koilos displayed mana 2022-01-18 01:43:50 +01:00
Anthony Calosa
49c6e57c83 Merge branch 'master' into 'master'
[Mobile] fix NPE

See merge request core-developers/forge!6052
2022-01-17 23:19:15 +00:00
Anthony Calosa
0097b66cd6 [Mobile] fix NPE 2022-01-18 07:17:23 +08:00
Michael Kamensky
03815d38ea Merge branch 'master' into 'master'
Net Decks Archive Updates

See merge request core-developers/forge!6051
2022-01-17 09:46:20 +00:00
Churrufli
c80923b936 Net Decks Archive Updates 2022-01-17 07:40:21 +01:00
Michael Kamensky
70c1e39e2a Merge branch 'assignattackers' into 'master'
Add Skip button to allow arbitrary order when assigning attackers dmg

Closes #2059

See merge request core-developers/forge!6050
2022-01-16 17:46:49 +00:00
Michael Kamensky
fe6f93c174 Merge branch 'paco_adddeckaicolumn' into 'master'
Add AI column to deck editor

See merge request core-developers/forge!6044
2022-01-16 17:46:20 +00:00