external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,509 Commits 34 Branches 187 Tags
057f5face3ee3f858e546b0e45aabce8f62cec7c
Commit Graph

36509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
4e824ae7d2 Merge branch 'adjust-upcoming-set-handling' into 'master' 
Only allow core or expansions to be upcoming sets

See merge request core-developers/forge!329
 2018-03-30 05:59:38 +00:00
Chris H
4b77ccb5f6 Only allow core or expansions to be upcoming sets 2018-03-29 21:29:07 -04:00
austinio7116
3ea9f7d218 Removed unwanted whitespace and imports 2018-03-29 21:06:41 +01:00
Michael Kamensky
84a49752d0 Merge branch 'network-play' into 'master' 
Network Play Fixes

Closes #390

See merge request core-developers/forge!327
 2018-03-29 20:02:42 +00:00
Jamin Collins
736513f8e1 Merge branch 'cantTgtNullPointerNoValidTgt' into 'master' 
Prevent crash when no validTgts in params for spell ability

See merge request core-developers/forge!328
 2018-03-29 15:29:04 +00: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
e9773e57b7 make dual list dialog sizing dynamic, like single 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-29 09:26:53 -06: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
Jamin W. Collins
f6d8a85423 remove trailing whitespace 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-29 09:26:53 -06:00
austinio7116
8e074e2093 Removed unwanted import 2018-03-29 11:15:06 +01: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
elliot
a1d7f2c774 Prevent crash when no validTgts in params for static ability 
Issue reproducable casting chandra's ignition into a board with only a hexproof creature
 2018-03-28 21:32:25 -04: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
Jamin W. Collins
7b9bfaaa18 ensure WrappedAbility has reasonable description set 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-03-27 17:39:12 -06:00
austinio7116
edf6d48e6b Remove commander damage rule from Brawl 2018-03-28 00:01:39 +01:00
austinio7116
ba41a27981 Corrected name of brawl deck builder button 2018-03-27 23:53:27 +01:00
maustin
f72ca1d2ae Merge remote-tracking branch 'origin/BrawlFormat' into BrawlFormat 2018-03-27 23:05:24 +01:00
austinio7116
e2ee43fb2d Code cleanup 2018-03-27 23:04:16 +01:00
austinio7116
6a38654a23 Code cleanup 2018-03-27 06:50:39 +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
Sol
eb12b7a7ec Merge branch 'quotefix' into 'master' 
Use double quotes to prevent users with apostrophes from causing issues.

Closes #385

See merge request core-developers/forge!326
 2018-03-27 01:43:20 +00:00
KrazyTheFox
2d23ce0084 Use double quotes to prevent users with apostrophes from causing issues. 
Pesky users.
 2018-03-26 21:40:31 -04:00
swordshine
b94aa70c65 Merge branch 'patch' into 'master' 
DOM: Added some cards

See merge request core-developers/forge!323
 2018-03-27 00:57:59 +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
Misha Colbourne
1830eb7186 Update niambi_faithful_healer.txt 2018-03-26 22:45:00 +00:00
Misha Colbourne
d5f93b722c DOM: Added some cards 2018-03-26 22:37:14 +00:00
Misha Colbourne
7271b6f585 DOM: Added some cards 2018-03-26 22:01:30 +00:00
austinio7116
5b8342188c Fixed adding planeswalker commanders from pool in android brawl deck editor 2018-03-26 22:59:16 +01:00
Misha Colbourne
acae61c26a DOM: Added some cards 2018-03-26 21:58:53 +00:00
austinio7116
756c272821 Fixed brawl deck editor and deckformat rules for brawl 2018-03-26 20:39:34 +01:00
Michael Kamensky
d71026f7ae Merge branch 'patch' into 'master' 
- Reset the activations so that flickering a planeswalker can activate the loyalty ability again

See merge request core-developers/forge!322
 2018-03-26 18:16:15 +00:00
Misha Colbourne
71edc398d0 DOM: Added some cards 2018-03-26 17:34:24 +00:00