Commit Graph

40270 Commits

Author SHA1 Message Date
Agetian
3a8c07d9c1 - Added puzzle PS_RNA2. 2019-02-05 22:57:00 +03:00
Agetian
30109aaeba - Added puzzle PS_RNA2. 2019-02-05 22:49:56 +03:00
Michael Kamensky
c02f4cf081 Merge branch 'master' into 'master'
Update dovin_grand_arbiter.txt

See merge request core-developers/forge!1363
2019-02-05 19:26:20 +00:00
T.J. Tillman
2c0ec81812 Update dovin_grand_arbiter.txt 2019-02-05 17:47:34 +00:00
Michael Kamensky
2d8286adf1 Merge branch 'cst' into 'master'
Add "Coldsnap Theme Decks" edition.

See merge request core-developers/forge!1314
2019-02-05 04:33:41 +00:00
Michael Kamensky
95cb17849e Merge branch 'master' into 'master'
"ANA" / Arena New Experience cards added, other card script updates

See merge request core-developers/forge!1299
2019-02-05 04:33:30 +00:00
Michael Kamensky
e42608f856 Merge branch 'master' into 'master'
Update unbreakable_formation.txt (Addendum)

See merge request core-developers/forge!1361
2019-02-05 04:31:52 +00:00
Michael Kamensky
cdb47e0e10 Merge branch 'optimize' into 'master'
optimize redisplay of floating card areas

See merge request core-developers/forge!1337
2019-02-04 20:34:45 +00:00
Michael Kamensky
b008a75043 Merge branch 'bugfix' into 'master'
fix crash when hiding temporarily shown zones

See merge request core-developers/forge!1360
2019-02-04 20:32:39 +00:00
T.J. Tillman
81d3ab86f9 Update unbreakable_formation.txt 2019-02-04 20:23:03 +00:00
Peter F. Patel-Schneider
efe71e8384 fix crash when hiding temporarily shown zones 2019-02-04 14:24:34 -05:00
Sol
cb494280a9 Merge branch 'master' into 'master'
Update kayas_wrath.txt

See merge request core-developers/forge!1359
2019-02-04 13:35:15 +00:00
T.J. Tillman
ba587ea702 Update kayas_wrath.txt 2019-02-04 06:14:39 +00:00
Michael Kamensky
4b00795f3d Merge branch 'transfigureKeyword' into 'master'
CardFactoryUtil: Transfigure as Keyword

See merge request core-developers/forge!1358
2019-02-04 03:36:11 +00:00
Hanmac
faca59beb0 CardFactoryUtil: Transfigure as Keyword 2019-02-03 18:18:06 +01:00
Michael Kamensky
41593d0060 Merge branch 'meldFix' into 'master'
MeldEffect: some fixes

See merge request core-developers/forge!1356
2019-02-03 16:33:07 +00:00
Michael Kamensky
ce865da924 Merge branch 'master' into 'master'
Added puzzle PS_RNA1. Enabled RNA in Planar Conquest.

See merge request core-developers/forge!1357
2019-02-03 16:25:37 +00:00
Agetian
1300194e3a - Added puzzle PS_RNA1.
- Enabled RNA for the Ravnica plane in Planar Conquest (no event updates yet).
2019-02-03 19:24:50 +03:00
Hanmac
903c708e1f MeldEffect: some fixes 2019-02-03 16:37:49 +01:00
Michael Kamensky
b5d97dc256 Merge branch 'surgeFix' into 'master'
SpellAbility: fixed Surge for Crush of Tentacles

See merge request core-developers/forge!1355
2019-02-03 14:56:54 +00:00
Peter F. Patel-Schneider
33c398fcb6 add newline to separate functions 2019-02-03 08:51:32 -05:00
Michael Kamensky
3fc37c735e Merge branch 'master' into 'master'
RNA fixes (Awaken the Erstwhile and Skarrgan Hellkite)

Closes #824

See merge request core-developers/forge!1354
2019-02-03 10:13:16 +00:00
Hanmac
1b44c953fc SpellAbility: fixed Surge for Crush of Tentacles 2019-02-03 08:39:30 +01:00
T.J. Tillman
816d136350 Update awaken_the_erstwhile.txt 2019-02-03 05:47:52 +00:00
T.J. Tillman
cd1bfc6b08 Update awaken_the_erstwhile.txt 2019-02-03 05:46:09 +00:00
T.J. Tillman
e72879d173 Update skarrgan_hellkite.txt 2019-02-03 05:34:42 +00:00
Michael Kamensky
d18ef04536 Merge branch 'master' into 'master'
Fix formatting in Jhoira fix and integrate it

See merge request core-developers/forge!1353
2019-02-03 05:21:01 +00:00
Agetian
426c0ca4c8 - Formatting fix. 2019-02-03 08:20:13 +03:00
Agetian
7b521919fb Merge branch 'fix_jhoira_avatar' of https://git.cardforge.org/friarsol/forge into agetian-master 2019-02-03 08:18:28 +03:00
Michael Kamensky
5b547d509b Merge branch 'master' into 'master'
RNA updates

See merge request core-developers/forge!1351
2019-02-03 05:18:05 +00:00
Chris H
98830dde13 Fix Jhoira Avatar crashing since it copies cards into no zone 2019-02-02 23:23:17 -05:00
Sol
1a5fa823e5 Merge branch 'patch-3' into 'master'
Fix: c_a_treasure_sac

Closes #825

See merge request core-developers/forge!1350
2019-02-03 04:22:50 +00:00
T.J. Tillman
c769aa07dd Update consecrate_consume.txt 2019-02-03 03:06:24 +00:00
T.J. Tillman
10745eb9c7 Update consecrate_consume.txt 2019-02-03 02:34:59 +00:00
T.J. Tillman
18934c7f9f Update revival_revenge.txt 2019-02-03 02:25:36 +00:00
T.J. Tillman
c54682850b Update theater_of_horrors.txt 2019-02-03 00:33:59 +00:00
T.J. Tillman
f241a62d95 Update clear_the_stage.txt 2019-02-03 00:15:59 +00:00
Peter F. Patel-Schneider
31bca6c614 try to do fewer layout calculations when moving cards 2019-02-02 16:46:23 -05:00
Hans Mackowiak
567aab0c43 Fix: c_a_treasure_sac 2019-02-02 21:04:01 +00:00
Michael Kamensky
ef1f1c33cf Merge branch 'giantbaiting-patch' into 'master'
Bug fix: Giantbaiting

See merge request core-developers/forge!1349
2019-02-02 16:42:53 +00:00
Rob Schnautz
a18d98c231 Token script had typo in name. 2019-02-02 16:39:51 +00:00
Michael Kamensky
66b97d5d8e Merge branch 'fix-sarkhan-dragonsoul' into 'master'
Fix Sarkhan, Dragonsoul (ultimate ability) and Kaya, Orzhov Usurper (costs).

Closes #823

See merge request core-developers/forge!1347
2019-02-02 13:24:28 +00:00
Michael Kamensky
3c83b62d98 Merge branch 'landwalkFix' into 'master'
CombatUtil: fix Basic Landwalk abilities

See merge request core-developers/forge!1348
2019-02-02 13:24:17 +00:00
Hanmac
0569a0b36d CombatUtil: fix Basic Landwalk abilities 2019-02-02 14:07:48 +01:00
Agetian
a8abbadec4 - Fix Kaya, Orzhov Usurper ability costs. 2019-02-02 13:58:13 +03:00
Agetian
6235b42c31 - Limit the search to Dragon creature cards. 2019-02-02 13:54:23 +03:00
Agetian
1d41f1b330 - Fix Sarkhan, Dragonsoul. 2019-02-02 13:51:18 +03:00
Michael Kamensky
ad8778d397 Merge branch 'master' into 'master'
Preparing Forge for Android publish 1.6.20.001 [incremental].

See merge request core-developers/forge!1346
2019-02-02 05:56:08 +00:00
Agetian
e38bd51193 - Preparing Forge for Android publish 1.6.20.001 [incremental]. 2019-02-02 08:49:31 +03:00
Blacksmith
e5584ea065 Clear out release files in preparation for next release 2019-02-02 02:05:37 +00:00