external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,869 Commits 31 Branches 187 Tags
37de739a9cb152816310e96ea5e010eadb7ee64c
Commit Graph

5306 Commits

Author SHA1 Message Date
Adam Pantel
17b5098602 Costs should trigger Ranar/Laelia 2021-04-18 04:19:32 +00:00
Adam Pantel
b33e262de6 Ranar v2 2021-04-17 04:22:25 +00:00
Michael Kamensky
cbb11ea723 Merge branch 'kardur' into 'master' 
Remove Goad from Kardur

See merge request core-developers/forge!4527
 2021-04-16 12:44:41 +00:00
Michael Kamensky
1d2a62d06c Merge branch 'svarsStackInstance' into 'master' 
StackInstance only store direct SVars

See merge request core-developers/forge!4528
 2021-04-16 12:43:19 +00:00
Hans Mackowiak
743163fce7 StackInstance only store direct SVars 2021-04-16 12:43:19 +00:00
Michael Kamensky
afe5333c88 Merge branch 'filter_more_targetable_cards' into 'master' 
Filter more cards in getTargetableCards

See merge request core-developers/forge!4513
 2021-04-16 12:41:10 +00:00
Adam Pantel
65093b0388 Fix Zurzoth, Akiri 2021-04-16 07:15:29 +00:00
Michael Kamensky
59f414f707 Merge branch 'fixmp' into 'master' 
Fix Multiplayer LTB triggers

Closes #1324

See merge request core-developers/forge!4511
 2021-04-16 04:59:35 +00:00
Northmoc
ff9729d27a CombatUtil.java add "quasi-goad" logic 2021-04-15 20:03:44 -04:00
Lyu Zong-Hong
a1f69f0732 Add Shaman's Trance 2021-04-16 08:22:37 +09:00
tool4EvEr
237b0324c1 Clean up 2021-04-15 20:26:28 +02:00
tool4EvEr
5aaf39f40b LTB triggers for opponents 2021-04-15 20:20:52 +02:00
austinio7116
84014ce9b5 Historic GA fix 2021-04-15 18:56:25 +01:00
tool4EvEr
43171879a0 Fix logic 2021-04-15 18:54:58 +02:00
tool4EvEr
2f7a30f920 Fix Multiplayer LTB triggers 2021-04-15 18:54:57 +02:00
Lyu Zong-Hong
44d4eae8a1 Filter more cards in getTargetableCards 2021-04-15 16:15:59 +09:00
Michael Kamensky
22ffcf5660 Merge branch 'historicLDA' into 'master' 
Historic Archetype Random Deck Generation

See merge request core-developers/forge!4488
 2021-04-15 06:30:19 +00:00
Michael Kamensky
f40ea6cc8d Merge branch 'rainbow' into 'master' 
Fix DelayedTriggers running when card owner left game

See merge request core-developers/forge!4512
 2021-04-15 06:30:05 +00:00
Hans Mackowiak
8d42be3bac Card: changed some logic with facedown and copy states 2021-04-15 05:59:28 +00:00
tool4EvEr
e2036a5203 Clean delayedTriggers from player who lost 2021-04-14 22:58:08 +02:00
tool4EvEr
7107f05adb Fix DelayedTriggers running when card owner left game 2021-04-14 22:12:14 +02:00
austinio7116
529fc42b72 Merge branch 'coremaster' into historicLDA 
# Conflicts:
#	forge-gui/res/formats/Sanctioned/Historic.txt
 2021-04-14 19:09:01 +01:00
Michael Kamensky
51054b70d6 Merge branch 'codie' into 'master' 
[C21] Codie tweaks

See merge request core-developers/forge!4507
 2021-04-14 18:07:20 +00:00
Michael Kamensky
471fb621e5 Merge branch 'flagbearer' into 'master' 
Add Flagbearer

See merge request core-developers/forge!4495
 2021-04-14 18:06:56 +00:00
Alumi
1e0c3e7621 Check if chosen targets meets MustTarget requirements in setupTargets() too. (For spell that has multiple targeting SAs) 2021-04-14 18:06:55 +00:00
Hans Mackowiak
ce34e937d6 CostExile: fixed exile cost with mana value X 2021-04-14 17:48:42 +02:00
Northmoc
ebe6a12555 allow no reordering on zones other than library 2021-04-14 11:28:59 -04:00
Hans Mackowiak
29d260db9d Cards: use CharacteristicDefining for Alternative Cost for now 2021-04-13 10:32:16 +02:00
Hans Mackowiak
d8e850673b StaticAbilityContinuous: fix GainsAbilitiesOfDefined 2021-04-12 17:56:42 +02:00
austinio7116
93ff8cfe1b Added Historic Random Deck Generation 2021-04-12 14:36:57 +01:00
Anthony Calosa
36c3c43f86 Merge branch 'master' into 'master' 
Simplify ManaConversion scripts, remove Flash/Ice Cave technical debt

See merge request core-developers/forge!4479
 2021-04-12 10:14:23 +00:00
Hythonia
bb659d39db ManaConvert keyword display 2021-04-12 10:03:03 +02:00
Hythonia
49cdd4d36d DefinedCost and DefinedManaCost 2021-04-12 10:03:02 +02:00
Hythonia
41d55cf780 Simplify ManaConvertion scripts 2021-04-12 10:03:02 +02:00
Michael Kamensky
76a1da2d0f Merge branch 'emblazoned_golem' into 'master' 
Add Emblazoned Golem

See merge request core-developers/forge!4467
 2021-04-12 04:17:33 +00:00
Hans Mackowiak
023499a6c0 Player: run checkStaticAbilities before Companion to apply CDA 2021-04-12 02:03:59 +02:00
Michael Kamensky
84ed014909 Merge branch 'new-cards-2' into 'master' 
Combat Calligrapher

Closes #1795

See merge request core-developers/forge!4462
 2021-04-11 19:03:57 +00:00
Michael Kamensky
39563682f5 Merge branch 'phasedAttachment' into 'master' 
GameEntity: when attachment is phased out, treat as not attached

See merge request core-developers/forge!4470
 2021-04-11 19:03:26 +00:00
Hans Mackowiak
f6ee232d9e GameEntity: when attachment is phased out, treat as not attached 2021-04-11 17:00:20 +02:00
Hans Mackowiak
d8b665f64f TriggerCounterPlayerAddedAll: new Trigger that triggers when a player puts more counters on one object 2021-04-11 15:53:32 +02:00
Adam Pantel
d473737ca8 Remove triggers in setup game state 2021-04-11 09:28:16 -04:00
Michael Kamensky
183209baa3 Merge branch 'arlinn' into 'master' 
Fix Arlinn Kord transform

See merge request core-developers/forge!4458
 2021-04-11 12:43:34 +00:00
Michael Kamensky
129e4762dc Merge branch 'new-cards' into 'master' 
Nils, Discipline Enforcer (attacking tax computation)

See merge request core-developers/forge!4457
 2021-04-11 12:40:38 +00:00
Lyu Zong-Hong
8ae916ac28 Add Emblazoned Golem 2021-04-11 18:56:49 +09:00
Adam Pantel
3de8bd49ad Combat Calligrapher 2021-04-11 01:59:36 -04:00
Adam Pantel
da7a1f34e1 Nils, Discipline Enforcer 2021-04-11 00:40:27 -04:00
Michael Kamensky
673759f17b Merge branch 'city' into 'master' 
Fix originally printed property

Closes #1797

See merge request core-developers/forge!4453
 2021-04-11 04:20:44 +00:00
tool4EvEr
d74f6dba0a Fix Arlinn Kord transform 2021-04-10 23:28:11 +02:00
tool4EvEr
5d8bd256f1 Fix originally printed property 2021-04-10 17:28:18 +02:00
tool4EvEr
ece32cbe70 Join XCantBe0 restrictions from both parts when combining costs 2021-04-10 13:51:16 +02:00