Commit Graph

37784 Commits

Author SHA1 Message Date
Michael Kamensky
ccd3e87403 Merge branch 'javadoc' into 'master'
Add javadoc compatible comments

See merge request core-developers/forge!612
2018-06-01 04:15:26 +00:00
Rob Schnautz
6e2f668e72 Add javadoc compatible comments 2018-06-01 04:02:25 +00:00
Hans Mackowiak
4896e47b41 Merge branch 'partnerWithCommander' into 'master'
Partner with commander

See merge request core-developers/forge!600
2018-05-31 18:44:10 +00:00
Hanmac
0b72fee8a3 Player: use sameTeam logic 2018-05-31 20:42:16 +02:00
Agetian
56e5bfa234 - Krav: for now, marked the activated ability as AI-unplayable and added a TODO. 2018-05-31 21:36:06 +03:00
schnautzr
d9deb6149c "player or planeswalker" 2018-05-31 13:35:46 -05:00
Rob Schnautz
3c9bf4f9c8 Upload New File 2018-05-31 17:55:27 +00:00
Rob Schnautz
e70f89b67c Upload New File 2018-05-31 17:55:15 +00:00
Rob Schnautz
4521cc88fa Upload New File 2018-05-31 17:55:01 +00:00
Rob Schnautz
5cd3a38fc1 Upload New File 2018-05-31 17:54:44 +00:00
Rob Schnautz
4067aca8fc Upload New File 2018-05-31 17:54:31 +00:00
Rob Schnautz
7fdc63c8a5 Upload New File 2018-05-31 17:54:12 +00:00
Rob Schnautz
c29cdcb757 Upload New File 2018-05-31 17:53:46 +00:00
Rob Schnautz
f4443ea97b Upload New File 2018-05-31 17:53:12 +00:00
Rob Schnautz
a83e193133 Replace with images that help with visual identification 2018-05-31 17:52:26 +00:00
OgreBattlecruiser
b985642e5e Added Arcane Artisan 2018-05-31 18:28:13 +01:00
schnautzr
d49e20cfa4 "player or planeswalker" 2018-05-31 11:14:06 -05:00
OgreBattlecruiser
af34fda5aa Added Rowan and Bramble Sovereign 2018-05-31 16:53:00 +01:00
schnautzr
7f7d2bf1dd "player or planeswalker" 2018-05-31 10:45:23 -05:00
Hans Mackowiak
8dbbfd5c07 Merge branch 'no_card.jpg' into 'master'
Update to M15 style

See merge request core-developers/forge!609
2018-05-31 05:45:25 +00:00
Rob Schnautz
02ae4d8460 Update to M15 style 2018-05-31 05:22:22 +00:00
schnautzr
e34adad368 "player or planeswalker" 2018-05-30 11:58:23 -05:00
schnautzr
55ec69ec79 typo 2018-05-30 11:05:25 -05:00
schnautzr
a9cf83aec2 "player or planeswalker" 2018-05-30 10:59:34 -05:00
Hans Mackowiak
35fc6ee211 Merge branch 'fixtests' into 'master'
Fixed broken tests due to oracle changes

See merge request core-developers/forge!608
2018-05-30 07:54:24 +00:00
austinio7116
e61c2f1554 Fixed broken tests due to oracle changes 2018-05-30 08:44:01 +01:00
austinio7116
e6af43b060 Implemented hand filtering properly using deck land ratio
Made hand filtering optional and disabled by default
2018-05-30 07:19:54 +01:00
maustin
e11fe9db8b Merge remote-tracking branch 'Austin/filteredhands' into filteredhands 2018-05-30 06:53:33 +01:00
austinio7116
14ba4e6894 Removed flicker when filtering starting hand 2018-05-30 06:50:25 +01:00
austinio7116
18e2d127be Experimental MTG Arena style double hand filtering 2018-05-30 06:50:25 +01:00
Hanmac
b77d191754 Pir: fixed mana cost 2018-05-30 07:18:07 +02:00
Hanmac
b04f644242 cards: Regna & Krav, fixed YourTeamGainedLife 2018-05-30 07:17:04 +02:00
Hanmac
570677fe15 Player: added LifeGainedByTeamThisTurn logic 2018-05-30 07:17:04 +02:00
Hanmac
a5848f4467 FlipCoin: fixed if it has no SubAbility 2018-05-30 07:17:04 +02:00
Hanmac
b956760d1e cards: Zndrsplt & Okaun 2018-05-30 07:17:04 +02:00
Hanmac
3118aa7b35 cards: add Pir and Toothy 2018-05-30 07:17:04 +02:00
swordshine
9b08ace35c Merge branch 'updateddeckgendata' into 'master'
Pre pro tour deckgeneration update

See merge request core-developers/forge!605
2018-05-30 01:11:20 +00:00
swordshine
39d1a7b3da Merge branch 'oracle-updates-functional' into 'master'
Oracle updates functional

See merge request core-developers/forge!604
2018-05-30 01:10:48 +00:00
swordshine
f0216cb3da Merge branch 'patch-1' into 'master'
Update forerunner_of_the_heralds.txt

See merge request core-developers/forge!606
2018-05-30 01:08:50 +00:00
Rob Schnautz
03a45a1185 Update forerunner_of_the_heralds.txt 2018-05-30 00:14:38 +00:00
austinio7116
f580d49a56 Pre pro tour deckgeneration update 2018-05-29 23:48:59 +01:00
schnautzr
284829fc65 prevent damage to "any target" 2018-05-29 17:24:06 -05:00
schnautzr
29e5316439 "ValidTgts\$ Player" 2018-05-29 15:55:44 -05:00
schnautzr
eedd169f15 "ValidTgts\$ Player" 2018-05-29 15:52:14 -05:00
schnautzr
d0227a7f99 "ValidTgts\$ Player" 2018-05-29 15:45:37 -05:00
schnautzr
8f6ba8553a "any target" 2018-05-29 15:27:09 -05:00
Rob Schnautz
0c9d134429 Merge branch 'oracle-c' into 'oracle-updates-functional'
Oracle c

See merge request core-developers/forge!603
2018-05-29 19:29:41 +00:00
schnautzr
e1aa757a3d "any target" 2018-05-29 14:29:11 -05:00
Hanmac
69d3db30cd Cards: Oracle update C 2018-05-29 21:23:59 +02:00
schnautzr
3906cf9cc0 Merge branch 'oracle-updates-functional' of https://git.cardforge.org/core-developers/forge into oracle-updates-functional 2018-05-29 14:13:26 -05:00