external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,331 Commits 31 Branches 187 Tags
d64cda692b55e98f97df3225eaf0d65ebac205cc
Commit Graph

41331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
T.J. Tillman
9deeec7b14 Merge branch 'fixDeputyOfDetention' into 'master' 
Fix Deputy of Detention

See merge request tjtillmancoag/forge!3
 2019-01-29 08:57:28 +00:00
T.J. Tillman
b58b2b93e2 Fix Deputy of Detention (now exiles other cards of the same name, and also now returns those cards to the BF when it leaves the BF) 2019-01-29 07:37:06 +00:00
Michael Kamensky
2697f5f404 Merge branch 'master' into 'master' 
Fixed Sentinel's Mark Lifelink trigger

See merge request core-developers/forge!1325
 2019-01-29 05:46:50 +00:00
T.J. Tillman
78db487e8d Merge branch 'sentinelsMarkTrigger' into 'master' 
Fix lifelink trigger on Sentinel's Mark

See merge request tjtillmancoag/forge!2
 2019-01-29 05:32:53 +00:00
T.J. Tillman
1ecd1a8340 Fix lifelink trigger on Sentinel's Mark 2019-01-29 05:31:58 +00:00
Michael Kamensky
c7539de77d Merge branch 'master' into 'master' 
RNA Planeswalker Deck Precons

See merge request core-developers/forge!1324
 2019-01-29 05:12:28 +00:00
Agetian
b0ee2cedff - Added RNA planeswalker decks to quest mode precons. 2019-01-29 08:11:50 +03:00
Sol
7a0453390a Merge branch 'migrate-upcoming' into 'master' 
Migrate upcoming

See merge request core-developers/forge!1323
 2019-01-29 04:13:50 +00:00
Chris H
1b47a2df87 Migrate RNA to alpha folders 2019-01-28 22:58:33 -05:00
Chris H
fd54606277 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-01-28 22:44:44 -05:00
Chris H
25b02141bd Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-01-28 22:43:07 -05:00
Sol
bcc4158956 Merge branch 'someRNAFixes' into 'master' 
Fix Spectacle cost for Blade Juggler

See merge request core-developers/forge!1322
 2019-01-29 03:42:37 +00:00
T.J. Tillman
fc5b76fbb4 Fix cast cost of Colossus 2019-01-29 03:41:59 +00:00
T.J. Tillman
38ddca0acd Fix Spectacle cost 2019-01-29 03:37:10 +00:00
Sol
7ed935c43c Merge branch 'someRNAFixes' into 'master' 
Fix Sphinx of Foresight opening scry timing

See merge request core-developers/forge!1321
 2019-01-29 03:32:52 +00:00
T.J. Tillman
14629715a2 Fix cost of spirit-making ability on Ethereal Absolution 2019-01-29 03:22:44 +00:00
T.J. Tillman
e71ff26b81 Update forge-gui/res/cardsfolder/upcoming/sphinx_of_foresight.txt 2019-01-29 00:35:26 +00:00
Sol
7d6dec773a Merge branch 'someRNAFixes' into 'master' 
New Cards: RNA Domri planeswalkers

See merge request core-developers/forge!1320
 2019-01-28 23:35:33 +00:00
T.J. Tillman
e52bcc6cdc Update forge-gui/res/cardsfolder/upcoming/dovins_automaton.txt 2019-01-28 22:26:02 +00:00
T.J. Tillman
b3e1d96aff Upload New File 2019-01-28 22:06:12 +00:00
T.J. Tillman
e13880c87e Domri, City Smasher 2019-01-28 20:18:07 +00:00
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