external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,826 Commits 33 Branches 187 Tags
de452e2da53e19d2751de3ba193669cb13badc2c
Commit Graph

52826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
0007b299a3 Merge remote-tracking branch 'remotes/core/master' 2021-09-19 14:14:45 +08:00
Northmoc
377d83a093 katilda_dawnhart_prime.txt 2021-09-19 01:58:53 -04:00
Michael Kamensky
fceb443618 Merge branch 'twosat-master-patch-33566' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5385
 2021-09-19 03:55:50 +00:00
Michael Kamensky
73c37e453b Merge branch 'vine' into 'master' 
Fix Portcullis Vine

See merge request core-developers/forge!5386
 2021-09-19 03:55:46 +00:00
Anthony Calosa
82d6a7bbd6 [Mobile] Add Player Avatar Animation 2021-09-19 11:28:54 +08:00
tool4EvEr
69464e165c Fix Portcullis Vine 2021-09-18 20:20:40 +02:00
Andreas Bendel
e7f0178b04 Update de-DE.properties 
translated AnimatedCardTapUntap
 2021-09-18 17:43:12 +00:00
Michael Kamensky
f397bceb39 Merge branch 'master' into 'master' 
[Mobile] Add Card Tap/Untap & Match Background Animation

See merge request core-developers/forge!5384
 2021-09-18 07:03:11 +00:00
Anthony Calosa
54b252c33c [Mobile] Add Card Tap/Untap & Match Background Animation 2021-09-18 13:40:13 +08:00
Michael Kamensky
633d97ca5a Merge branch 'master' into 'master' 
Added MID planeswalker/alt wincon achievements by Marek14.

See merge request core-developers/forge!5383
 2021-09-18 05:00:38 +00:00
Michael Kamensky
c1277c5706 - Added MID planeswalker/alt wincon achievements by Marek14. 2021-09-18 07:59:28 +03:00
Michael Kamensky
12d49e37fe Merge branch 'mid_17' into 'master' 
MID - 17 Sep

See merge request core-developers/forge!5382
 2021-09-18 04:24:10 +00:00
Northmoc
e3ac334bc5 rem_karolus_stalwart_slayer.txt 2021-09-17 20:44:49 -04:00
Northmoc
d95742ee60 moonsilver_key.txt 2021-09-17 20:44:29 -04:00
Northmoc
61eae8816f lier_disciple_of_the_drowned.txt 2021-09-17 19:59:58 -04:00
Michael Kamensky
987950f739 Merge branch 'cost_sb_tweak' into 'master' 
CostRemoveCounter cleanup

See merge request core-developers/forge!5381
 2021-09-17 15:27:26 +00:00
Michael Kamensky
e0d8ab5bf1 Merge branch 'mid_17' into 'master' 
MID - 17 Sep

See merge request core-developers/forge!5380
 2021-09-17 15:27:14 +00:00
Northmoc
6d69d65b23 CostRemoveCounter cleanup 2021-09-17 11:04:24 -04:00
Northmoc
accdd14026 arcane_infusion.txt 2021-09-17 11:02:11 -04:00
Northmoc
f8102d4325 slogurk_the_overslime.txt 2021-09-17 11:01:21 -04:00
Northmoc
02588a8516 sigardas_splendor.txt - check on draw, not trigger 2021-09-17 09:06:11 -04:00
Northmoc
8da059889d sigardas_splendor.txt 2021-09-17 09:04:09 -04:00
Michael Kamensky
90448451ae Merge branch 'MID_cards' into 'master' 
MID cards 17 Sep

See merge request core-developers/forge!5379
 2021-09-17 10:59:07 +00:00
paul_snoops
a3f4ca12a9 fixes 2021-09-17 11:27:44 +01:00
paul_snoops
6f2fd8702b MID cards 17 Sep 2021-09-17 10:28:50 +01:00
Michael Kamensky
a396bb996f Merge branch 'MID_fixes' into 'master' 
Small cardscript fixes

See merge request core-developers/forge!5377
 2021-09-17 03:58:54 +00:00
Michael Kamensky
feee042fa4 Merge branch 'mid_16' into 'master' 
MID - 16 Sep

See merge request core-developers/forge!5378
 2021-09-17 03:58:49 +00:00
Northmoc
f97226b99a wake_to_slaughter.txt 2021-09-16 22:34:02 -04:00
Northmoc
3f98bd9777 falkenrath_perforator.txt 2021-09-16 22:25:01 -04:00
Northmoc
2497bb50d8 willow_geist.txt 2021-09-16 19:37:29 -04:00
Northmoc
091061ff39 dawnhart_mentor.txt 2021-09-16 19:37:08 -04:00
paul_snoops
86434958ae Small fixes 2021-09-16 20:41:16 +01:00
Michael Kamensky
da64c3231e Merge branch 'typo' into 'master' 
Various small script fixes

See merge request core-developers/forge!5376
 2021-09-16 19:10:16 +00:00
Michael Kamensky
6a2f010130 Merge branch 'sungold' into 'master' 
MID: Sungold Sentinel and support

See merge request core-developers/forge!5375
 2021-09-16 19:09:50 +00:00
Tim Mocny
2f390aaa42 MID: Sungold Sentinel and support 2021-09-16 19:09:48 +00:00
Michael Kamensky
5d7f07ba23 Merge branch 'mid_16' into 'master' 
MID - 16 Sep

See merge request core-developers/forge!5372
 2021-09-16 19:09:25 +00:00
Northmoc
9b22051e25 add missing trigger 2021-09-16 13:40:41 -04:00
Northmoc
d54e7605b2 rousing_of_souls.txt cleanup 2021-09-16 13:40:19 -04:00
Northmoc
09b311ab2b remove unneeded param 2021-09-16 13:39:42 -04:00
Northmoc
a47f6f8117 Changezone -> ChangeZone 2021-09-16 13:39:16 -04:00
Northmoc
08d5214a4f Merge remote-tracking branch 'origin/typo' into typo 2021-09-16 13:38:28 -04:00
Northmoc
b7bebaea8c add cleanup line 2021-09-16 13:38:04 -04:00
Northmoc
0ea37b65bd clean up unicycle.txt 2021-09-16 13:37:40 -04:00
Northmoc
e436ec74c1 geistwave.txt 2021-09-16 11:31:22 -04:00
Michael Kamensky
432320441d Merge branch 'MID_cards' into 'master' 
MID cards 16 Sep

See merge request core-developers/forge!5374
 2021-09-16 14:36:48 +00:00
Michael Kamensky
8e8ba29d4c Merge branch 'keyword' into 'master' 
keyword stringbuilder tweaks

See merge request core-developers/forge!5373
 2021-09-16 14:34:44 +00:00
paul_snoops
972b6e20e6 More cards 2021-09-16 15:17:13 +01:00
paul_snoops
76beb59a4b MID cards 16 Sep 2021-09-16 13:43:33 +01:00
Hans Mackowiak
72986f34c9 Merge branch 'hostile' into 'master' 
MID: Hostile Hostel // Creeping Inn and support

See merge request core-developers/forge!5367
 2021-09-16 12:20:27 +00:00
Tim Mocny
7c3368a32e MID: Hostile Hostel // Creeping Inn and support 2021-09-16 12:20:27 +00:00