Commit Graph

55549 Commits

Author SHA1 Message Date
Anthony Calosa
4cb29fb06e Merge branch 'master' into 'master'
update sprite_phyrexian.png

See merge request core-developers/forge!6211
2022-02-11 05:41:23 +00:00
Anthony Calosa
cde13348d6 update sprite_phyrexian.png 2022-02-11 13:38:32 +08:00
Anthony Calosa
5cc39a2f91 Merge branch 'master' into 'master'
[Mobile] Fix splash

See merge request core-developers/forge!6210
2022-02-11 05:27:32 +00:00
Anthony Calosa
67d5ad4ce6 [Mobile] Fix splash 2022-02-11 13:26:19 +08:00
Michael Kamensky
dbae9e381a Merge branch 'newmana' into 'master'
add new Phyrexian/color pair hybrid mana shards

See merge request core-developers/forge!6200
2022-02-11 04:23:12 +00:00
Tim Mocny
a7f2d8f31e add new Phyrexian/color pair hybrid mana shards 2022-02-11 04:23:04 +00:00
Michael Kamensky
5f09cb257f Merge branch 'master' into 'master'
Fix an unused import

See merge request core-developers/forge!6209
2022-02-11 03:49:51 +00:00
Michael Kamensky
92c886ac06 - Fix an unused import. 2022-02-11 06:49:21 +03:00
Michael Kamensky
e574147e25 Merge branch 'neo_nec_9_feb' into 'master'
09 Feb - NEO & NEC card scripts from various Discord users

See merge request core-developers/forge!6198
2022-02-11 03:36:04 +00:00
Michael Kamensky
4eafabe07c Merge branch 'crew' into 'master'
Crew rules change

See merge request core-developers/forge!6206
2022-02-11 03:34:23 +00:00
Michael Kamensky
acaf7fa5c1 Merge branch 'AdventureModePort' into 'master'
Mobile + Adventure port

See merge request core-developers/forge!6180
2022-02-11 03:34:01 +00:00
Michael Kamensky
a8c18a28f4 Merge branch '406.3' into 'master'
406.3 extended

See merge request core-developers/forge!6207
2022-02-11 03:29:14 +00:00
Bug Hunter
a1b3a2e40b 406.3 extended 2022-02-11 03:29:13 +00:00
Anthony Calosa
a9956f8cfd animated startup 2022-02-11 08:48:29 +08:00
paul_snoops
9a28f9b2b7 access denied filename fix 2022-02-11 00:03:15 +00:00
paul_snoops
9646bc4cfb fixes 2022-02-11 00:03:15 +00:00
paul_snoops
087ae7ccc3 fixes 2022-02-11 00:03:15 +00:00
paul_snoops
44d96c1a79 aerial surveyor fix 2022-02-11 00:03:14 +00:00
paul_snoops
da8fd7d1ad 09 Feb - NEO & NEC card scripts from various Discord users 2022-02-11 00:03:14 +00:00
tool4EvEr
4232d9f376 Crew rules change 2022-02-10 22:11:51 +01:00
Anthony Calosa
f4987c0ba6 update splash 2022-02-11 00:34:14 +08:00
Anthony Calosa
5b98a0f70d Merge remote-tracking branch 'core/master' into AdventureModePort 2022-02-10 23:48:14 +08:00
Michael Kamensky
c8c90c26ab Merge branch 'attackfix' into 'master'
Fix AI never attacking your PW when you have Blazing Archon

See merge request core-developers/forge!6205
2022-02-10 15:35:23 +00:00
TRT
0496eaf446 Fix AI never attacking your PW when you have Blazing Archon 2022-02-10 16:33:03 +01:00
Anthony Calosa
798ca74c8b Merge remote-tracking branch 'core/master' into AdventureModePort 2022-02-10 22:09:24 +08:00
Michael Kamensky
b2e94b2d93 Merge branch 'johnwilliams7-master-patch-42374' into 'master'
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!6199
2022-02-10 12:59:07 +00:00
Michael Kamensky
06035fd6ce Merge branch 'miracle' into 'master'
Miracle is optional

Closes #2083

See merge request core-developers/forge!6201
2022-02-10 12:58:48 +00:00
Bug Hunter
4569439385 Miracle is optional 2022-02-10 12:58:47 +00:00
Michael Kamensky
65b809923d Merge branch 'tapxtype_costs' into 'master'
Improve support for "Tap another untapped X" costs

See merge request core-developers/forge!6195
2022-02-10 12:58:22 +00:00
Tim Mocny
d7749303fd Improve support for "Tap another untapped X" costs 2022-02-10 12:58:20 +00:00
Michael Kamensky
577d107e90 Merge branch 'costfix' into 'master'
Hinata & X spells fix

See merge request core-developers/forge!6197
2022-02-10 12:58:02 +00:00
Bug Hunter
60cd9ab369 Hinata & X spells fix 2022-02-10 12:58:01 +00:00
Michael Kamensky
e8c5931e4e Merge branch 'freshmaster' into 'master'
Tested card scripts for NEO (2022-02-08)

See merge request core-developers/forge!6192
2022-02-10 12:57:10 +00:00
Hans Mackowiak
e44c53bc68 Merge branch 'modified' into 'master'
Only creatures can be modified

See merge request core-developers/forge!6204
2022-02-10 10:21:48 +00:00
John Williams
a63d228556 Update Year of the Tiger 2022.txt 2022-02-10 08:47:42 +00:00
TRT
01a9e14cc1 Only creatures can be modified 2022-02-10 09:37:37 +01:00
Anthony Calosa
6bbb9a88ed update 2022-02-10 15:11:56 +08:00
Anthony Calosa
1eafc656bd Merge branch 'master' into 'master'
[Mobile] Fix dropdown for Android

See merge request core-developers/forge!6203
2022-02-10 07:07:16 +00:00
Anthony Calosa
ec534fc13b [Mobile] Fix dropdown for Android 2022-02-10 15:04:58 +08:00
Anthony Calosa
9ed9189beb Merge remote-tracking branch 'core/master' into AdventureModePort 2022-02-10 14:34:37 +08:00
Paul Hammerton
a25a2e548b Merge branch 'magic_blue_skin_edit' into 'master'
Clean up magic blue skin

See merge request core-developers/forge!6202
2022-02-09 20:19:46 +00:00
paul_snoops
5d21874dd7 Clean up magic blue skin 2022-02-09 20:18:23 +00:00
John Williams
3eb0e1ee41 Add new file 2022-02-09 17:55:46 +00:00
John Williams
0ede2ba068 Update Secret Lair Drop Series.txt 2022-02-09 17:52:47 +00:00
Renato Santos
3a9fc0606f Requested corrections 2022-02-09 17:02:43 +00:00
Michael Kamensky
db415deee7 Merge branch 'neo_8' into 'master'
NEO – 8 Feb

See merge request core-developers/forge!6196
2022-02-09 07:41:33 +00:00
Tim Mocny
92c70cc9eb NEO – 8 Feb 2022-02-09 07:41:30 +00:00
Michael Kamensky
17fc5c0695 Merge branch 'neo_st' into 'master'
NEO: Soul Transfer and support

See merge request core-developers/forge!6185
2022-02-09 07:40:07 +00:00
Tim Mocny
3dacd56a76 NEO: Soul Transfer and support 2022-02-09 07:40:06 +00:00
Anthony Calosa
91ae181afc Merge remote-tracking branch 'core/master' into AdventureModePort 2022-02-09 12:08:25 +08:00