external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,806 Commits 31 Branches 187 Tags
fc8142db8b51a38b04afa8cd66e19de340ab6fc3
Commit Graph

38806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
fc8142db8b Merge branch 'themes' into 'master' 
theme related fixes

See merge request core-developers/forge!953
 2018-09-27 04:35:18 +00:00
Jamin W. Collins
848df654fa set relative font sizes in Card Detail Panel 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-26 17:28:08 -06:00
Jamin W. Collins
9ab50c4d9d create and use getRelativeFontSize() method 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-26 17:27:15 -06:00
Michael Kamensky
c8ab4ff0c4 Merge branch 'master' into 'master' 
Removing SVar:Rarity

See merge request core-developers/forge!951
 2018-09-26 10:25:56 +00:00
Michael Kamensky
b125dd9e2d Merge branch 'svarupdate' into 'master' 
Update Svar->SVar.

See merge request core-developers/forge!950
 2018-09-26 10:24:56 +00:00
Agetian
0e398d2589 - Removing SVar:Rarity:Rare 2018-09-26 13:21:46 +03:00
Agetian
08e3f1ebd5 - Removing SVar:Rarity 2018-09-26 10:59:54 +03:00
Agetian
d273a35305 - Update Svar->SVar. 2018-09-26 09:16:34 +03:00
Michael Kamensky
0663024acf Merge branch 'patch-13' into 'master' 
Update crystal_seer.txt

See merge request core-developers/forge!946
 2018-09-26 06:14:51 +00:00
Michael Kamensky
3f675c0102 Merge branch 'guildofravnica' into 'master' 
Added Etrata the Silencer, including new HIT counters

See merge request core-developers/forge!949
 2018-09-26 06:13:24 +00:00
Michael Kamensky
527740c493 Merge branch 'patch-14' into 'master' 
Update demon_of_catastrophes.txt to use new "sac as an additional cost" mechanism.

See merge request core-developers/forge!947
 2018-09-26 06:07:11 +00:00
Michael Kamensky
231c028d42 Merge branch 'standardQuestMode' into 'master' 
Added Randomized Standard Quest World with LDA archetype generated decks as…

See merge request core-developers/forge!890
 2018-09-26 05:47:14 +00:00
Michael Kamensky
b8254b6dd9 Merge branch 'themes' into 'master' 
Themes

See merge request core-developers/forge!945
 2018-09-26 05:44:20 +00:00
Michael Kamensky
64fe052c0f Merge branch 'sentry-bug-fixes' into 'master' 
Sentry bug fixes

See merge request core-developers/forge!948
 2018-09-26 05:25:58 +00:00
Jamin W. Collins
593218343c avoid CME in chooseSaToActivateFromOpeningHand() 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-25 21:42:22 -06:00
Jamin W. Collins
79267ac29f avoid CME in checkStaticAbilities() 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-25 21:41:38 -06:00
Jamin W. Collins
701418ab63 avoid CME in cleanUpTemporaryReplacements() 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-25 21:26:43 -06:00
Jamin W. Collins
970931bcfd create a new user preference for default font size 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-25 07:49:23 -06:00
Jamin W. Collins
7781660c11 make font sizes relative to default (12) 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-25 07:49:23 -06:00
Jamin W. Collins
e6af6abfcf adding the Darky theme 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-25 07:49:23 -06:00
austinio7116
848b495b52 Added Etrata the Silencer, including new HIT counters 2018-09-25 08:28:44 +01:00
Meerkov
bd2b3fab9b Update demon_of_catastrophes.txt to use new "sac as an additional cost" mechanism. 2018-09-25 02:45:11 +00:00
Meerkov
5d53321885 Update crystal_seer.txt 2018-09-25 00:40:38 +00:00
Jamin Collins
5a5e1ddac8 Merge branch 'guildofravnica' into 'master' 
Some GRN fixes

See merge request core-developers/forge!944
 2018-09-25 00:33:27 +00:00
austinio7116
12da68cd77 Whispering Snitch updated to use OnlyFirst rather than an SVar 2018-09-24 19:36:34 +01:00
austinio7116
4f3fe32f89 Corrected Whispering Snitch trigger 2018-09-24 17:26:17 +01:00
austinio7116
6ed4da392e Renamed remaining GRN split cards appropriately 2018-09-24 17:06:54 +01:00
Michael Kamensky
b7f5d6e85e Merge branch 'guilds_fxes' into 'master' 
Guilds fxes

See merge request core-developers/forge!941
 2018-09-24 04:15:18 +00:00
Michael Kamensky
24e1affd51 Merge branch 'patch-14' into 'master' 
Fix another linewrap issue

See merge request core-developers/forge!943
 2018-09-24 04:14:14 +00:00
Michael Kamensky
f0d0949ac5 Merge branch 'patch-13' into 'master' 
Fix Oracle text line wrap.

See merge request core-developers/forge!942
 2018-09-24 04:14:02 +00:00
Meerkov
c3371cf5fa Fix another linewrap issue 2018-09-24 03:52:31 +00:00
Meerkov
c699644a74 Fix Oracle text line wrap. 2018-09-24 03:50:00 +00:00
tehdiplomat
acadff3e04 Fix the Scarab God trigger 2018-09-23 22:56:36 -04:00
tehdiplomat
ac940a6db8 Fix Legion Warboss TokenSCript 2018-09-23 22:44:14 -04:00
tehdiplomat
f6bce3cdb1 More fixes to Pelt Collector 2018-09-23 22:36:09 -04:00
tehdiplomat
ab58ded0a1 Fix Druid of Horns 2018-09-23 22:33:01 -04:00
tehdiplomat
84d3ae83f1 More GUilds fixes 2018-09-23 22:29:19 -04:00
tehdiplomat
52893e54ee Fix cost and name of Response // Resurgence 2018-09-23 22:09:19 -04:00
tehdiplomat
df2028e4f3 Fix Guildmages' Forum 2018-09-23 21:39:07 -04:00
tehdiplomat
8e45262a7a Fix Whispering Snitch 2018-09-23 21:24:37 -04:00
tehdiplomat
ef97991237 Fix Dimir Informant 2018-09-23 21:23:19 -04:00
tehdiplomat
1d89f466ab Fix Concoct 2018-09-23 21:13:18 -04:00
Sol
760c45f9c2 Merge branch 'deck-editor' into 'master' 
deck editor fixes

Closes #724

See merge request core-developers/forge!940
 2018-09-23 20:22:58 +00:00
Jamin W. Collins
bbf63d9083 fix Quest Draft Editor 
Closes: core-developers/forge#724

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-23 13:33:17 -06:00
Jamin W. Collins
781400c0a3 fix Draft mode editor 
The recent changes to bring Commander style editors into the normal Deck
Editor tab appear to have broken the drafting editor.  This change set
appears to resolve that issue.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-09-23 13:04:19 -06:00
Michael Kamensky
9561b75f17 Merge branch 'puzzle-engine' into 'master' 
Added puzzles PS_GRN0 and PS_GUEST1.

See merge request core-developers/forge!939
 2018-09-23 05:24:52 +00:00
Agetian
f624d76301 - Added puzzles PS_GRN0 and PS_GUEST1. 2018-09-23 08:23:53 +03:00
Michael Kamensky
35b3bc0623 Merge branch 'guilds_fxes' into 'master' 
Fixes from Wharrgarble

See merge request core-developers/forge!938
 2018-09-23 04:15:27 +00:00
tehdiplomat
939cdb6822 When Planeswalkers aren't on the battlefield, show their base loyalty 2018-09-22 22:58:15 -04:00
tehdiplomat
e4303df238 Fix Niv Mizzet Parun's draw trigger 2018-09-22 22:05:30 -04:00