Commit Graph

55549 Commits

Author SHA1 Message Date
TRT
dd4e9fef45 Fix Attachments not being removed from protection 2022-02-03 09:00:09 +01:00
Anthony Calosa
d18bdbe5b1 Merge branch 'master' into 'master'
add missing label

See merge request core-developers/forge!6137
2022-02-03 05:49:21 +00:00
Anthony Calosa
5ca81ffab5 add missing label 2022-02-03 13:47:31 +08: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
Michael Kamensky
55088a5316 Merge branch 'crew' into 'master'
Add count when Crewing

See merge request core-developers/forge!6132
2022-02-03 04:08:56 +00:00
Michael Kamensky
19c93d4e9c Merge branch 'costs' into 'master'
use IsPresent instead of CheckSVar for some cost reductions

See merge request core-developers/forge!6130
2022-02-03 04:08:15 +00:00
Renato Santos
9058cb8d64 Update forge-gui/res/cardsfolder/upcoming/euroakus.txt 2022-02-03 03:18:44 +00:00
Renato Santos
7451ce2877 Update forge-gui/res/cardsfolder/upcoming/euroakus.txt 2022-02-03 03:17:15 +00:00
Renato Santos
f5a40aafef Deleted forge-gui/res/cardsfolder/upcoming/mountain_mover.txt 2022-02-02 22:15:08 +00:00
Bug Hunter
d5b11e75fa Merge branch 'digstack' into 'master'
improve DigEffect getStackDescription

See merge request core-developers/forge!6134
2022-02-02 21:36:16 +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
efe48e5d00 Add count when Crewing 2022-02-02 19:05:32 +01:00
Michael Kamensky
3d2a94c783 Merge branch 'neo_mm' into 'master'
NEO: Malicious Malfunction and fix similar cards

See merge request core-developers/forge!6129
2022-02-02 17:17:30 +00:00
Tim Mocny
d2f78a1b9e NEO: Malicious Malfunction and fix similar cards 2022-02-02 17:17:29 +00:00
Renato Santos
199a8cf08b Update forge-gui/res/cardsfolder/upcoming/invoke_justice.txt 2022-02-02 16:28:29 +00:00
Northmoc
e3031d536b use IsPresent instead of CheckSVar for some cost reductions 2022-02-02 11:17:02 -05:00
Michael Kamensky
bc882f7821 Merge branch 'ranking' into 'master'
Improve CardRanker

See merge request core-developers/forge!6127
2022-02-02 15:41:57 +00:00
TRT
af1f59909e Improve CardRanker 2022-02-02 15:02:52 +01:00
Hans Mackowiak
aaae555513 Merge branch 'crew' into 'master'
Crew fix

See merge request core-developers/forge!6126
2022-02-02 12:28:05 +00:00
Renato Santos
6038e3b5c6 Update forge-gui/res/cardsfolder/upcoming/invoke_justice.txt 2022-02-02 11:44:17 +00:00
TRT
50da6a361c Crew fix 2022-02-02 11:00:54 +01:00
Paul Hammerton
d48b12ef55 Merge branch 'neo_update' into 'master'
NEO edition update

See merge request core-developers/forge!6125
2022-02-02 08:24:21 +00:00
paul_snoops
54fe4a576d NEO edition update 2022-02-02 08:23:12 +00:00
Michael Kamensky
03d040616f Merge branch 'fussy' into 'master'
fussy prompt fix

See merge request core-developers/forge!6123
2022-02-02 05:54:30 +00:00
Michael Kamensky
1609c78741 Merge branch 'neo_1' into 'master'
NEO – 1 Feb

See merge request core-developers/forge!6117
2022-02-02 05:54:28 +00:00
Tim Mocny
7eb277d5a6 NEO – 1 Feb 2022-02-02 05:54:26 +00:00
Michael Kamensky
1b5360c182 Merge branch 'neo_ktw' into 'master'
NEO: Kappa Tech-Wrecker and some etbCounter parsing upgrades

See merge request core-developers/forge!6122
2022-02-02 05:54:12 +00:00
Tim Mocny
73e4e838bc NEO: Kappa Tech-Wrecker and some etbCounter parsing upgrades 2022-02-02 05:54:11 +00:00
Michael Kamensky
39ff60f714 Merge branch 'neo_morj' into 'master'
NEO: March of Reckless Joy and support

See merge request core-developers/forge!6124
2022-02-02 05:52:56 +00:00
Tim Mocny
84d8a65859 NEO: March of Reckless Joy and support 2022-02-02 05:52:55 +00:00
Northmoc
0e7c59f685 fussy prompt fix 2022-02-01 23:36:14 -05:00
Renato Santos
8dcc1f6b9d Update forge-gui/res/cardsfolder/upcoming/invoke_justice.txt 2022-02-02 03:13:40 +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
Renato Santos
df0a153eac Requested edits: all but one 2022-02-02 01:10:41 +00:00
Anthony Calosa
96766a2a12 Merge branch 'master' into 'master'
[Mobile] fix Deck list view mana symbols

See merge request core-developers/forge!6120
2022-02-02 00:41:43 +00:00
Anthony Calosa
f3f74dc894 Merge remote-tracking branch 'core/master' 2022-02-02 08:30:01 +08:00
Anthony Calosa
fb00d35404 [Mobile] fix symbol width 2022-02-02 08:28:28 +08:00
Renato Santos
894ef2533b New card scripts 2022-02-01 21:16:45 +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
Michael Kamensky
0328438bfb Merge branch 'cleanup' into 'master'
Random Cleanup

See merge request core-developers/forge!6118
2022-02-01 20:05:47 +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
1e3916f086 Remove default param 2022-02-01 17:51:40 +01:00
tool4EvEr
d27552dd25 Clean up 2022-02-01 17:51:19 +01:00
Paul Hammerton
6fda10fa20 Merge branch 'neo_update_p22' into 'master'
P22 edition and NEO update

See merge request core-developers/forge!6116
2022-02-01 13:08:38 +00:00
paul_snoops
f252b74051 edition file name changes 2022-02-01 13:07:50 +00:00
paul_snoops
fec2344d86 P22 edition and NEO update 2022-02-01 12:57:24 +00:00