Commit Graph

56768 Commits

Author SHA1 Message Date
John Williams
1dfe554f1e Update Wizards Play Network 2022.txt 2022-03-04 11:20:46 +00:00
Michael Kamensky
07dde2729b Merge branch 'trigadd' into 'master'
Add ImmediateTrigger to Leyline Tyrant and Narset of the Ancient Way -2

Closes #1967

See merge request core-developers/forge!6328
2022-03-04 11:10:58 +00:00
Tim Mocny
440062faf1 Add ImmediateTrigger to Leyline Tyrant and Narset of the Ancient Way -2 2022-03-04 11:10:56 +00:00
Michael Kamensky
b52e7d925b Merge branch 'slx_cards' into 'master'
Universes Within (SLX) cards

See merge request core-developers/forge!6340
2022-03-04 11:10:15 +00:00
paul_snoops
ac3bd77b9a typo 2022-03-04 10:02:35 +00:00
paul_snoops
3eaf3a9466 Universes Within (SLX) cards 2022-03-04 09:38:23 +00:00
Paul Hammerton
fe80c7162d Merge branch 'snc_edition' into 'master'
Add SNC, NCC and SLX edition files

See merge request core-developers/forge!6338
2022-03-04 09:04:07 +00:00
Paul Hammerton
1bef55640b Merge branch 'neo_migrate' into 'master'
Migrate NEO & NEC cardscripts

See merge request core-developers/forge!6339
2022-03-04 09:01:37 +00:00
paul_snoops
c4e32e85a8 Migrate NEO & NEC cardscripts 2022-03-04 08:59:22 +00:00
paul_snoops
8bba6f9912 Add SNC, NCC and SLX edition files 2022-03-04 08:25:15 +00:00
Anthony Calosa
9ce4ef95eb Merge branch 'master' into 'master'
[Mobile] Fix crash when CJK is not generated and Forge tries to draw CJK Text

See merge request core-developers/forge!6337
2022-03-04 04:39:32 +00:00
Anthony Calosa
bee4438766 [Mobile] Fix crash when CJK is not generated and Forge tries to draw CJK Text
- on android it is generated properly, on some system, it seems the language directory is locked/write error..
2022-03-04 12:33:33 +08:00
Anthony Calosa
6ba647790c Merge branch 'AIcheat' into 'master'
Fix AI skipping mana payment of triggers

See merge request core-developers/forge!6335
2022-03-04 01:21:37 +00:00
tool4EvEr
544c0975f4 Clean up 2022-03-03 19:42:29 +01:00
tool4EvEr
aef48835cf Fix AI skipping mana payment of triggers 2022-03-03 18:23:14 +01:00
Bug Hunter
6cbef11c92 Merge branch 'controller' into 'master'
ControlSpell: Add extra check

See merge request core-developers/forge!6334
2022-03-03 09:44:00 +00:00
TRT
1ca177253e ControlSpell: Add extra check 2022-03-03 10:42:54 +01:00
Anthony Calosa
acc65d1b51 Merge branch 'kevlahnota-master-patch-06040' into 'master'
unused import

See merge request core-developers/forge!6333
2022-03-03 08:15:43 +00:00
Anthony Calosa
bd9d2e5f20 unused import 2022-03-03 08:15:24 +00:00
Anthony Calosa
0fc5ae2192 Merge branch 'master' into 'master'
[Mobile] Update Deck AI Indicator

See merge request core-developers/forge!6332
2022-03-03 07:51:18 +00:00
Anthony Calosa
d88edc4e31 [Mobile] Update Deck AI Indicator
- AI Indicator (green) means all cards on the main deck are AI playable
2022-03-03 15:31:28 +08:00
Michael Kamensky
fa1561f9d4 Merge branch 'freshmaster' into 'master'
Incidental Editing Vol. 3: \tokenscripts

See merge request core-developers/forge!6312
2022-03-03 04:32:47 +00:00
Renato Santos
94ba1a14ae Incidental Editing Vol. 3: \tokenscripts 2022-03-03 04:32:36 +00:00
Anthony Calosa
83d3266ee3 Merge branch 'master' into 'master'
[Adventure] prevent NPE when the user tries to save without selecting saveslot

See merge request core-developers/forge!6330
2022-03-02 22:35:05 +00:00
Anthony Calosa
f223dc25e7 Merge branch 'controllspellfix' into 'master'
ControlSpell: fix for suspend

See merge request core-developers/forge!6329
2022-03-02 22:34:37 +00:00
Anthony Calosa
a7c8885a41 Merge branch 'npe' into 'master'
Fix NPE with Numa

See merge request core-developers/forge!6331
2022-03-02 22:33:23 +00:00
tool4EvEr
f815a61775 Fix NPE with Numa 2022-03-02 23:27:38 +01:00
Anthony Calosa
c5c1e97d11 prevent NPE when tthe user tries to save without selecting saveslot 2022-03-03 06:24:06 +08:00
tool4EvEr
544ca0780a ControlSpell: fix for suspend 2022-03-02 22:24:33 +01:00
Anthony Calosa
88d80c64fc Merge branch 'master' into 'master'
[Adventure] Adjust Map & Avatar Size for Portrait Mode

See merge request core-developers/forge!6327
2022-03-02 11:39:26 +00:00
Anthony Calosa
70d7426c1a adjust avatar and map height 2022-03-02 19:29:02 +08:00
Anthony Calosa
087ebd9f7a crop title bg in portrait mode 2022-03-02 16:27:20 +08:00
Anthony Calosa
107ef7492e Merge branch 'kevlahnota-master-patch-40281' into 'master'
fix regex compleated

See merge request core-developers/forge!6326
2022-03-02 06:37:33 +00:00
Anthony Calosa
5b97f26618 regex compleated 2022-03-02 06:31:52 +00:00
Anthony Calosa
78b6a409cd Merge branch 'master' into 'master'
Adventure portrait mode

See merge request core-developers/forge!6325
2022-03-02 02:56:02 +00:00
Anthony Calosa
8524229676 initialize once to prevent bug switch game modes 2022-03-02 10:23:53 +08:00
Anthony Calosa
d94dcd3256 update 2022-03-02 09:56:36 +08:00
Anthony Calosa
48ad0db558 Merge remote-tracking branch 'core/master' 2022-03-02 05:49:49 +08:00
Anthony Calosa
0317adfd31 Adventure portrait mode 2022-03-02 05:43:30 +08:00
Bug Hunter
76a88305ad Merge branch 'import' into 'master'
Fix import

See merge request core-developers/forge!6324
2022-03-01 10:51:54 +00:00
TRT
af2ace701c Fix import 2022-03-01 11:50:41 +01:00
Michael Kamensky
134bdaeb3d Merge branch 'cardfix' into 'master'
Fix card KW on player

See merge request core-developers/forge!6323
2022-03-01 03:53:36 +00:00
tool4EvEr
e09aa4af95 Fix card KW on player 2022-02-28 22:41:28 +01:00
Hans Mackowiak
6387929b7b Merge branch '2079-kamigawa-compleated' into 'master'
Resolve "Kamigawa: Compleated"

Closes #2079

See merge request core-developers/forge!6319
2022-02-28 13:38:10 +00:00
Hans Mackowiak
b065db77ed Resolve "Kamigawa: Compleated" 2022-02-28 13:38:06 +00:00
Anthony Calosa
972d854d1f Merge branch 'master' into 'master'
fix bug while switching game modes and forcing an exit

See merge request core-developers/forge!6322
2022-02-28 12:31:54 +00:00
Anthony Calosa
164e3bc62c Merge remote-tracking branch 'core/master' 2022-02-28 20:28:23 +08:00
Anthony Calosa
472bb635ed fix bug while switching game modes and forcing an exit
- aldo update new_game_mobile.json
2022-02-28 20:26:33 +08:00
Michael Kamensky
d5c3f79f35 Merge branch 'hasABasicLandType' into 'master'
CardType: add hasABasicLandType as Property

Closes #2073

See merge request core-developers/forge!6320
2022-02-28 10:40:54 +00:00
Anthony Calosa
5f6851ff34 Merge branch 'master' into 'master'
[Mobile] Add Adventure/Classic Switch button

See merge request core-developers/forge!6321
2022-02-28 07:39:25 +00:00