Commit Graph

40031 Commits

Author SHA1 Message Date
Chris H
0b14efebb8 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-01-28 15:15:06 -05:00
Sol
18a3bfe0b8 Merge branch 'someRNAFixes' into 'master'
A Few RNA card script fixes

See merge request core-developers/forge!1316
2019-01-28 20:08:56 +00:00
T.J. Tillman
d8da15d8ae Update forge-gui/res/cardsfolder/upcoming/dovin_architect_of_law.txt 2019-01-28 19:58:23 +00:00
T.J. Tillman
5bd9f324e0 Update forge-gui/res/cardsfolder/upcoming/dovins_dismissal.txt 2019-01-28 18:09:35 +00:00
T.J. Tillman
e0b463c6ea Update forge-gui/res/cardsfolder/upcoming/cindervines.txt 2019-01-28 18:03:00 +00:00
Michael Kamensky
01742f06f6 Merge branch 'highlight' into 'master'
Darken non-selectable cards in Desktop GUI

See merge request core-developers/forge!1317
2019-01-28 17:55:36 +00:00
T.J. Tillman
dbe212065d Update forge-gui/res/cardsfolder/r/raid_bombardment.txt 2019-01-28 17:44:21 +00:00
T.J. Tillman
4b8584376d Update forge-gui/res/cardsfolder/upcoming/cavalcade_of_calamity.txt 2019-01-28 17:27:48 +00:00
Michael Kamensky
6cf7d3ae80 Merge branch 'master' into 'master'
Added puzzle PS_RNA0a (RNA Prerelease Puzzle)

See merge request core-developers/forge!1319
2019-01-28 12:22:42 +00:00
Agetian
104aaa1255 - Added puzzle PS_RNA0a (RNA Prerelease Puzzle) 2019-01-28 15:22:06 +03:00
Peter F. Patel-Schneider
1ba1226661 refresh hand floating zone when hand is updated 2019-01-28 05:53:38 -05:00
T.J. Tillman
f8bf8c7f28 Update forge-gui/res/cardsfolder/upcoming/cindervines.txt 2019-01-28 08:41:26 +00:00
T.J. Tillman
763cb3d08e Update forge-gui/res/cardsfolder/upcoming/shimmer_of_possibility.txt 2019-01-28 08:30:23 +00:00
T.J. Tillman
5e94c6c8d3 Update forge-gui/res/cardsfolder/upcoming/forbidding_spirit.txt 2019-01-28 08:27:47 +00:00
T.J. Tillman
b08ce49057 Update forge-gui/res/cardsfolder/upcoming/senate_griffin.txt, forge-gui/res/cardsfolder/upcoming/haazda_officer.txt, forge-gui/res/cardsfolder/upcoming/forbidding_spirit.txt, forge-gui/res/cardsfolder/upcoming/domris_nodorog.txt files 2019-01-28 08:07:43 +00:00
T.J. Tillman
7c98ed75be Update forge-gui/res/cardsfolder/upcoming/domris_nodorog.txt, forge-gui/res/cardsfolder/upcoming/forbidding_spirit.txt, forge-gui/res/cardsfolder/upcoming/haazda_officer.txt, forge-gui/res/cardsfolder/upcoming/senate_griffin.txt files 2019-01-28 08:02:07 +00:00
T.J. Tillman
1c9a515bb3 Update forge-gui/res/cardsfolder/upcoming/domris_nodorog.txt 2019-01-28 07:47:55 +00:00
T.J. Tillman
a462d34249 Update forge-gui/res/cardsfolder/upcoming/charging_war_boar.txt, forge-gui/res/cardsfolder/upcoming/cindervines.txt files 2019-01-28 07:38:32 +00:00
T.J. Tillman
e1ceed159f Update forge-gui/res/cardsfolder/upcoming/elite_arrester.txt, forge-gui/res/cardsfolder/upcoming/clamor_shaman.txt files 2019-01-28 07:08:05 +00:00
T.J. Tillman
89757b9677 Update forge-gui/res/cardsfolder/upcoming/footlight_fiend.txt 2019-01-28 07:04:13 +00:00
T.J. Tillman
01c52667ad Update forge-gui/res/cardsfolder/upcoming/cavalcade_of_calamity.txt, forge-gui/res/cardsfolder/r/raid_bombardment.txt, forge-gui/res/cardsfolder/upcoming/forbidding_spirit.txt, forge-gui/res/cardsfolder/upcoming/get_the_point.txt, forge-gui/res/cardsfolder/upcoming/haazda_officer.txt, forge-gui/res/cardsfolder/upcoming/lawmages_binding.txt, forge-gui/res/cardsfolder/upcoming/rubble_slinger.txt, forge-gui/res/cardsfolder/upcoming/rubblebelt_runner.txt, forge-gui/res/cardsfolder/upcoming/screaming_shield.txt, forge-gui/res/cardsfolder/upcoming/scuttlegator.txt, forge-gui/res/cardsfolder/upcoming/senate_griffin.txt, forge-gui/res/cardsfolder/upcoming/summary_judgment.txt, forge-gui/res/cardsfolder/upcoming/vizkopa_vampire.txt files 2019-01-28 07:01:43 +00:00
Peter F. Patel-Schneider
25003aa74e better way to schedule visual updates to non-selectable cards 2019-01-27 21:09:52 -05:00
T.J. Tillman
766277673d Update simic_locket.txt 2019-01-27 23:45:21 +00:00
T.J. Tillman
a1ad2208c8 Update rix_maadi_reveler.txt 2019-01-27 23:01:06 +00:00
T.J. Tillman
0bfdfb78d3 Update ill_gotten_inheritance.txt 2019-01-27 22:43:34 +00:00
T.J. Tillman
b23425ea9a Update bloodmist_infiltrator.txt 2019-01-27 22:37:18 +00:00
T.J. Tillman
8b7ace6d1c Added TrigChangeZone to bounce it back, and CheckSVar to check if instant cast in Main Phase 2019-01-27 21:45:52 +00:00
T.J. Tillman
1dc8ef5244 Fixed problem with self-exiling after trigger resolution (Hanmac) 2019-01-27 20:34:35 +00:00
T.J. Tillman
625585f005 Fixed Scry 3 2019-01-27 20:15:05 +00:00
T.J. Tillman
acdee9ff0c Update fireblade_artist.txt 2019-01-27 19:43:56 +00:00
T.J. Tillman
54c5d3f344 Fix Fireblade Artist to reflect "when you" sacrifice trigger (similar to Heart-Piercer Manticore) 2019-01-27 19:25:20 +00:00
T.J. Tillman
4fa8fa3993 Update sentinels_mark.txt 2019-01-27 18:04:06 +00:00
T.J. Tillman
3b21b2a610 Fix fireblade_artist dealing damage on sacrifice 2019-01-27 17:58:28 +00:00
T.J. Tillman
07324f63d9 Update spawn_of_mayhem.txt 2019-01-27 17:56:47 +00:00
T.J. Tillman
79c3570bcc Update gutterbones.txt 2019-01-27 17:55:48 +00:00
T.J. Tillman
d9400fe069 Update rix_maadi_reveler.txt 2019-01-27 17:55:04 +00:00
Peter F. Patel-Schneider
70f0f1108b darken non-selectable cards during paintChildren 2019-01-27 08:22:50 -05:00
Peter F. Patel-Schneider
62316abf38 darken non-selectable cards when selecting (needs work) 2019-01-27 07:16:54 -05:00
Peter F. Patel-Schneider
e2ddcdda4d stronger highlighting for selectable cards 2019-01-27 07:16:54 -05:00
T.J. Tillman
e604d9d0cb Update consecrate_consume.txt to add Cleanup Remembered 2019-01-27 05:18:49 +00:00
tjtillmancoag
ed218b6e4c Fixed Amplifire (properly changes Power & Toughness),
Consume (of Consecrate // Consume, works now),
Final Payment (allows sacrifice of enchantment/creature as payment),
Incongruity (fixed A:AB$ to A:SP$),
Sentinel's Mark (gives Lifelink on Main phase trigger)
Silhana Wayfinder (triggers on ETB)
Smelt Ward Ignus (loses control of creature at EoT)
Undercity's Embrace (no life amount in gainlife ability was causing crash on cast)
2019-01-26 19:39:04 -08:00
Michael Kamensky
866c959036 Merge branch 'spellControllerFix' into 'master'
Spell: fix casting opponent spells

Closes #811

See merge request core-developers/forge!1315
2019-01-26 14:31:12 +00:00
Hanmac
b2616860c0 Spell: fix casting opponent spells 2019-01-26 13:28:55 +01:00
Hans Mackowiak
0ceb882ab0 Merge branch 'charmRework' into 'master'
Charm rework

Closes #806

See merge request core-developers/forge!1312
2019-01-26 09:24:25 +00:00
Hans Mackowiak
560dc572c2 Charm rework 2019-01-26 09:24:25 +00:00
Michael Kamensky
27bae4a72b Merge branch 'fix-rna-sealed' into 'master'
Fix up the RNA printsheets a little bit (wrong card names, wrong set IDs)

See merge request core-developers/forge!1313
2019-01-25 15:02:16 +00:00
Agetian
6686937742 - Fix up the RNA printsheets a little bit (wrong card names, wrong set IDs) 2019-01-25 18:01:24 +03:00
Michael Kamensky
d6a466df11 Merge branch 'fix-rna-sealed' into 'master'
Fix AI sealed booster generation for Ravnica Allegiance

Closes #801

See merge request core-developers/forge!1311
2019-01-25 14:27:08 +00:00
Agetian
7eedd04aa1 - Add basic lands definitions to Ravnica Allegiance.
- Revert blocks.txt to use RNA for the land set.
2019-01-25 17:21:21 +03:00
Agetian
e3c9a40a17 - Use M19 lands as the default basic lands for GRN and RNA sealed/draft, since neither set has basic lands of its own in actual booster packs. 2019-01-25 17:17:40 +03:00