external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 31 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

5679 Commits

Author SHA1 Message Date
Hans Mackowiak
f1690f2d84 CounterPutEffect: add Choicer Param 2020-04-14 06:25:53 +00:00
Anthony Calosa
17b2a2b023 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-13 22:21:25 +08:00
Hans Mackowiak
f3729d0059 SpellAbility: fix MaxTotalTargetCMC 2020-04-13 11:57:43 +00:00
Anthony Calosa
d6c5d7f04d Network Improvements 2020-04-13 15:42:56 +08:00
Tim Mocny
4be26f575c IKO - Mythos cycle tweaks 2020-04-13 04:42:16 +00:00
Hans Mackowiak
0d1105377e SpellAbility: do xPaid inside spellAbility 2020-04-12 15:19:04 +00:00
Tim Mocny
0db2e0d95b IKO - Counters revisions 2020-04-11 23:50:29 +00:00
Hans Mackowiak
a0ea1f1d3f ChooseGenericEffect: when using AtRandom with IsPresent Requirement add check when no choices left 2020-04-11 20:08:18 +02:00
Hans Mackowiak
1ac8026b7f IKO: Mythos cycle 2020-04-11 10:21:38 +00:00
Tim Mocny
db25466646 IKO - 7 April 2020-04-09 05:04:35 +00:00
CCTV-1
7642d588a4 Merge remote-tracking branch 'upstream/master' 2020-04-06 18:12:05 +08:00
Hans Mackowiak
5c79cb7de6 Revert "Merge branch 'revert-93f1bb70' into 'master'" 
This reverts merge request !2668
 2020-04-06 05:27:39 +00:00
Sol
8523288884 Revert "Merge branch 'keywordCounter' into 'master'" 
This reverts merge request !2667
 2020-04-05 23:56:37 +00:00
Hans Mackowiak
3bb42a95c9 CounterPutEffect: add Choices with inbuilt ChosenCard Effect 2020-04-05 21:57:32 +02:00
Hans Mackowiak
6ce62b7316 Keyword Counter: special counters add keywords to cards 2020-04-05 17:29:21 +02:00
Hans Mackowiak
bf60039ee7 GameActionUtil: fix CyclingForZero 2020-04-04 14:17:47 +00:00
CCTV-1
9a2f2368e9 Merge remote-tracking branch 'upstream/master' 2020-04-04 16:47:07 +08:00
Tim Mocny
5ab7bcaf3f Zilortha, Strength Incarnate 2020-04-04 03:51:32 +00:00
CCTV-1
0aee987536 Merge remote-tracking branch 'upstream/master' 2020-04-02 21:32:41 +08:00
Tim Mocny
41dbc468bd Silverblade Paladin detail cleanup 2020-03-31 17:15:35 +00:00
Tim Mocny
24db729e96 Tawnos's Coffin! 2020-03-31 13:11:46 +00:00
Anthony Calosa
6bf72e6828 space 2020-03-31 14:49:24 +08:00
Anthony Calosa
bf7b446586 period 2020-03-31 14:46:42 +08:00
Anthony Calosa
ec463b414f Refactor description 2020-03-31 14:44:37 +08:00
Anthony Calosa
faf8c57907 Fix stack description 
Fix "null damage" & "null counter" stack description, and Volcano Hellion crash
 2020-03-31 13:36:45 +08:00
friarsol
1c61030aae A player who lost cannot initiate combat 2020-03-30 21:40:46 -04:00
CCTV-1
040b4cf7fb Merge remote-tracking branch 'upstream/master' into display_localization_cardname 2020-03-21 22:18:46 +08:00
Tim Mocny
7fb34b4887 MTGA Historic Format 2020-03-20 19:11:59 +00:00
CCTV-1
5005cf9102 Merge remote-tracking branch 'upstream/master' 2020-03-20 11:07:17 +08:00
Blacksmith
4cfcbaf603 [maven-release-plugin] prepare for next development iteration 2020-03-20 00:35:58 +00:00
Blacksmith
22dc1a27a0 [maven-release-plugin] prepare release forge-1.6.33 2020-03-20 00:35:52 +00:00
Hans Mackowiak
b0d3fbe783 Update DebuffEffect: fix if it doesn't use target 2020-03-19 06:38:22 +00:00
Hans Mackowiak
33d83dc0c5 Vote: replace hidden keywords with timestamped properties 2020-03-19 06:22:44 +00:00
CCTV-1
27eda6f9b2 Merge remote-tracking branch 'upstream/master' 2020-03-14 12:18:50 +08:00
Hans Mackowiak
a1ffa625e1 CardFactoryUtil: fix Saga 2020-03-13 20:34:34 +00:00
Hans Mackowiak
81dc9fecba Sage Trigger Combined 2020-03-13 15:11:05 +00:00
Hans Mackowiak
9f35da4698 ManaPart: use Effect for enter the battlefield when mana was spent 2020-03-12 13:34:27 +00:00
Hans Mackowiak
5c9251e295 SpellAbility: adding an Announce needs to be to originalMapParams too 2020-03-10 07:13:04 +01:00
Hans Mackowiak
fa67ee73a5 Card: cleanup multikicker values 2020-03-10 07:13:04 +01:00
Hans Mackowiak
e1659a4539 Combat: use lkiCase only if blocker itself is an lki 2020-03-10 07:13:04 +01:00
Hans Mackowiak
d5b578b306 Card: move reseting xmana paid to clearTemporaryVars 2020-03-10 07:13:04 +01:00
Hans Mackowiak
32b56018a6 GameAction: refactor setting CastSA 2020-03-10 07:13:04 +01:00
Agetian
8b922fc8f2 - Fix AddsCounters 2020-03-09 21:13:29 +03:00
CCTV-1
e0c9d5e6e0 Merge remote-tracking branch 'upstream/master' 2020-03-08 16:11:00 +08:00
Sol
e676073548 Merge branch 'network-play-fixes' into 'master' 
Network play fixes

See merge request core-developers/forge!2582
 2020-03-05 02:51:16 +00:00
Jamin W. Collins
4f3a8590dd semi-ignore non-fatal IndexOutOfBoundsException 
Not entirely sure why there are IndexOutOfBoundsException being seen
currently, but they are not fatal and do not appear to result in game
state skew between client and server.  So, logging and moving on.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-04 19:08:02 -07:00
Hans Mackowiak
4f0deea15f CardProperty: extend blockedValidThisTurn and blockedByValidThisTurn using defined 2020-03-03 14:30:39 +00:00
Hans Mackowiak
075a0e99af Merieke Ri Berit: use Effect for Destroy Trigger 2020-03-01 17:37:06 +01:00
Hans Mackowiak
23bc7a629b Fix controllerChangeZoneCorrection when ControlGain is undone 2020-03-01 11:47:51 +01:00
Hans Mackowiak
93f0ade107 MustBlockEffect: use Choose Card for Crashing Boars 2020-03-01 10:30:45 +00:00