Commit Graph

8459 Commits

Author SHA1 Message Date
Jamin W. Collins
3f8a3f3342 use CardView for selection of exterting attackers
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-04-03 20:12:15 -06:00
Hanmac
8c601f86f6 Do Saga Abilities 2018-04-03 15:19:54 +02:00
Michael Kamensky
4537c364ec Merge branch 'bugfixes2' into 'master'
Catch UPNP error on android to allow hosting network game

See merge request core-developers/forge!341
2018-04-03 04:45:12 +00:00
Rob Schnautz
0eb66aebff Update Dominaria.txt 2018-04-03 03:51:30 +00:00
Sol
eb4fc9f7ce Merge branch 'momirvariant' into 'master'
Added MoJhoSto variant

See merge request core-developers/forge!338
2018-04-03 01:14:19 +00:00
austinio7116
e6ddc61e86 Catch UPNP error on android to allow hosting network game 2018-04-02 23:31:06 +01:00
austinio7116
9b89e79f44 Readded extended format 2018-04-02 22:23:16 +01:00
austinio7116
79ed54097a Readded extended format to fix quests 2018-04-02 22:19:46 +01:00
austinio7116
a73667610b Added MoJhoSto variant 2018-04-02 07:19:09 +01:00
Sol
af70a1f58b Merge branch 'BrawlFormat' into 'master'
Moved formats into separate folder so that custom formats can be added

See merge request core-developers/forge!331
2018-04-01 02:53:55 +00:00
austinio7116
ff1e6b835c Fixed label of rhonas's last stand effect 2018-03-31 22:02:37 +01:00
austinio7116
f76992d9de Updated gameformats with new enum type to separate sanctioned, casual, historic and custom. 2018-03-31 21:41:37 +01:00
austinio7116
d11013c689 Updated gameformats with new enum type to separate sanctioned, casual, historic and custom. 2018-03-31 21:23:22 +01:00
Jamin W. Collins
4b7a020f8e Crackling Doom - call logic for creature sacrifice
Fixes: core-developers/forge#401

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-31 10:46:32 -06:00
swordshine
e59477801e - Fixed Evra, Halcyon Witness 2018-03-31 22:40:29 +08:00
austinio7116
81326c996d Updated CHANGES.txt 2018-03-31 07:09:56 +01:00
austinio7116
9fbac2aeaa Updated CHANGES.txt 2018-03-31 07:08:46 +01:00
austinio7116
6248cf31c3 Code and properties cleanup 2018-03-31 06:55:01 +01:00
maustin
f3d11dbe5b Merge branch 'master' into BrawlFormat 2018-03-30 22:07:13 +01:00
austinio7116
c78d235b07 Moved formats into single files with new "Order", "Core" and "Name" properties. 2018-03-30 21:57:13 +01:00
Jamin W. Collins
2f5a83e171 Show external IP when hosting, if possible
Fixes: core-developers/forge#396

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-30 08:37:17 -06:00
austinio7116
3810475ee8 Better example format files to incude pauper and an example block format 2018-03-30 10:08:08 +01:00
austinio7116
057f5face3 Fixed folder format loading to ensure core sets load first (otherwise android may not load standard correctly) 2018-03-30 09:53:35 +01:00
maustin
021c133db3 Merge branch 'master' into BrawlFormat 2018-03-30 08:06:39 +01:00
austinio7116
9082a89c59 Moved formats into separate folder so that additional custom format files can be added - added Pauper and Kaladesh_Standard as examples 2018-03-30 07:49:54 +01:00
Michael Kamensky
70eec78416 Merge branch 'BrawlFormat' into 'master'
Brawl format

See merge request core-developers/forge!324
2018-03-30 06:35:07 +00:00
Rob Schnautz
1bac0903a0 Update Dominaria.txt 2018-03-30 02:37:48 +00:00
Rob Schnautz
d0ddadeb13 Add new file 2018-03-30 02:25:26 +00:00
austinio7116
3ea9f7d218 Removed unwanted whitespace and imports 2018-03-29 21:06:41 +01:00
austinio7116
e26887036e Now using filterrules rather than printing rules to determine if a card is brawl legal - still using printing rules to determine which basic lands to use in generated decks 2018-03-29 16:28:32 +01:00
Jamin W. Collins
1d5a3b0184 ensure that SAVs are used for player decision
Fixes: core-developers/forge#390

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-29 09:26:53 -06:00
austinio7116
70bd88e2d9 Fixed failing tests due to missing StaticData. Fixed Commander-based fully random deck generation. 2018-03-29 08:47:15 +01:00
austinio7116
9e053865e1 Code cleanup 2018-03-29 07:00:37 +01:00
austinio7116
08dc5f5654 Fixed deckformat to fully support Brawl requiring standard legal cards. Deck generation for brawl working on desktop and android. 2018-03-29 06:33:02 +01:00
austinio7116
ed564b904f Random brawl deck generator working on Desktop 2018-03-28 23:41:57 +01:00
maustin
b9aef9b317 Merge branch 'master' into BrawlFormat 2018-03-28 06:44:42 +01:00
austinio7116
e2ee43fb2d Code cleanup 2018-03-27 23:04:16 +01:00
Michael Kamensky
3e9e1ee865 Merge branch 'dom-oracle-updates' into 'master'
DOM Oracle changes (non-functional)

See merge request core-developers/forge!325
2018-03-27 05:07:01 +00:00
Rob Schnautz
0890dcee95 Update woodland_cemetery.txt 2018-03-27 00:40:58 +00:00
Rob Schnautz
6cd44b4564 Update sulfur_falls.txt 2018-03-27 00:40:25 +00:00
Rob Schnautz
54a56a8cd4 Update isolated_chapel.txt 2018-03-27 00:39:30 +00:00
Rob Schnautz
80552bc2f1 Update hinterland_harbor.txt 2018-03-27 00:38:32 +00:00
Rob Schnautz
7cc8e606f1 Update clifftop_retreat.txt 2018-03-27 00:37:59 +00:00
Rob Schnautz
eaaf52ae3d Update timber_gorge.txt 2018-03-27 00:36:26 +00:00
Rob Schnautz
e8dc787d8c Update meandering_river.txt 2018-03-27 00:35:48 +00:00
Misha Colbourne
c8a213ce86 Update teferi_timebender.txt 2018-03-26 23:15:43 +00:00
Misha Colbourne
0a1a4a4ad1 DOM: Added some cards 2018-03-26 23:08:40 +00:00
Misha Colbourne
32644f17fe DOM: Added some cards 2018-03-26 22:54:27 +00:00
Misha Colbourne
cc3196da95 Update karplusan_hound.txt 2018-03-26 22:53:18 +00:00
Misha Colbourne
e8e854cfa2 DOM: Added some cards 2018-03-26 22:48:49 +00:00