Commit Graph

56242 Commits

Author SHA1 Message Date
tool4EvEr
7155c07c6d Add todo 2022-03-06 11:21:03 +01:00
Anthony Calosa
de6c1a26e3 cleanup 2022-03-06 18:15:40 +08:00
tool4EvEr
96511a6fbc Serene Master fix 2022-03-06 11:05:15 +01:00
Anthony Calosa
d9607327d6 Merge branch 'master' into 'master'
[Adventure] Support for localization

See merge request core-developers/forge!6348
2022-03-06 10:01:29 +00:00
Anthony Calosa
eb6719d144 update 2022-03-06 17:55:30 +08:00
tool4EvEr
c5c8294e62 Clean up 2022-03-06 10:21:34 +01:00
tool4EvEr
a1dd44dc60 RevealAi: fix missing trigger 2022-03-06 10:18:08 +01:00
Anthony Calosa
6ff80452d7 update localization 2022-03-06 16:07:08 +08:00
Anthony Calosa
c37abd2b75 cleanup 2022-03-06 13:45:46 +08:00
Anthony Calosa
d4be53c72f [Adventure] Support for localization
-refactor some codes for localization
2022-03-06 12:23:33 +08:00
Hans Mackowiak
0933034f98 Merge branch '2112-problem-with-some-ltb-trigger' into 'master'
Resolve "Problem with some LTB trigger"

Closes #2112

See merge request core-developers/forge!6347
2022-03-05 21:42:28 +00:00
Hans Mackowiak
390ca4b0d9 Resolve "Problem with some LTB trigger" 2022-03-05 21:42:27 +00:00
Michael Kamensky
6c60e5cc03 Merge branch 'counters' into 'master'
CountersPutEffect allow to handle multiple Defined

See merge request core-developers/forge!6345
2022-03-05 15:04:19 +00:00
Tim Mocny
fddff49bb9 CountersPutEffect allow to handle multiple Defined 2022-03-05 15:04:15 +00:00
Michael Kamensky
22863b7ce4 Merge branch 'triomes' into 'master'
Streets of New Capenna cards (and THB Demigod / various Ajani tweaks)

See merge request core-developers/forge!6336
2022-03-05 05:13:20 +00:00
Tim Mocny
8a1d787b54 Streets of New Capenna cards (and THB Demigod / various Ajani tweaks) 2022-03-05 05:13:16 +00:00
Michael Kamensky
3abb1a1f61 Merge branch 'master' into 'master'
Net Decks Archive Updates

See merge request core-developers/forge!6344
2022-03-05 05:12:39 +00:00
Churrufli
d724f3b74d Net Decks Archive Updates 2022-03-05 00:54:21 +01:00
Bug Hunter
49f2d2cce5 Merge branch 'cardfix' into 'master'
Card fix

See merge request core-developers/forge!6343
2022-03-04 14:40:44 +00:00
tool4EvEr
ff934037bd Card fix 2022-03-04 15:40:07 +01:00
Anthony Calosa
f125676a87 Merge branch 'master' into 'master'
[Adventure] Adjust tooltip height for portrait mode

See merge request core-developers/forge!6342
2022-03-04 14:33:02 +00:00
Anthony Calosa
a9c3d43e94 Merge remote-tracking branch 'core/master' 2022-03-04 22:32:03 +08:00
Anthony Calosa
7c395f5363 [Adventure] Adjust tooltip height for portrait mode 2022-03-04 22:28:28 +08:00
Michael Kamensky
2fb0fef4c7 Merge branch 'johnwilliams7-master-patch-05831' into 'master'
Update Wizards Play Network 2022.txt

See merge request core-developers/forge!6341
2022-03-04 12:43:34 +00:00
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