external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,606 Commits 31 Branches 187 Tags
57b4135f95d24f3d0875a8cd293d6baf8f8d653b
Commit Graph

3963 Commits

Author SHA1 Message Date
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
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
Hans Mackowiak
b12f97daa2 TriggerChangesZone: Trigger on leaving the battlefield look back in time using LKI 2020-05-15 14:15:34 +02:00
rory
815a0f5da9 checking for unique mana symbols correctly considers generic mana costs on split cards 2020-05-14 11:51:40 -07:00
Hans Mackowiak
7b151bf78a Fix Discard cost with Library of Leng 2020-05-14 08:26:18 +00:00
Michael Kamensky
fffb01a81c Merge branch 'companion-ai' into 'master' 
Add "AI" for Companion choosing

Closes #1406

See merge request core-developers/forge!2809
 2020-05-13 05:16:08 +00:00
friarsol
022875f07a Add "AI" for Companion choosing 2020-05-12 21:26:41 -04:00
Hans Mackowiak
d25825c595 CostPayment: reset CardMatrix after being used 2020-05-12 10:19:29 +00:00
Hans Mackowiak
3f428ee7d4 Effects and Emblems are not token, cards on the field without card types are sill permanents 2020-05-12 06:57:53 +00:00
rory
77c15b1673 move CantPayGenericCosts higher up in mana restrictions so that the activated restriction doesn't short circuit for loop 2020-05-11 16:46:48 -07:00
swordshine
369a366b4f Merge branch 'master' into 'master' 
translate some text

See merge request core-developers/forge!2502
 2020-05-11 10:57:49 +00:00
rory
51e945df72 Merge branch 'master' into jegantha 2020-05-10 11:39:14 -07:00
rory
4eb21594b4 Jegantha, the Wellspring 2020-05-10 11:34:07 -07:00
Hans Mackowiak
bb84b4a4d4 SpellAbility: copy PaidHash when copy spell ability 2020-05-10 16:53:34 +02:00
CCTV-1
b66eb6266d translate Companion choose dialog,update translations,update chinese characters. 2020-05-10 16:40:24 +08:00
CCTV-1
e0b61e7453 Merge remote-tracking branch 'upstream/master' 2020-05-10 16:36:25 +08:00
Sol
538430009b Merge branch 'patch' into 'master' 
Update Companion cards

See merge request core-developers/forge!2793
 2020-05-09 01:06:50 +00:00
swordshine
447453977d Update scripts 2020-05-08 22:52:10 +08:00
swordshine
085c9f0042 Add Umori, the Collector 2020-05-08 21:58:28 +08:00
swordshine
97bcf8f9c7 Update more Companion cards based on Northmoc's scripts 2020-05-08 19:49:37 +08:00
swordshine
2fd4f9c31f Update Companion restriction for Lurrus and Zirda 2020-05-08 15:08:18 +08:00
Hans Mackowiak
d1199e2698 DamageDealEffect: fix removeDamage 2020-05-08 05:53:19 +00:00
Michael Kamensky
a1d241dd6e Merge branch 'companion' into 'master' 
Companion

See merge request core-developers/forge!2714
 2020-05-08 03:43:23 +00:00
Hans Mackowiak
35dd052c93 LethalDamage: update Property when PT or counter changes 2020-05-08 03:38:44 +00:00
Hans Mackowiak
cc10e91431 CastSA: fix LastZone use LKI copy when put on stack 2020-05-08 03:38:11 +00:00
friarsol
8ab0857750 Add Companion keyword 2020-05-07 22:54:15 -04:00
Blacksmith
98d80a1328 [maven-release-plugin] prepare for next development iteration 2020-05-05 16:05:39 +00:00
Blacksmith
2d3a538f6d [maven-release-plugin] prepare release forge-1.6.34 2020-05-05 16:05:31 +00:00
Hans Mackowiak
4047dfe727 InputPayMana: fix ManaInput Dialog using getAbilityToPlay 2020-05-05 01:57:31 +00:00
Hans Mackowiak
18154ca0b7 DealDamage: add ExcessDamage 2020-05-04 14:04:02 +00:00
Hans Mackowiak
3b6160cd88 cards: some fixes with delayed trigger and putcounter 2020-05-03 12:06:08 +02:00
Hans Mackowiak
b964cc6448 add ChooseEvenOdd 2020-05-03 04:55:13 +00:00