external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,934 Commits 33 Branches 187 Tags
677ee26e91b1ce3d9dfaee0edb88c64db04dad3c
Commit Graph

38934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
858642510f Merge branch 'm19deckgenupdate2' into 'master' 
Latest LDA data for Standard - more archetypes and more data

See merge request core-developers/forge!869
 2018-08-20 04:41:25 +00:00
austinio7116
abb1ec890a Latest LDA data for Standard - more archetypes and more data 2018-08-19 06:39:03 +01:00
Hanmac
04202f0fb4 WrappedAbility: exclude Token from WrappedCheck 2018-08-18 19:39:00 +02:00
Hanmac
68e40254f8 CardFactoryUtil: more LKI for Triggered Keywords 2018-08-18 11:11:25 +02:00
Hanmac
fb3e0f1445 WrappedAbility: return timestampCheck but with extra checks 2018-08-18 08:46:38 +02:00
Hanmac
3aa5d191fa cards: add some LKI to some DealDamage effects 2018-08-18 08:46:38 +02:00
Hanmac
0f3ac8c212 WrappedAbility: remove faulty check 2018-08-18 08:46:38 +02:00
Hanmac
5f385f8a40 cards: update cards 2018-08-18 08:46:38 +02:00
Hanmac
baf4a17ceb Effects: add gameCardState check with equalWithTimestamp 2018-08-18 08:46:38 +02:00
Hanmac
e2c33b089c Card: fix equalsWithTimestamp and timestamp of LKI 2018-08-18 08:46:38 +02:00
Michael Kamensky
97d0e4f1b7 Merge branch 'moar_c18_cards' into 'master' 
Add the right conditional for Yennett

See merge request core-developers/forge!867
 2018-08-18 04:13:52 +00:00
tehdiplomat
63c06ed7cb Add the right conditional for Yennett 2018-08-17 22:11:02 -04:00
Sol
f7230cbff3 Update Commander Anthology Vol. II.txt 2018-08-17 19:51:38 +00:00
Michael Kamensky
8627ecb165 Merge branch 'afflictFix' into 'master' 
Afflict use :

See merge request core-developers/forge!866
 2018-08-17 15:49:52 +00:00
Hanmac
553a794642 Afflict use : 2018-08-17 17:31:49 +02:00
Michael Kamensky
bf3ce5b68a Merge branch 'feature-request' into 'master' 
only display the ante tab when playing for ante

Closes #381

See merge request core-developers/forge!863
 2018-08-17 15:25:07 +00:00
Michael Kamensky
48a7e50bfa Merge branch 'fortifyFix' into 'master' 
Fortify use :

See merge request core-developers/forge!864
 2018-08-17 15:18:30 +00:00
Michael Kamensky
f951e831c0 Merge branch 'poisonousFix' into 'master' 
Poisonous use :

See merge request core-developers/forge!865
 2018-08-17 15:16:50 +00:00
Hanmac
226754d80f Poisonous use : 2018-08-17 15:31:33 +02:00
Hanmac
a72dfcacea Fortify use : 2018-08-17 15:19:09 +02:00
Hans Mackowiak
22766f9942 Merge branch 'moar_c18_cards' into 'master' 
Add Windgrave's Judgmenet and Yennett (needs testing)

See merge request core-developers/forge!862
 2018-08-17 12:30:23 +00:00
Hans Mackowiak
b927c790c7 Update TriggerDesc 2018-08-17 12:25:31 +00:00
tehdiplomat
1ae10cb5ca Fix Yennett draw 2018-08-17 07:55:14 -04:00
Jamin W. Collins
b19eca2aff only display the ante tab when playing for ante 
Closes: core-developers/forge#381

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-16 23:48:13 -06:00
tehdiplomat
4a95685436 Add Windgrave's Judgmenet and Yennett 2018-08-16 21:48:51 -04:00
Jamin W. Collins
ab959890b8 fix a comment typo 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-16 17:32:45 -06:00
Sol
d2f5bd1a3d Update fatpacks.txt for M19 2018-08-15 15:19:43 +00:00
Sol
292ba47f70 Update boosterboxes.txt for M19 2018-08-15 15:18:35 +00:00
Sol
c026c399c3 Update screeching_phoenix.txt 2018-08-15 12:32:25 +00:00
Sol
c13aebe791 Update ajani_wise_counselor.txt 2018-08-15 12:31:35 +00:00
Michael Kamensky
f1f96557c2 Merge branch 'patch-1' into 'master' 
Update loyal_subordinate.txt Trigger Zone Fix

See merge request core-developers/forge!858
 2018-08-15 06:24:41 +00:00
Michael Kamensky
cdf9e3693d Merge branch 'patch-2' into 'master' 
Update loyal_guardian.txt Trigger Zone Fix

See merge request core-developers/forge!859
 2018-08-15 06:24:38 +00:00
Michael Kamensky
4cdc7b62ed Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_M195.

See merge request core-developers/forge!861
 2018-08-15 06:05:02 +00:00
Agetian
5817a795f3 - Added puzzle PS_M195. 2018-08-15 08:38:15 +03:00
Michael Kamensky
0c5cab8d12 Merge branch 'c18_cards' into 'master' 
More C18 cards

See merge request core-developers/forge!857
 2018-08-15 05:01:40 +00:00
Computica
8c1f4c5720 Update loyal_guardian.txt Trigger Zone Fix 2018-08-15 04:20:14 +00:00
Computica
4ddfe40ff1 Update loyal_subordinate.txt Trigger Zone Fix 2018-08-15 04:19:00 +00:00
tehdiplomat
7be9ef06e0 Add Forge of Heroes 2018-08-14 17:37:53 -04:00
tehdiplomat
3dfa54e4da Add Saheeli, the Gifted 2018-08-14 17:10:04 -04:00
Sol
58c1bd35a9 Merge branch 'c18_cards' into 'master' 
Boreas Charger, Endless Atlas, Ever-Watching Threshold

See merge request core-developers/forge!856
 2018-08-14 20:22:02 +00:00
tehdiplomat
9c517070e4 Added Varchild 2018-08-14 16:18:50 -04:00
tehdiplomat
75caf0643a Added Tawnos 2018-08-14 16:02:25 -04:00
tehdiplomat
41ce31497b Add Tawnos Urza's Apprentice 2018-08-14 13:36:33 -04:00
tehdiplomat
fa1128b94c Magus of the Balance and Reality Scramble 2018-08-14 12:22:42 -04:00
tehdiplomat
e147900618 Move cards from upcoming to their appropriate letter 2018-08-14 09:04:40 -04:00
tehdiplomat
28c2aceba3 Boreas Charger, Endless Atlas, Ever-Watching Threshold 2018-08-14 08:35:38 -04:00
Sol
c45cf8df10 Merge branch 'network-play' into 'master' 
Network play

See merge request core-developers/forge!854
 2018-08-13 15:09:27 +00:00
Michael Kamensky
a0803cfce6 Merge branch 'rounded-corners' into 'master' 
round image corners when No Border is selected

See merge request core-developers/forge!855
 2018-08-13 06:16:36 +00:00
Jamin W. Collins
385fa74c6e round image corners when No Border is selected 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-12 23:53:59 -06:00
Jamin W. Collins
2aa8d4bb1a use CardFaceView for selecting CardFaces 
needed for Runed Halo and similar

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-11 13:27:26 -06:00