external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,968 Commits 32 Branches 187 Tags
c72d575ebc68cff1eeee8df3ee5be807c57693cc
Commit Graph

44968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
8564d30efc Merge branch 'wrappedAbilityCleanup' into 'master' 
WrappedAbility & Trigger: some cleanup

Closes #1400

See merge request core-developers/forge!2841
 2020-05-30 17:19:31 +00:00
Hans Mackowiak
51c15a5a4c WrappedAbility & Trigger: some cleanup 2020-05-30 08:29:53 +02:00
Michael Kamensky
3a475f44e4 Merge branch 'cultivate' into 'master' 
Cultivate and etc round 2

See merge request core-developers/forge!2836
 2020-05-30 03:50:58 +00:00
Tim Mocny
47f2123286 Cultivate and etc round 2 2020-05-30 03:50:57 +00:00
Hans Mackowiak
65ef844444 Merge branch '1439-cardtype-kills-performance' into 'master' 
Resolve "CardType kills performance"

Closes #1439

See merge request core-developers/forge!2840
 2020-05-29 08:32:19 +00:00
Hans Mackowiak
57b4135f95 CardType: use stringTo Maps as Cache again 2020-05-29 09:44:59 +02:00
Michael Kamensky
3d32915d9f Merge branch 'guiChoiceFixGameCache' into 'master' 
Player Human: fix chooseSingleEntityForEffect

See merge request core-developers/forge!2839
 2020-05-29 07:19:44 +00:00
Hans Mackowiak
379f9699e8 Player Human: fix chooseSingleEntityForEffect 2020-05-29 09:12:08 +02:00
Hans Mackowiak
0e831f88b9 Merge branch '1434-iko-shredded-sails-incorrect-dmg-to-flying-creature' into 'master' 
Resolve "[IKO] Shredded Sails, incorrect dmg to flying creature"

Closes #1434

See merge request core-developers/forge!2838
 2020-05-28 08:45:59 +00:00
Hans Mackowiak
8e0c1f4fe3 Update shredded_sails.txt 2020-05-28 07:15:42 +00:00
Hans Mackowiak
d7293c7830 Update boot_nipper.txt 2020-05-27 19:29:36 +00:00
Sol
817b8bf15b Merge branch 'gameCacheGone' into 'master' 
PlayerControllerHuman: remove gameCache entirely, always ask Game for Card by ID

See merge request core-developers/forge!2837
 2020-05-27 02:18:30 +00: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
Hans Mackowiak
815b2bc4aa PlayerControllerHuman: remove gameCache entirely, always ask Game for Card by ID 2020-05-26 23:21:44 +02:00
swordshine
5c7a0adf33 Merge branch 'cultivate' into 'master' 
Cultivate and such UI update

See merge request core-developers/forge!2835
 2020-05-26 01:34:11 +00:00
Tim Mocny
3a2c66df0b Cultivate and such UI update 2020-05-26 01:34:11 +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
955a16f1e0 Update ongoing_investigation.txt 2020-05-24 16:09:04 +00:00
Michael Kamensky
1ced1058c9 Merge branch 'gameCacheRework' into 'master' 
Human Play: try to remove usage of game.getCard

See merge request core-developers/forge!2804
 2020-05-24 11:02:52 +00:00
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