external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,457 Commits 34 Branches 187 Tags
ffa7e3912151df72a7035d06af943b51e37121f4
Commit Graph

4819 Commits

Author SHA1 Message Date
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
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
tool4EvEr
a1bdd1fc47 Fix Thieving Skydiver 0 kicker 2021-04-10 12:35:47 +02:00
Michael Kamensky
ad09233d4c Merge branch 'clash' into 'master' 
ClashEffect: Fix triggering for both players

See merge request core-developers/forge!4436
 2021-04-10 04:13:29 +00:00
Bug Hunter
2be3a38bb0 ClashEffect: Fix triggering for both players 2021-04-10 04:13:29 +00:00
Michael Kamensky
26467221b3 Merge branch '1759-extra-generated-text-on-auras' into 'master' 
Resolve "Extra generated text on Auras"

Closes #1759

See merge request core-developers/forge!4443
 2021-04-10 04:13:12 +00:00
Michael Kamensky
dd19ad356a Merge branch 'guardian-archon' into 'master' 
[C21] Guardian Archon

See merge request core-developers/forge!4445
 2021-04-10 04:12:48 +00:00
Michael Kamensky
63d660d152 Merge branch 'noAbilities' into 'master' 
Fix NoAbilities failing for basic land types

See merge request core-developers/forge!4424
 2021-04-10 04:12:07 +00:00
Northmoc
af2a4e1ce4 tidy up ChosenPlayer for DefinedKW 2021-04-09 17:53:49 -04:00
Hans Mackowiak
36c7f1244d Card: fix faulty SpellDescriptions, skip BasicSpells 2021-04-09 20:57:36 +02:00
Hans Mackowiak
6fe299d7c8 StaticAbilityPanharmonicon: use LKI only for ChangeZone Trigger 2021-04-09 18:56:52 +02:00
Hans Mackowiak
04940fc4db StaticAbilityPanharmonicon: clean up use matchesValidParam 2021-04-09 17:28:33 +02:00
Hythonia
cc8e8b2dd1 C21 Veyran & Panharmonicon rework 2021-04-09 15:15:29 +00:00
Michael Kamensky
b1d95a5fa0 Merge branch 'fixes' into 'master' 
Fixes

See merge request core-developers/forge!4433
 2021-04-09 07:10:27 +00:00
Lyu Zong-Hong
7603943c38 Add Psychic Battle 2021-04-09 14:06:51 +09:00
tool4EvEr
eb6d168d50 Update NoAbilities logic 2021-04-08 20:40:23 +02:00
tool4EvEr
1c4640d69b Fix NoAbilities failing for basic land types 2021-04-08 19:42:18 +02:00
Northmoc
93488528de add TriggerZones to Ward 2021-04-08 11:07:54 -04:00
CCTV-1
b856ad0374 translate learnLesson message. 2021-04-08 20:07:56 +08:00
Michael Kamensky
b44c1478b8 Merge branch 'c21_7' into 'master' 
C21 - 7 April

See merge request core-developers/forge!4422
 2021-04-08 04:10:42 +00:00
Northmoc
e807d9a3e7 support for playerXCount TotalCommanderCastFromCommandZone 2021-04-07 21:22:21 -04:00
Hans Mackowiak
5c9e2839eb Card: add AbilityResolvedThisTurn 2021-04-08 02:13:45 +02:00
Northmoc
75f03f1fd1 support for SumCMCGraveyard (Inferno Project) 2021-04-07 10:30:01 -04:00
Michael Kamensky
7f87164235 Merge branch 'learnEffect' into 'master' 
Learn effect

See merge request core-developers/forge!4374
 2021-04-07 05:11:55 +00:00
Hans Mackowiak
0627d37f69 - Basic AI for AF Learn 
- Some minor tweaks and fixes for AF Learn
 2021-04-07 05:11:55 +00:00
Michael Kamensky
68dc49cb88 Merge branch 'secretly' into 'master' 
Emissary of Grudges, Stalking Leonin

See merge request core-developers/forge!4413
 2021-04-07 05:11:28 +00:00
Michael Kamensky
9859cbdca6 Merge branch 'ConditionDefinedSpells' into 'master' 
SpellAbilityCondition: extends ConditionDefined to work with SpellAbilities

See merge request core-developers/forge!4412
 2021-04-07 05:07:58 +00:00
Michael Kamensky
5ad4a25c33 Merge branch 'card-fixes' into 'master' 
Some card fixes

See merge request core-developers/forge!4415
 2021-04-07 05:07:01 +00:00
Adam Pantel
265e5bb122 Golden Ratio fix 2021-04-06 23:35:18 -04:00
Adam Pantel
ef04a4376a Emissary of Grudges, Stalking Leonin 2021-04-06 19:29:37 -04:00
Hans Mackowiak
c6b0b2021c SpellAbilityCondition: extends ConditionDefined to work with SpellAbilities 2021-04-06 22:13:48 +02:00
Michael Kamensky
0ab7ff919b Merge branch 'new-cards-2' into 'master' 
Demonstrate keyword and Excavation Technique

See merge request core-developers/forge!4397
 2021-04-06 17:08:12 +00:00
Michael Kamensky
a0fd16513a Merge branch 'c21_5' into 'master' 
C21 - 5 April

See merge request core-developers/forge!4396
 2021-04-06 07:30:26 +00:00
Michael Kamensky
c7c6d4e162 Merge branch 'new-cards' into 'master' 
Strict Proctor

See merge request core-developers/forge!4393
 2021-04-06 07:27:15 +00:00
Adam Pantel
3e9dabe2a5 Demonstrate keyword and Excavation Technique 2021-04-05 23:19:33 -04:00
Northmoc
86d72b15c5 support for archaeomancers_map.txt 2021-04-05 23:05:56 -04:00
Adam Pantel
c77f99cf9b MoJhoSto logging 2021-04-05 18:57:36 -04:00
Adam Pantel
9095dcd9d8 Add infinite loop protection for Stonehewer 2021-04-05 18:21:32 -04:00
Adam Pantel
1e10d49d0f Strict Proctor 2021-04-05 17:51:26 -04:00