Commit Graph

3060 Commits

Author SHA1 Message Date
Sol
f7099b4555 Merge branch 'network-play' into 'master'
use CardView for selection of exterting attackers

See merge request core-developers/forge!345
2018-04-04 02:37:47 +00:00
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
swordshine
2b8afc3972 Merge branch 'patch' into 'master'
Fixed a crash when Momir Avatar copys an etbcounter card

See merge request core-developers/forge!344
2018-04-04 01:03:33 +00:00
swordshine
771341f2e9 - Fixed a crash when MMomir Avatar copys an etbcounter card 2018-04-04 09:02:35 +08:00
Hanmac
8c601f86f6 Do Saga Abilities 2018-04-03 15:19:54 +02: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
a73667610b Added MoJhoSto variant 2018-04-02 07:19:09 +01:00
swordshine
0e98da8bca - Yisan, the Wanderer Bard's + Rings of Brighthearth now works 2018-04-02 13:54:09 +08:00
swordshine
eeec3feb1f - Fixed a crash (varolz, the scar-striped + dryad arbor) 2018-04-02 11:55:44 +08:00
austinio7116
d11013c689 Updated gameformats with new enum type to separate sanctioned, casual, historic and custom. 2018-03-31 21:23:22 +01:00
austinio7116
c78d235b07 Moved formats into single files with new "Order", "Core" and "Name" properties. 2018-03-30 21:57:13 +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
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 W. Collins
f6d8a85423 remove trailing whitespace
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-29 09:26:53 -06: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
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
5b8342188c Fixed adding planeswalker commanders from pool in android brawl deck editor 2018-03-26 22:59:16 +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
swordshine
ab96026176 - Reset the activations so that flickering a planeswalker can activate the loyalty ability again 2018-03-26 22:47:45 +08:00
swordshine
5942df216a Merge branch 'apiTypeCaseCrashFix' into 'master'
Api type case crash fix

See merge request core-developers/forge!321
2018-03-26 14:45:33 +00:00
swordshine
319b450532 Merge branch 'patch' into 'master'
Patch

See merge request core-developers/forge!319
2018-03-26 14:44:22 +00:00
austinio7116
364bf3724f Added UI elements required for Brawl variant 2018-03-26 06:57:15 +01:00
elliot
45cfc56e2d Merge branch 'master' of https://git.cardforge.org/core-developers/forge into apiTypeCaseCrashFix 2018-03-25 23:20:39 -04:00
elliot
b40f460c59 Simple fix for issue where the case of lifeloss for afflict creatures did not match apiType case, causing crashes 2018-03-25 23:08:06 -04:00
Sol
c980d1c9d4 Merge branch 'sysout-cleanup' into 'master'
Sysout cleanup

See merge request core-developers/forge!286
2018-03-26 01:18:19 +00:00
austinio7116
81373d2b69 Initial fiddling with Brawl game formats 2018-03-25 19:58:52 +01:00
swordshine
318377cb7e - Deepglow Skate should work with Doubling Season 2018-03-25 22:44:21 +08:00
swordshine
3af07078c1 - Added Naban, Dean of Iteration (the Changetext effect was tested) 2018-03-25 22:07:29 +08:00
Hanmac
5b159a0e64 CardProperty: add CastSA to card
ForgeScript: add mayPlaySource
2018-03-24 18:00:09 +01:00
Michael Kamensky
b6e80a9e3f Merge branch 'fix-fertile-ground-on-nonbasics' into 'master'
When copying costs, make sure to recache the TapCost state.

See merge request core-developers/forge!315
2018-03-24 05:15:06 +00:00
Chris H
8e15326b0f When copying costs, make sure to recache the TapCost state. 2018-03-24 00:03:57 -04:00
Sol
edca8e15e1 Merge branch 'apitype-static-init' into 'master'
ApiType Tweaks

See merge request core-developers/forge!287
2018-03-24 00:26:10 +00:00
Agetian
7010e9ffd3 - Added Indestructible to the Keyword enum. 2018-03-23 11:22:54 +03:00
Hanmac
8316c9cffa Counter Effects: update Last State
Tribute: use LKI canReceiveCounters for Tribute check
2018-03-23 07:37:59 +01:00
Hanmac
7bd0161243 CounterMoveEffect: update Last State source and target 2018-03-22 07:50:32 +01:00
Blacksmith
9e786bbdff [maven-release-plugin] prepare for next development iteration 2018-03-20 01:14:26 +00:00
Blacksmith
6e6af1c6c4 [maven-release-plugin] prepare release forge-1.6.8 2018-03-20 01:14:23 +00:00
Michael Kamensky
8a41f8f476 Merge branch 'generated-stack-text' into 'master'
improve the generated stack text for Brainstorm

Closes #350

See merge request core-developers/forge!303
2018-03-19 06:04:58 +00:00
Jamin W. Collins
49f050655c improve the generated stack text for Brainstorm
Fixes: core-developers/forge#350

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-18 15:21:15 -06:00
Jamin W. Collins
f270213bb7 Improve can't win/lose effects for multiplayer
Fixes: core-developers/forge#170

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-18 13:38:49 -06:00
Hanmac
9af8fddaf3 Hexproof: is now done as CantTarget with special shared handling 2018-03-18 15:31:19 +01:00
Agetian
b959f61049 - Doomsday search effect should not be optional.
- Temporarily make it impossible to use the new mass selection code with cards that have the ChangeNum parameter on AF ChangeZone because it allows the human to select an arbitrarily small or big amount of cards without any limitation.
2018-03-17 16:32:50 +03:00
Jamin W. Collins
a564f49381 allow human players to make mass select, sometimes
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-14 20:32:25 -06:00
Hanmac
9f7e02933f CostDamage: use spellAbility as cause 2018-03-14 07:15:04 +01:00
Hanmac
0b64ffb4c7 DamageMap: use cause for Lifelink part 2018-03-14 07:15:03 +01:00
Hanmac
fffa4cf157 Card: move changed text and remove PreventAllDamageBy 2018-03-14 07:15:03 +01:00
Hanmac
c74b0a017b Damage: add Cause Param for damage deal, needed for Silhouette or Bronze Horse 2018-03-14 07:15:03 +01:00
Hans Mackowiak
8ac13c0d6d RepeatEachEffect: reset damageMap after being used 2018-03-14 07:15:02 +01:00