Commit Graph

55549 Commits

Author SHA1 Message Date
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
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
6aed87ad6d Merge branch 'twosat-master-patch-16812' into 'master'
Update de-DE.properties

See merge request core-developers/forge!6149
2022-02-04 05:14:47 +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
Andreas Bendel
74008e849b Update de-DE.properties
translated lblCommandersCardCannotBeExiledByCard
2022-02-03 21:57:57 +00:00
Hans Mackowiak
13ff3e8add Merge branch 'staticfix' into 'master'
Amorphous Axe: fix AllCreatureTypes not being removed when unattached

See merge request core-developers/forge!6146
2022-02-03 20:11:57 +00:00
tool4EvEr
6f00ea3397 Amorphous Axe: fix AllCreatureTypes not being removed when unattached 2022-02-03 20:42:04 +01:00
tool4EvEr
ca71d93f2b Another puzzle by Xitax 2022-02-03 20:21:04 +01:00
Northmoc
da52c6957f improve sb following ConditionDescription clause 2022-02-03 13:30:34 -05:00
Michael Kamensky
c9cfd8f987 Merge branch 'puzzle' into 'master'
Add old puzzle by Xitax

See merge request core-developers/forge!6142
2022-02-03 17:53:56 +00:00
Sol
ba45327912 Merge branch 'paco_unifiedaihintrender' into 'master'
Unified Deck AI Hints

See merge request core-developers/forge!6113
2022-02-03 17:42:09 +00:00
Paco Ito
cde80c9c6e Unified Deck AI Hints 2022-02-03 17:42:08 +00:00
TRT
26b5ca1e45 Add old puzzle by Xitax 2022-02-03 17:01:33 +01: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
Michael Kamensky
8e2ef29483 Merge branch 'cleanstuff' into 'master'
AffectedAmount -> Relative

See merge request core-developers/forge!6141
2022-02-03 15:47:15 +00:00
Michael Kamensky
a1d68af2b9 Merge branch 'freshmaster' into 'master'
New card scripts (HTR20 + NEO)

See merge request core-developers/forge!6119
2022-02-03 15:46:55 +00:00
Michael Kamensky
e401aa3ebf Merge branch 'neo_2' into 'master'
NEO – 2 Feb

See merge request core-developers/forge!6128
2022-02-03 15:46:19 +00:00
Tim Mocny
8faf957ac7 NEO – 2 Feb 2022-02-03 15:46:16 +00:00
Renato Santos
e54b511981 Update forge-gui/res/cardsfolder/upcoming/banishing_slash.txt 2022-02-03 14:49:59 +00:00
TRT
616a6e5ddd AffectedAmount -> Relative 2022-02-03 13:56:59 +01:00
Renato Santos
b9965e1262 Update forge-gui/res/cardsfolder/upcoming/banishing_slash.txt 2022-02-03 12:11:25 +00:00
Michael Kamensky
bd93519fb6 Merge branch 'johnwilliams7-master-patch-31445' into 'master'
Update Love Your LGS 2021.txt

See merge request core-developers/forge!6139
2022-02-03 10:38:11 +00:00
John Williams
0d1239f4f8 Update Love Your LGS 2021.txt 2022-02-03 10:23:19 +00: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