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

49457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
austinio7116
ffa7e39121 Merge remote-tracking branch 'Core/master' into coremaster 2021-04-11 22:46:01 +01:00
Bug Hunter
056229e8ee Merge branch 'impetus' into 'master' 
Psychic Impetus: Fix missing param

See merge request core-developers/forge!4473
 2021-04-11 19:22:12 +00:00
tool4EvEr
c4c5f7ab6b Fix missing param 2021-04-11 21:21:39 +02:00
Michael Kamensky
3a3850ec4e Merge branch 'Williams-master-patch-09539' into 'master' 
C21 Sproutback Trudge

See merge request core-developers/forge!4455
 2021-04-11 19:04:23 +00: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
Michael Kamensky
53179f6e3f Merge branch 'triggerCounterPlayerAddedAll' into 'master' 
TriggerCounterPlayerAddedAll: new Trigger

See merge request core-developers/forge!4454
 2021-04-11 19:03:12 +00:00
Michael Kamensky
b1d5ba6787 Merge branch 'zaffai' into 'master' 
Zaffai: Fix trigger

See merge request core-developers/forge!4471
 2021-04-11 19:02:56 +00:00
John
361a3d0371 Add new file 2021-04-11 19:01:59 +00:00
tool4EvEr
6b5b38535e Zaffai: Fix trigger 2021-04-11 18:14:31 +02:00
Hans Mackowiak
f6ee232d9e GameEntity: when attachment is phased out, treat as not attached 2021-04-11 17:00:20 +02:00
austinio7116
f89cfa3ec8 KHM deck generation 2021-04-11 15:23:22 +01: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
John
52e7cc41e2 Update sproutback_trudge.txt 2021-04-11 13:08:32 +00: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
0df4e1147c Merge branch 'yedora' into 'master' 
Yedora: allow morph

See merge request core-developers/forge!4466
 2021-04-11 12:43:26 +00:00
Michael Kamensky
7c42b1f845 Merge branch 'stxrank' into 'master' 
STX draftsim ranks

See merge request core-developers/forge!4463
 2021-04-11 12:41:21 +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
Michael Kamensky
fc1c5ca6e9 Merge branch 'fixlang' into 'master' 
CardTranslation: Add fallback for english only cards

See merge request core-developers/forge!4456
 2021-04-11 12:40:19 +00:00
tool4EvEr
0ccf9c961b Yedora: allow morph 2021-04-11 10:27:34 +02:00
Bug Hunter
b894e65618 Merge branch 'TRT-master-patch-28302' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/dream_strix.txt

See merge request core-developers/forge!4465
 2021-04-11 08:25:14 +00:00
Bug Hunter
801d31ed29 Update forge-gui/res/cardsfolder/upcoming/dream_strix.txt 2021-04-11 08:25:03 +00:00
Anthony Calosa
34fb9bb865 Merge branch 'kevlahnota-master-patch-52335' into 'master' 
Update Commander 2021.txt

See merge request core-developers/forge!4464
 2021-04-11 07:18:17 +00:00
Anthony Calosa
b5201e17ff Update forge-gui/res/editions/Commander 2021.txt 2021-04-11 07:17:16 +00:00
Anthony Calosa
204bbfc6c7 Update forge-gui/res/editions/Commander 2021.txt 2021-04-11 07:12:00 +00:00
Anthony Calosa
692fe0c885 Update Commander 2021.txt 2021-04-11 07:00:32 +00:00
John
3a372179d6 Update sproutback_trudge.txt 2021-04-11 06:51:44 +00:00
Adam Pantel
3de8bd49ad Combat Calligrapher 2021-04-11 01:59:36 -04:00
austinio7116
b9c02d5d99 Merge branch 'ldastream' into 'master' 
LDA module

See merge request core-developers/forge!4251
 2021-04-11 05:51:11 +00:00
Hans Mackowiak
185c4c09c9 Changed card-based deck generation to archetype based making better use of the new LDA models. Decks can now be selected by archetype with names generated from the source decklists. Archetypes are ordered by popularity. 2021-04-11 05:51:11 +00:00
austinio7116
ad709fd8f0 STX draftsim ranks 2021-04-11 06:47:57 +01:00
Adam Pantel
da7a1f34e1 Nils, Discipline Enforcer 2021-04-11 00:40:27 -04:00
Michael Kamensky
47d2f3b6ad Merge branch 'new-cards-2' into 'master' 
C21: Stinging Study

See merge request core-developers/forge!4461
 2021-04-11 04:22:59 +00: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
Adam Pantel
0e2d6ac196 C21: Stinging Study 2021-04-11 00:16:00 -04:00
Anthony Calosa
eb99915912 Merge branch 'master' into 'master' 
update ImageKeys

See merge request core-developers/forge!4459
 2021-04-11 02:22:04 +00:00
Anthony Calosa
501df02260 update ImageKeys 2021-04-11 10:03:56 +08:00
tool4EvEr
d74f6dba0a Fix Arlinn Kord transform 2021-04-10 23:28:11 +02:00
tool4EvEr
b590c6b55a CardTranslation: Add fallback for english only cards 2021-04-10 20:00:48 +02:00
John
175f38f114 Add new file 2021-04-10 16:53:05 +00:00
Michael Kamensky
44f69b2b0b Merge branch 'fixX' into 'master' 
Fix Thieving Skydiver 0 kicker

See merge request core-developers/forge!4450
 2021-04-10 16:28:25 +00:00
Michael Kamensky
02a1b139bf Merge branch 'lib' into 'master' 
Sylvan Library: Add ordering choice

See merge request core-developers/forge!4452
 2021-04-10 16:27:52 +00:00
Michael Kamensky
326cf81a0f Merge branch 'Williams-master-patch-30398' into 'master' 
C21 Suthro 10/04

See merge request core-developers/forge!4448
 2021-04-10 16:27:45 +00:00
John
8952ddc9dc Update witchs_clinic.txt 2021-04-10 15:31:37 +00:00
John
dfe2c6d064 Update veinwitch_coven.txt 2021-04-10 15:29:31 +00:00
John
fea2f30a1c Update veinwitch_coven.txt 2021-04-10 15:28:55 +00:00
tool4EvEr
5d8bd256f1 Fix originally printed property 2021-04-10 17:28:18 +02:00
John
d7f41f4a56 Add new file 2021-04-10 15:28:18 +00:00
John
9169ea6ebf Update trudge_garden.txt 2021-04-10 15:24:54 +00:00