Commit Graph

37131 Commits

Author SHA1 Message Date
Agetian
809b047523 - Added PS_RIX1 puzzle.
- Fixed Puzzle Mode init for setting the player's hand size which sometimes failed to work.
2018-04-10 11:56:07 +03:00
Agetian
afe040d0b6 - Minor cleanup. 2018-04-10 10:58:51 +03:00
Agetian
9a43c1b3ae - Ensure that players have equal player panel heights in a two-player game in Landscape mode 2018-04-10 10:56:33 +03:00
Agetian
7e58e204ed - Code style cleanup/unification in multiplayer Forge for Android. 2018-04-10 10:49:24 +03:00
Hanmac
b5be110f0c Replacement Effect instead of StaticDamage 2018-04-10 07:15:41 +02:00
Hanmac
81ea744e38 fixed Druid's Deliverance 2018-04-10 07:15:26 +02:00
Michael Kamensky
f014285143 Merge branch 'patch' into 'master'
DOM: Added some cards

See merge request core-developers/forge!370
2018-04-09 17:31:00 +00:00
Misha Colbourne
2f194a99d3 DOM: Added some cards 2018-04-09 16:00:31 +00:00
Michael Kamensky
63094bee7a Merge branch 'cube-update' into 'master'
- Update some ported draft cubes and add a new cube (Legacy 2018).

See merge request core-developers/forge!369
2018-04-09 09:00:15 +00:00
Agetian
7d2965ee34 - Update some ported draft cubes and add the February 2018 legacy cube. 2018-04-09 11:59:02 +03:00
Michael Kamensky
aabfb0ab1c Merge branch 'deckgenimprovements' into 'master'
Updated card deck generation files, plus fixed bug with recent generation code change

See merge request core-developers/forge!368
2018-04-09 08:43:09 +00:00
austinio7116
bd321edd20 Updated card deck generation files, plus fixed bug with recent generation code change 2018-04-09 09:31:58 +01:00
Michael Kamensky
334be5afc7 Merge branch 'CopyPermPopulate' into 'master'
CopyPerm: rewoke and update with Populate

See merge request core-developers/forge!367
2018-04-09 08:28:56 +00:00
Hanmac
0bc12e744e CopyPerm: rewoke and update with Populate 2018-04-09 07:50:44 +02:00
austinio7116
15772e20ac Merge branch 'vital-promo-sets' into 'master'
Vital promo sets

See merge request core-developers/forge!366
2018-04-09 05:24:26 +00:00
Rob Schnautz
75d3972196 Delete Promo set for Gatherer.txt 2018-04-08 20:47:06 +00:00
Rob Schnautz
e89d6f7de3 Update DragonCon 1994.txt 2018-04-08 20:36:56 +00:00
Rob Schnautz
1a5f79732a Add new file 2018-04-08 20:35:52 +00:00
Rob Schnautz
1e2077cf91 Add new file 2018-04-08 20:32:29 +00:00
Rob Schnautz
6dbdfe2fb4 Add new file 2018-04-08 20:31:55 +00:00
Rob Schnautz
e7702f97b0 Add new file 2018-04-08 20:31:15 +00:00
Rob Schnautz
e1c47289c9 Add new file 2018-04-08 20:30:30 +00:00
Michael Kamensky
2efa5f6f14 Merge branch 'assorted-fixes' into 'master'
- Added a missing reference to Chandra, Fire of Kaladesh.

See merge request core-developers/forge!365
2018-04-08 20:06:11 +00:00
Michael Kamensky
bb1ab54d13 Merge branch 'patch' into 'master'
DOM: Added some cards

See merge request core-developers/forge!364
2018-04-08 20:06:09 +00:00
Agetian
f49bd65526 - Added a missing reference to Chandra, Fire of Kaladesh. 2018-04-08 23:04:58 +03:00
Misha Colbourne
8bae5dd93b DOM: Added some cards 2018-04-08 18:03:34 +00:00
Michael Kamensky
37e4d49d3d Merge branch 'BrawlFormat' into 'master'
Fix to ensure randomly added cards in deck generation for commander/brawl are…

See merge request core-developers/forge!363
2018-04-08 06:40:15 +00:00
austinio7116
e0b7061ac3 Fix to ensure randomly added cards in deck generation for commander/brawl are not illegal repeat copies of the commander 2018-04-08 06:10:37 +01:00
Rob Schnautz
304aa4eeeb Update Dominaria.txt 2018-04-08 01:36:59 +00:00
Michael Kamensky
79b614e5c3 Merge branch 'FlipCoinAmount' into 'master'
FlipCoin: add Amount so Head and Tails abilities can use the amount

See merge request core-developers/forge!360
2018-04-07 18:38:34 +00:00
Michael Kamensky
af5b20fcd5 Merge branch 'patch' into 'master'
DOM: Added some cards

See merge request core-developers/forge!362
2018-04-07 18:31:13 +00:00
Misha Colbourne
f30e21ab4b DOM: Added some cards 2018-04-07 17:47:08 +00:00
Hanmac
6c04084891 FlipCoin: add Amount so Head and Tails abilities can use the amount 2018-04-07 11:14:07 +02:00
swordshine
70adc36089 Merge branch 'master' into 'master'
- Fixed Josu Vess

See merge request core-developers/forge!359
2018-04-07 03:31:22 +00:00
swordshine
f6b85ce384 - Fixed Josu Vess 2018-04-07 11:30:27 +08:00
swordshine
cce114ce04 Merge branch 'patch' into 'master'
DOM: Added some cards

See merge request core-developers/forge!358
2018-04-07 03:27:20 +00:00
swordshine
6ba0577270 Merge branch 'master' into 'master'
DOM: Added some cards

See merge request core-developers/forge!357
2018-04-07 02:47:14 +00:00
Misha Colbourne
ac0755c8d3 DOM: Added some cards 2018-04-07 00:20:17 +00:00
Rob Schnautz
03a17a88a1 Update Dominaria.txt 2018-04-06 21:37:58 +00:00
Misha Colbourne
f593cf4e09 DOM: Added some cards 2018-04-06 16:09:59 +00:00
Misha Colbourne
80d24dc8a1 DOM: Added some cards 2018-04-06 15:58:52 +00:00
Misha Colbourne
4b3ce9e701 DOM: Added some cards 2018-04-06 15:54:34 +00:00
Misha Colbourne
89c6ad5f9d Update rite_of_belzenlok.txt 2018-04-06 15:46:31 +00:00
Misha Colbourne
99e451005c Update memorial_to_glory.txt 2018-04-06 15:45:56 +00:00
Misha Colbourne
635c898016 DOM: Added some cards 2018-04-06 15:42:02 +00:00
Misha Colbourne
691c0501ea DOM: Added some cards 2018-04-06 14:58:04 +00:00
Misha Colbourne
7c8ddb2132 Update the_flame_of_keld.txt 2018-04-06 14:57:42 +00:00
Misha Colbourne
22ede8bf66 Update the_first_eruption.txt 2018-04-06 14:57:16 +00:00
Misha Colbourne
0cebf1552f DOM: Added some cards 2018-04-06 14:16:22 +00:00
Misha Colbourne
e8fb4f50b3 Update the_flame_of_keld.txt 2018-04-06 14:03:07 +00:00