Commit Graph

56126 Commits

Author SHA1 Message Date
Michael Kamensky
ef1fadd154 Merge branch 'master' into 'master'
Remove Optional$ True when precasting spells in effect from a script (e.g. Puzzle Mode).

See merge request core-developers/forge!6170
2022-02-06 05:30:26 +00:00
Michael Kamensky
cc9149bdd4 - Remove Optional$ True when precasting spells in effect from a script (e.g. Puzzle Mode). 2022-02-06 08:29:32 +03:00
Michael Kamensky
b3390215b3 Merge branch 'master' into 'master'
Added puzzle PS_VOW4.

See merge request core-developers/forge!6169
2022-02-06 05:16:47 +00:00
Michael Kamensky
12dafa6ec7 - Added puzzle PS_VOW4. 2022-02-06 08:15:49 +03: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
72b1c9002e Merge branch 'freshmaster' into 'master'
Tested card scripts for NEO (2022-02-05)

See merge request core-developers/forge!6159
2022-02-06 04:58:16 +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
c9eb46a5c5 Merge branch 'paco_deckeditorloadingtimes' into 'master'
Fix Deck Editor filter update times

See merge request core-developers/forge!6160
2022-02-06 04:57:34 +00:00
Paco Ito
5d46763df9 Fix Deck Editor filter update times 2022-02-06 04:57:33 +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
Michael Kamensky
3471dcd7d6 Merge branch 'conddesc' into 'master'
fix some ConditionDescriptions

See merge request core-developers/forge!6166
2022-02-06 04:56:40 +00:00
Tim Mocny
def76d2b3e fix some ConditionDescriptions 2022-02-06 04:56:37 +00:00
Michael Kamensky
61ac86ba4b Merge branch 'altcosttweak' into 'master'
CardPlayOption tweak getFormattedAltManaCost to avoid "paying Pay" issue

See merge request core-developers/forge!6168
2022-02-06 04:56:22 +00:00
Michael Kamensky
75d699bd81 Merge branch 'allcolortoken' into 'master'
refactor the "all colors" Citizen token from WAR

See merge request core-developers/forge!6163
2022-02-06 04:55:43 +00:00
Tim Mocny
bcdddb36f0 refactor the "all colors" Citizen token from WAR 2022-02-06 04:55:42 +00:00
Northmoc
696a51faeb CardPlayOption tweak getFormattedAltManaCost to avoid "paying Pay" issue 2022-02-05 22:20:16 -05:00
Anthony Calosa
3c6af87e9d initial AdventureMode port
- todo needed adventure application startup upon pressing the adventure mode button
2022-02-06 11:10:52 +08:00
tool4EvEr
d0d3723d43 Battlefield Thaumaturge fixes 2022-02-05 23:09:34 +01:00
Renato Santos
03cfd6cd1b Requested corrections 2022-02-05 19:51:43 +00:00
Michael Kamensky
5c3aeb508e Merge branch 'stackdesc' into 'master'
improve getStackDescription for some more Effects

See merge request core-developers/forge!6161
2022-02-05 19:11:16 +00:00
Tim Mocny
edab767b19 improve getStackDescription for some more Effects 2022-02-05 19:11:15 +00:00
Renato Santos
ffb55c606f Requested correction 2022-02-05 18:32:12 +00:00
Renato Santos
f05b3cb118 Requested corrections 2022-02-05 18:01:41 +00:00
Renato Santos
05d041c6e9 New tested card scripts 2022-02-05 10:48:39 +00:00
Paul Hammerton
de2924ff91 Merge branch 'neo_update' into 'master'
Edition updates

See merge request core-developers/forge!6152
2022-02-05 10:32:08 +00:00
paul_snoops
2eab1ebc62 final 2022-02-05 10:30:51 +00:00
paul_snoops
bbbf57777e thelist 2022-02-05 10:30:51 +00:00
paul_snoops
4fbbfb3961 NEO and NEC edition updates 2022-02-05 10:30:51 +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
f746cd9c18 Merge branch 'neo_3' into 'master'
NEO – 3 Feb

See merge request core-developers/forge!6143
2022-02-05 05:42:10 +00:00
Tim Mocny
6bf322eb3f NEO – 3 Feb 2022-02-05 05:42:04 +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
01812e7743 Merge branch 'freshmaster' into 'master'
Tested card scripts for NEO (2022-02-04)

See merge request core-developers/forge!6153
2022-02-05 05:39:46 +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
Michael Kamensky
e6fccb4f50 Merge branch 'neo_kiki' into 'master'
NEO: Fable of the Mirror-Breaker // Reflection of Kiki-Jiki and CopyPermanentEffect StackDescription improvement

See merge request core-developers/forge!6157
2022-02-05 05:38:40 +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
Michael Kamensky
c9fbc25563 Merge branch 'neo_4' into 'master'
NEO – 4 Feb

See merge request core-developers/forge!6155
2022-02-05 05:38:05 +00:00
Tim Mocny
4a7e7b414b NEO – 4 Feb 2022-02-05 05:38:04 +00:00
Michael Kamensky
11289aa9a1 Merge branch 'cleanup' into 'master'
hornswoggle.txt tidy up and add AI

See merge request core-developers/forge!6158
2022-02-05 05:37:32 +00:00
Northmoc
b332d59e94 hornswoggle.txt tidy up and add AI 2022-02-04 23:39:32 -05:00
Renato Santos
e0574f5c79 Requested corrections 2022-02-04 19:57:13 +00:00
Renato Santos
7dc2b0ddf2 New tested card scripts 2022-02-04 18:48:31 +00:00
Northmoc
be79ab2415 tidy Crew StackDescription 2022-02-04 11:40:41 -05:00
Michael Kamensky
f7b61398fa Merge branch 'puzzle' into 'master'
Another puzzle by Xitax

See merge request core-developers/forge!6145
2022-02-04 05:15:53 +00:00