external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,146 Commits 32 Branches 187 Tags
7b6a3b70e9119f0612ef2d4bf516e2d03e148bcc
Commit Graph

45146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans Mackowiak
ea26f6c689 Human Play: try to remove usage of game.getCard 2020-05-24 11:02:51 +00:00
Michael Kamensky
fc706c8035 Merge branch '1431-npe-in-computerutil-canregenerate' into 'master' 
Resolve "NPE in ComputerUtil.canRegenerate"

Closes #1431

See merge request core-developers/forge!2833
 2020-05-23 14:00:18 +00:00
Hans Mackowiak
74589d59e4 TokenAi: fix setting Owner of the Token to prevent NPE 2020-05-23 15:42:56 +02:00
Sol
70046c5261 Merge branch 'patch-7' into 'master' 
Update liliana_dreadhorde_general.txt

See merge request core-developers/forge!2832
 2020-05-22 14:50:16 +00:00
Tim Mocny
3165c57b0e Update liliana_dreadhorde_general.txt 2020-05-22 12:48:43 +00:00
Hans Mackowiak
27968cd561 Merge branch 'buildPluginFix' into 'master' 
build-helper-maven-plugin: update version to 3.1.0

See merge request core-developers/forge!2827
 2020-05-22 06:44:31 +00:00
swordshine
9cb4911e29 Merge branch 'friarsol-master-patch-87682' into 'master' 
Fix Mystic Barrier swallowing triggers

See merge request core-developers/forge!2831
 2020-05-22 05:22:11 +00:00
Sol
933fe7ad49 Fix Mystic Barrier swallowing triggers 2020-05-22 05:22:11 +00:00
friarsol
b13503c8a7 Merge remote-tracking branch 'origin/master' 2020-05-21 21:47:52 -04:00
Sol
2bdd598565 Merge branch 'patch-7' into 'master' 
typo precognition_field.txt

See merge request core-developers/forge!2830
 2020-05-22 00:48:42 +00:00
friarsol
81bcacefc0 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2020-05-21 20:47:24 -04:00
Tim Mocny
215cd20b90 typo precognition_field.txt 2020-05-21 23:50:45 +00:00
Michael Kamensky
0701fd6bbc Merge branch '1424-oome-by-zone-lateststatecardsaddedthisturn' into 'master' 
Resolve "OOME by Zone.latestStateCardsAddedThisTurn"

Closes #1424

See merge request core-developers/forge!2828
 2020-05-21 15:58:24 +00:00
Michael Kamensky
3e89f64944 Merge branch 'master' into 'master' 
Fix DestroyAi hanging when considering auras that control AI's cards

Closes #1425

See merge request core-developers/forge!2829
 2020-05-21 14:31:33 +00:00
Agetian
3041788be1 - Fix DestroyAi hanging when considering auras that control AI's cards 2020-05-21 17:18:48 +03: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
0489a2ba83 Update tireless_tracker fix TrigInvestigate 2020-05-21 00:45:09 +00:00
Michael Kamensky
25109de700 Merge branch 'digMultipleChooseZone' into 'master' 
DigMultipleEffect: add extra ChosenZone to select N from the Chosen

See merge request core-developers/forge!2826
 2020-05-20 16:35:23 +00:00
Hans Mackowiak
d86aa31ab8 DigMultipleEffect: add extra ChosenZone to select N from the Chosen 2020-05-20 16:35:23 +00:00
Hans Mackowiak
0846017766 build-helper-maven-plugin: update version to 3.1.0 to fix version can neither be null, empty nor blank 2020-05-20 11:43:15 +02:00
rory
a964f5b71b checking for unique mana symbols correctly considers generic mana costs on split cards 2020-05-19 21:58:13 -04:00
rory
d311231c96 move CantPayGenericCosts higher up in mana restrictions so that the activated restriction doesn't short circuit for loop 2020-05-19 21:58:13 -04:00
rory
b2018aafe6 Jegantha, the Wellspring 2020-05-19 21:58:13 -04:00
Northmoc
7ab4d13507 Vintage.txt Lurrus fix 2020-05-19 21:58:13 -04:00
friarsol
7a6409c11c Synchronize activator Round 2 2020-05-19 21:54:47 -04:00
friarsol
25fb9857d8 Synchronize activator Round 2 2020-05-19 21:53:33 -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
swordshine
2b714672a2 Merge branch 'vintagebnr' into 'master' 
Vintage.txt Lurrus fix

See merge request core-developers/forge!2824
 2020-05-20 00:49:24 +00:00
Northmoc
0ed4670cfb Vintage.txt Lurrus fix 2020-05-19 09:03:25 -04:00
Sol
fa610b4bfd Merge branch 'revert-c793065c' into 'master' 
Revert "Merge branch 'synchronize-activator-restriction' into 'master'"

See merge request core-developers/forge!2823
 2020-05-19 12:01:48 +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
Michael Kamensky
b919ccb50c Merge branch 'master' into 'master' 
Fix a typo in code.

See merge request core-developers/forge!2822
 2020-05-19 07:50:26 +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
swordshine
248a2447d2 Merge branch 'may2020bnr' into 'master' 
18 May 2020 bans

See merge request core-developers/forge!2820
 2020-05-19 01:08:37 +00:00
Tim Mocny
df2932bec5 18 May 2020 bans 2020-05-19 01:08:37 +00:00
friarsol
b7fb854389 Fix Personal Incarnation activator missing owner 2020-05-18 20:42:03 -04:00
Michael Kamensky
7c322e1e33 Merge branch 'quest-menu-update' into 'master' 
Quest menu update

See merge request core-developers/forge!2817
 2020-05-18 03:29:30 +00:00
Sol
74b3ecd8ce Quest menu update 2020-05-18 03:29:30 +00:00
Michael Kamensky
82060740c6 Merge branch 'fix-get-best-land' into 'master' 
Fix FindBestLand ai

Closes #1415

See merge request core-developers/forge!2818
 2020-05-18 03:24:22 +00:00
friarsol
45b1b3f38b Convert all Activator Restrictions to a combined key/value 2020-05-17 23:16:52 -04:00
Michael Kamensky
f72526fa08 Merge branch 'fix-capricopian' into 'master' 
Fix Capricopian

Closes #1411

See merge request core-developers/forge!2819
 2020-05-18 03:13:35 +00:00
friarsol
e96fa0cc96 Fix Capricopian 2020-05-17 21:40:09 -04:00
friarsol
7966684424 Fix FindBestLand ai 2020-05-17 21:12:03 -04:00
Michael Kamensky
56b5a6d3c2 Merge branch 'master' into 'master' 
IKO and C20 initial AI hints.

See merge request core-developers/forge!2815
 2020-05-17 17:59:06 +00:00
Agetian
0516693eec - IKO and C20 initial AI hints. 2020-05-17 20:49:03 +03:00
Michael Kamensky
8c40ba9ef3 Merge branch '1407-lazav-dimir-mastermind-causes-npe' into 'master' 
Resolve ""Lazav, Dimir Mastermind" causes NPE"

Closes #1407

See merge request core-developers/forge!2814
 2020-05-16 16:53:31 +00:00