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
49,974 Commits 31 Branches 187 Tags
a5f4375ff27f2894ff94dd19a6c35cbef390b51a
Commit Graph

4900 Commits

Author SHA1 Message Date
friarsol
3c171b2cbc Update companion rules to move to hand for 3 mana 2020-06-28 22:47:44 -04:00
Blacksmith
4049d23562 [maven-release-plugin] prepare release forge-1.6.35 2020-06-29 02:47:40 +00:00
swordshine
54e8c6f0ec Merge branch 'patch' into 'master' 
Add Ormos, Archive Keeper

See merge request core-developers/forge!2927
 2020-06-29 01:00:15 +00:00
Hans Mackowiak
f29cd22926 ImmediateTrigger: use this trigger for heart-piercer manticore and get rid of CauseParam 2020-06-28 17:53:47 +02:00
swordshine
558fbd3946 Add Ormos, Archive Keeper 2020-06-28 20:40:56 +08:00
swordshine
24d2c8dc2f Add Towering Titan 2020-06-28 14:06:42 +08:00
swordshine
2fb6849ae2 Merge branch 'patch' into 'master' 
Add Inniaz, the Gale Force

See merge request core-developers/forge!2921
 2020-06-28 01:44:50 +00:00
swordshine
f5de946830 Merge branch 'mill2' into 'master' 
Remove Mill effect from non-mill cards

See merge request core-developers/forge!2908
 2020-06-28 01:44:43 +00:00
Tim Mocny
39deffdc56 Remove Mill effect from non-mill cards 2020-06-28 01:44:43 +00:00
swordshine
aa21883049 Add Inniaz, the Gale Force 2020-06-27 22:28:20 +08:00
Hans Mackowiak
51fdf21d1e M21: add Sanctum of All 2020-06-27 14:53:01 +02:00
swordshine
29a7c98185 Add Eon Frolicker 2020-06-26 22:18:54 +08:00
swordshine
bb4f4272ca Merge branch 'patch' into 'master' 
More cards

Closes #1473

See merge request core-developers/forge!2912
 2020-06-26 12:57:39 +00:00
swordshine
01183c454b Update ReplacementMill 2020-06-26 16:46:14 +08:00
swordshine
5fc1f92309 Update Charmed Pendant to be compatible with ChangeText effects 2020-06-26 14:39:51 +08:00
swordshine
f9f2b65e45 Add Sanctuary Blade 2020-06-26 13:42:14 +08:00
Hans Mackowiak
e4fb9d8a9b JMP: add Thriving lands 2020-06-26 07:02:20 +02:00
swordshine
6049a681e8 Update CostMill 2020-06-26 12:04:15 +08:00
swordshine
b5ebf2185f Merge branch 'mill' into 'master' 
Mill oracle updates

Closes #1469

See merge request core-developers/forge!2907
 2020-06-26 03:30:28 +00:00
Tim Mocny
fa240f6dc2 Mill oracle updates 2020-06-26 03:30:27 +00:00
swordshine
1053b3fdea JMP: Add Bruvac the Grandiloquent 2020-06-24 22:09:00 +08:00
swordshine
d007e86779 JMP: Add Zurzoth, Chaos Rider 2020-06-24 22:09:00 +08:00
swordshine
2e15415666 M21: Add Chandra's Incinerator 2020-06-24 16:07:13 +08:00
swordshine
b9064dad3f Add Nine Lives 2020-06-24 15:16:41 +08:00
swordshine
9b1c8e0980 Update the "UntilTheEndOfYourNextTurn" for Teferi, Timeless Voyager 2020-06-23 20:57:54 +08:00
swordshine
c9e0d7722c Add Carrion Grub 2020-06-20 21:52:09 +08:00
Hans Mackowiak
0a18cff766 Player: fix Scheme not triggering for set in motion 2020-06-13 21:15:39 +02:00
Hans Mackowiak
2db862ce2d PlayerControllerHuman: fix reveal on LKI card list 2020-06-07 14:44:16 +00:00
Hans Mackowiak
d743bd5168 CounterType: needs to be serializable for Network 2020-06-05 07:42:15 +02:00
Hans Mackowiak
1b40987bbd Card: fix addChangedCardTraits when multiple StaticAbilities has the same timestamp 2020-06-01 22:04:55 +02:00
Hans Mackowiak
19c07f5bef Resolve "Avoid bad performance pattern involving Interger.parseInt" 2020-05-31 14:22:25 +00:00
Hans Mackowiak
51c15a5a4c WrappedAbility & Trigger: some cleanup 2020-05-30 08:29:53 +02:00
Hans Mackowiak
379f9699e8 Player Human: fix chooseSingleEntityForEffect 2020-05-29 09:12:08 +02:00
Sol
26694ffa5c Merge branch 'counterStringType' into 'master' 
CounterType: use String inside CounterType to handle KeywordCounter

See merge request core-developers/forge!2798
 2020-05-27 00:17:28 +00:00
Hans Mackowiak
6fde7149a4 - Basic support for CountersMoveAi (e.g. The Ozolith) so at least it doesn't crash, needs improvement. 2020-05-27 00:17:28 +00:00
Michael Kamensky
b249560dbb Merge branch 'replacementEffectString' into 'master' 
ReplacementEffect: add HostCard Name to toString for Human GUI

See merge request core-developers/forge!2834
 2020-05-25 16:40:27 +00:00
Hans Mackowiak
a165f314d3 Update Keyword: fix Bloodthirst 2020-05-25 13:59:37 +00:00
Hans Mackowiak
0c27a41566 ReplacementEffect: add HostCard Name to toString for Human GUI 2020-05-25 14:09:54 +02:00
Hans Mackowiak
ea26f6c689 Human Play: try to remove usage of game.getCard 2020-05-24 11:02:51 +00:00
Hans Mackowiak
f5e5ddbbb9 MagicStack: call resetCardsAddedThisTurn on onNextTurn 2020-05-21 10:36:03 +00:00
Michael Kamensky
c0578fb246 Merge branch 'synchronize-activator-rd2' into 'master' 
Synchronize activator Round 2

See merge request core-developers/forge!2825
 2020-05-21 05:14:13 +00:00
Hans Mackowiak
d86aa31ab8 DigMultipleEffect: add extra ChosenZone to select N from the Chosen 2020-05-20 16:35:23 +00:00
friarsol
7a6409c11c Synchronize activator Round 2 2020-05-19 21:54:47 -04:00
swordshine
b7b2c88916 Merge branch 'jegantha' into 'master' 
Jegantha

See merge request core-developers/forge!2802
 2020-05-20 00:49:58 +00:00
Sol
2af1895e26 Revert "Merge branch 'synchronize-activator-restriction' into 'master'" 
This reverts merge request !2821
 2020-05-19 11:45:47 +00:00
Agetian
87ed2140b4 - Fix a typo in code. 2020-05-19 10:38:06 +03:00
Michael Kamensky
b9d5326c30 Merge branch 'tokenCopyInvestigateRework' into 'master' 
Effects: Effects that create Tokens now use common base class

Closes #1379 and #1350

See merge request core-developers/forge!2816
 2020-05-19 03:46:43 +00:00
Hans Mackowiak
0af1085f79 Effects: Effects that create Tokens now use common base class 2020-05-19 03:46:43 +00:00
swordshine
c793065cae Merge branch 'synchronize-activator-restriction' into 'master' 
Synchronize activator restriction

See merge request core-developers/forge!2821
 2020-05-19 01:11:22 +00:00
friarsol
45b1b3f38b Convert all Activator Restrictions to a combined key/value 2020-05-17 23:16:52 -04:00