external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,747 Commits 32 Branches 187 Tags
8229d9eea1b977a085f44de476a83c4a4f17d41f
Commit Graph

52747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
8229d9eea1 hallowed_respite.txt 2021-09-20 08:33:42 -04:00
Northmoc
50169671b9 the_meathook_massacre.txt 2021-09-20 08:13:31 -04:00
Michael Kamensky
8305ebde4a Merge branch 'mid_19' into 'master' 
MID - Sep 19

See merge request core-developers/forge!5395
 2021-09-20 03:20:20 +00:00
Northmoc
235e17fa42 burn_down_the_house.txt (Aoki-Kujo) 2021-09-19 22:17:29 -04:00
Northmoc
8415b847cd angelfire_ignition.txt 2021-09-19 21:49:07 -04:00
Northmoc
632127e383 memory_deluge.txt 2021-09-19 21:49:06 -04:00
Northmoc
bee7d8b7de florian_voldaren_scion.txt 2021-09-19 21:49:06 -04:00
Bug Hunter
a63c554c6c Merge branch 'TRT-master-patch-66594' into 'master' 
Update forge-gui/res/cardsfolder/t/trusted_pegasus.txt

See merge request core-developers/forge!5394
 2021-09-19 17:19:29 +00:00
Bug Hunter
c57d26ae3e Update forge-gui/res/cardsfolder/t/trusted_pegasus.txt 2021-09-19 17:18:41 +00:00
Michael Kamensky
beca5a5d2e Merge branch 'clue' into 'master' 
allow Clue Sac cost to use more generic formatting (match Oracle)

See merge request core-developers/forge!5392
 2021-09-19 12:24:34 +00:00
Michael Kamensky
27c8eb3cd8 Merge branch 'mid_19' into 'master' 
MID - 19 Sep

See merge request core-developers/forge!5393
 2021-09-19 12:23:58 +00:00
Michael Kamensky
23fb686523 Merge branch 'master' into 'master' 
[Mobile] Add Player Avatar Animation

See merge request core-developers/forge!5388
 2021-09-19 12:22:33 +00:00
Michael Kamensky
686abff580 Merge branch 'typo' into 'master' 
fix bad TrigDesc

See merge request core-developers/forge!5391
 2021-09-19 12:22:07 +00:00
Anthony Calosa
610e258602 update Avatar Animation on lifeloss 2021-09-19 19:23:31 +08:00
Anthony Calosa
73b540328c update Card Animation 2021-09-19 18:59:28 +08:00
Northmoc
0935391569 allow Clue Sac cost to use more generic formatting (match Oracle) 2021-09-19 05:42:46 -04:00
Northmoc
2078d6b184 fix bad TrigDesc 2021-09-19 05:40:17 -04:00
Northmoc
f6c208cb00 dennick_pious_apprentice_dennick_pious_apparition.txt 2021-09-19 05:39:37 -04:00
Northmoc
8d8ab613a9 storm_the_festival.txt 2021-09-19 05:39:22 -04:00
Northmoc
45cf5ee827 seize_the_storm.txt and token 2021-09-19 03:13:24 -04:00
Northmoc
703999980b slaughter_specialist.txt 2021-09-19 02:28:38 -04:00
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