external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,806 Commits 31 Branches 187 Tags
fc8142db8b51a38b04afa8cd66e19de340ab6fc3
Commit Graph

3159 Commits

Author SHA1 Message Date
Michael Kamensky
3f675c0102 Merge branch 'guildofravnica' into 'master' 
Added Etrata the Silencer, including new HIT counters

See merge request core-developers/forge!949
 2018-09-26 06:13:24 +00:00
Jamin W. Collins
79267ac29f avoid CME in checkStaticAbilities() 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-25 21:41:38 -06:00
Jamin W. Collins
701418ab63 avoid CME in cleanUpTemporaryReplacements() 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-25 21:26:43 -06:00
austinio7116
848b495b52 Added Etrata the Silencer, including new HIT counters 2018-09-25 08:28:44 +01:00
tehdiplomat
939cdb6822 When Planeswalkers aren't on the battlefield, show their base loyalty 2018-09-22 22:58:15 -04:00
Hanmac
4508d54543 TokenRE: now can be replaced with TokenScript 2018-09-22 14:33:18 +02:00
Michael Kamensky
72f28b6c44 Merge branch 'someSmallFixes' into 'master' 
Some small fixes

Closes #720, #715, and #691

See merge request core-developers/forge!928
 2018-09-21 04:14:12 +00:00
Hans Mackowiak
a28c010b59 Upate cleanUpTemporaryTriggers to prevent Modification Exception 2018-09-19 08:02:54 +00:00
Hanmac
643dfc5092 some small fixes 2018-09-18 23:34:13 +02:00
Hanmac
ee9f79a514 Surveil: add ReplaceEffect for adding +2 2018-09-15 18:33:57 +02:00
Michael Kamensky
5a500b857b Merge branch 'checkstyle' into 'master' 
implement basic checkstyle configuration

See merge request core-developers/forge!911
 2018-09-13 12:45:22 +00:00
Hanmac
612165ba25 Surveil Trigger with OnlyFirst 2018-09-13 08:15:51 +02:00
Michael Kamensky
71397ec648 Merge branch 'sentry-bug-fixes' into 'master' 
Sentry Bug Fixes

Closes #705

See merge request core-developers/forge!914
 2018-09-12 19:36:05 +00:00
Michael Kamensky
27d2ba384d Merge branch 'multi-select' into 'master' 
Multi select

Closes #703

See merge request core-developers/forge!913
 2018-09-12 19:35:39 +00:00
Jamin W. Collins
5c723d8883 log malformed card rather than throw an exception 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-12 07:40:31 -06:00
Jamin Collins
d011f9948d Merge branch 'sentryKeyword' into 'master' 
Sentry keyword

See merge request core-developers/forge!910
 2018-09-12 01:13:42 +00:00
Jamin W. Collins
a6423b82f0 correct the new default messaging format 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-11 18:30:19 -06:00
Jamin W. Collins
fc62a41e46 implement basic checkstyle configuration 
Remove all unused or redundant imports

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-11 18:16:43 -06:00
Hanmac
998176a7d7 Keyword: use Sentry in createTraits 2018-09-11 10:32:46 +02:00
Agetian
ac3c6c3d21 - Minor typo fix in GameLogFormatter related to Surveil. 2018-09-10 18:11:59 +03:00
Michael Kamensky
810d55931d Merge branch 'fixups' into 'master' 
Fixups

Closes #680, #676, and #673

See merge request core-developers/forge!905
 2018-09-09 05:27:21 +00:00
Jamin W. Collins
e4b146128c avoid an NPE when no cards are chosen 
Closes: core-developers/forge#680

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-08 10:56:59 -06:00
Hanmac
61a627a36a Surveil Effect 2018-09-08 15:50:32 +02:00
Blacksmith
e7d09e8918 [maven-release-plugin] prepare for next development iteration 2018-09-08 00:24:29 +00:00
Blacksmith
c2f62998fc [maven-release-plugin] prepare release forge-1.6.15 2018-09-08 00:24:26 +00:00
Jamin Collins
925ae63071 Merge branch 'token_phase_two' into 'master' 
Add more support for migrating Editions to TokenScripts

See merge request core-developers/forge!885
 2018-09-06 01:16:27 +00:00
Hanmac
af76c37cbb ReplaceDying moved to SpellAbilityEffect 2018-09-05 07:24:55 +02:00
Hanmac
3802b88487 Jump-start: it is more an additional cost like retrace 2018-09-04 21:53:18 +02:00
Agetian
36132359a7 - Fixed Jump-start description. 2018-09-04 10:01:31 +03:00
Hanmac
7dedaeb111 Keyword: Jump-start 2018-09-04 07:19:58 +02:00
tehdiplomat
e4e33ebac0 Fix conflicts that got missed previously 2018-09-03 11:45:23 -04:00
tehdiplomat
e601a6deae Some breadcrumbs for future Token Script development 2018-09-03 11:38:13 -04:00
Hanmac
e98431e525 CardFactoryUtil: add Mentor Keyword 2018-09-02 18:14:05 +02:00
Hanmac
6ec0dd49d7 Prowl is a Keyword now 2018-09-02 14:45:56 +02:00
Hanmac
f967d9885a CardProperty: fixed surged 2018-08-30 21:18:08 +02:00
Hanmac
73b94a63a5 Surge: don't use OptionalCost there 2018-08-30 20:25:30 +02:00
Jamin W. Collins
5f6ea460dd properly message and limit human multi-select 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-27 08:18:40 -06:00
Hanmac
9acb1dca93 Dredge use : 2018-08-26 15:20:20 +02:00
Jamin W. Collins
eaeb2838e0 fix human player multi-select 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-25 05:51:07 -06:00
Hanmac
367875c15c CardFactoryUtil: Rampage use : 2018-08-22 12:37:59 +02:00
Michael Kamensky
e968afbd87 Merge branch 'timestampStateFix' into 'master' 
Timestamp state fix

Closes #594 and #647

See merge request core-developers/forge!860
 2018-08-21 20:26:42 +00:00
Michael Kamensky
95e9a0bcc8 Merge branch 'EquipInstantSpeed' into 'master' 
GameActionUtil: EquipInstantSpeed should affect the player

See merge request core-developers/forge!871
 2018-08-21 16:41:40 +00:00
Hanmac
2603d14b7e GameActionUtil: EquipInstantSpeed should affect the player 2018-08-21 17:43:17 +02:00
Hanmac
ed04025b3b GameActionUtil: fix CyclingForZero 2018-08-21 15:18:49 +02:00
Hanmac
04202f0fb4 WrappedAbility: exclude Token from WrappedCheck 2018-08-18 19:39:00 +02:00
Hanmac
68e40254f8 CardFactoryUtil: more LKI for Triggered Keywords 2018-08-18 11:11:25 +02:00
Hanmac
fb3e0f1445 WrappedAbility: return timestampCheck but with extra checks 2018-08-18 08:46:38 +02:00
Hanmac
0f3ac8c212 WrappedAbility: remove faulty check 2018-08-18 08:46:38 +02:00
Hanmac
baf4a17ceb Effects: add gameCardState check with equalWithTimestamp 2018-08-18 08:46:38 +02:00
Hanmac
e2c33b089c Card: fix equalsWithTimestamp and timestamp of LKI 2018-08-18 08:46:38 +02:00