Commit Graph

6025 Commits

Author SHA1 Message Date
Michael Kamensky
7272856f93 Merge branch 'strings' into 'master'
Fixing/adding flexibility to ChangeZoneEffect stack description builder

See merge request core-developers/forge!6136
2022-02-08 04:16:28 +00:00
Tim Mocny
254ba8ed81 Fixing/adding flexibility to ChangeZoneEffect stack description builder 2022-02-08 04:16:27 +00:00
Tim Mocny
a9abb8c30b NEO: Reckoner Bankbuster tweaks 2022-02-08 04:13:52 +00:00
Michael Kamensky
3f848abd5a Merge branch 'mMR' into 'master'
Cleanup meetsManaRestrictions

See merge request core-developers/forge!6182
2022-02-07 18:45:47 +00:00
Bug Hunter
2da9647021 Cleanup meetsManaRestrictions 2022-02-07 18:45:46 +00:00
Michael Kamensky
f1e6e868bf Merge branch 'neo_mindlink' into 'master'
NEO: Mindlink Mech and support

See merge request core-developers/forge!6181
2022-02-07 18:44:45 +00:00
Tim Mocny
223cecca97 NEO: Mindlink Mech and support 2022-02-07 18:44:44 +00:00
Michael Kamensky
dbf5a5a386 Merge branch 'neo_mechtitan' into 'master'
NEO: Mechtitan Core + Mechtitan token and support

See merge request core-developers/forge!6162
2022-02-07 18:43:43 +00:00
Tim Mocny
c41d72044f NEO: Mechtitan Core + Mechtitan token and support 2022-02-07 18:43:40 +00:00
Tim Mocny
7fec1d98ba AnimateEffect / DamageDealEffect improve getStackDescription 2022-02-07 09:23:08 +00:00
Michael Kamensky
27227c6a16 Merge branch 'neo_hidetsugu_saga' into 'master'
NEO: Hidetsugu Consumes All // Vessel of the All-Consuming and support

See merge request core-developers/forge!6150
2022-02-06 05:00:39 +00:00
Tim Mocny
bd7b76ddb3 NEO: Hidetsugu Consumes All // Vessel of the All-Consuming and support 2022-02-06 05:00:36 +00:00
Michael Kamensky
9b78a66e0c Merge branch 'thauma' into 'master'
Battlefield Thaumaturge fixes

See merge request core-developers/forge!6164
2022-02-06 04:58:06 +00:00
Michael Kamensky
81929382a1 Merge branch 'stackdesc2' into 'master'
some more getStackDescription improvements

See merge request core-developers/forge!6167
2022-02-06 04:57:11 +00:00
Tim Mocny
39d2362eb5 some more getStackDescription improvements 2022-02-06 04:57:10 +00:00
Northmoc
696a51faeb CardPlayOption tweak getFormattedAltManaCost to avoid "paying Pay" issue 2022-02-05 22:20:16 -05:00
tool4EvEr
d0d3723d43 Battlefield Thaumaturge fixes 2022-02-05 23:09:34 +01:00
Tim Mocny
edab767b19 improve getStackDescription for some more Effects 2022-02-05 19:11:15 +00:00
Michael Kamensky
32b5f61cbe Merge branch 'crewsd' into 'master'
tidy Crew StackDescription

See merge request core-developers/forge!6151
2022-02-05 05:42:31 +00:00
Michael Kamensky
9a4cab4856 Merge branch 'rank2' into 'master'
CardRanker tweak

See merge request core-developers/forge!6140
2022-02-05 05:40:47 +00:00
Bug Hunter
bcd910748d CardRanker tweak 2022-02-05 05:40:46 +00:00
Michael Kamensky
cadba16a1b Merge branch 'costdisc' into 'master'
Improve some Cost toString() functions

See merge request core-developers/forge!6154
2022-02-05 05:40:14 +00:00
Tim Mocny
d6ef3507a4 Improve some Cost toString() functions 2022-02-05 05:40:13 +00:00
Michael Kamensky
d29fde4171 Merge branch 'neo_vs' into 'master'
NEO: Voltage Surge and Generic Kicker tweaks

See merge request core-developers/forge!6156
2022-02-05 05:39:17 +00:00
Tim Mocny
8b1fa4ee5d NEO: Voltage Surge and Generic Kicker tweaks 2022-02-05 05:39:17 +00:00
Tim Mocny
f87afd472f NEO: Fable of the Mirror-Breaker // Reflection of Kiki-Jiki and CopyPermanentEffect StackDescription improvement 2022-02-05 05:38:40 +00:00
Northmoc
be79ab2415 tidy Crew StackDescription 2022-02-04 11:40:41 -05:00
Michael Kamensky
c7c74c8c8c Merge branch 'neo_satsuki' into 'master'
NEO: Satsuki and improvements to PutCounterAll StackDescription builder

See merge request core-developers/forge!6147
2022-02-04 05:15:19 +00:00
Tim Mocny
d9b131c166 NEO: Satsuki and improvements to PutCounterAll StackDescription builder 2022-02-04 05:15:17 +00:00
Michael Kamensky
40b0cbe797 Merge branch 'neo_raiyuu' into 'master'
NEO: Raiyuu and support

See merge request core-developers/forge!6148
2022-02-04 05:14:46 +00:00
Tim Mocny
80d35ce5ad NEO: Raiyuu and support 2022-02-04 05:14:44 +00:00
Michael Kamensky
312a28268d Merge branch 'conddesc' into 'master'
improve StringBuilder following ConditionDescription clause

See merge request core-developers/forge!6144
2022-02-04 05:11:36 +00:00
tool4EvEr
6f00ea3397 Amorphous Axe: fix AllCreatureTypes not being removed when unattached 2022-02-03 20:42:04 +01:00
Northmoc
da52c6957f improve sb following ConditionDescription clause 2022-02-03 13:30:34 -05:00
Michael Kamensky
b2992ca439 Merge branch 'paco_logturnsatendgame' into 'master'
feat: add log for number of turns played at the end of the game

See merge request core-developers/forge!6121
2022-02-03 16:00:35 +00:00
TRT
616a6e5ddd AffectedAmount -> Relative 2022-02-03 13:56:59 +01:00
Hans Mackowiak
8a3d6823d5 Merge branch 'attach' into 'master'
Fix Attachments not being removed from protection

See merge request core-developers/forge!6138
2022-02-03 08:13:10 +00:00
TRT
dd4e9fef45 Fix Attachments not being removed from protection 2022-02-03 09:00:09 +01:00
Michael Kamensky
631718f4c4 Merge branch 'counters' into 'master'
WithCounters$ -> WithCountersType$

See merge request core-developers/forge!6135
2022-02-03 04:09:20 +00:00
tool4EvEr
63ca64c4cc WithCounters$ -> WithCountersType$ 2022-02-02 21:10:37 +01:00
Northmoc
f09484b1ce improve DigEffect getStackDescription 2022-02-02 13:43:24 -05:00
TRT
50da6a361c Crew fix 2022-02-02 11:00:54 +01:00
Tim Mocny
73e4e838bc NEO: Kappa Tech-Wrecker and some etbCounter parsing upgrades 2022-02-02 05:54:11 +00:00
pakoito
ca713037a3 feat: add log for number of turns played at the end of the game 2022-02-02 01:28:52 +00:00
Michael Kamensky
d13396484d Merge branch 'neo_hm' into 'master'
NEO: "crews Vehicles as though its power were X greater" support

See merge request core-developers/forge!6095
2022-02-01 20:06:33 +00:00
Tim Mocny
b981b52f83 NEO: "crews Vehicles as though its power were X greater" support 2022-02-01 20:06:33 +00:00
Michael Kamensky
a596d88c84 Merge branch 'neo_ao' into 'master'
NEO: Ao, the Dawn Sky and support

See merge request core-developers/forge!6112
2022-02-01 20:06:25 +00:00
tool4EvEr
b2571753be Less ChangeNum$ 1 2022-02-01 20:21:24 +01:00
tool4EvEr
cb48c6e411 Remove TriggerController$ TriggeredCardController default 2022-02-01 20:14:04 +01:00
tool4EvEr
d27552dd25 Clean up 2022-02-01 17:51:19 +01:00