external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,300 Commits 32 Branches 187 Tags
2f88b45d67a23ceee644b6b6b61b9743e35e94e2
Commit Graph

39300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
4639ec444b - Added Selective Snare 2018-10-07 12:54:55 +08:00
swordshine
c08ab94963 - Fixed Severed Strands by T.J. Tillman 2018-10-07 12:54:34 +08:00
swordshine
3e3c3dcb6f Merge branch 'grnmissingcards2' into 'master' 
GRN booster images

See merge request core-developers/forge!988
 2018-10-07 03:18:41 +00:00
austinio7116
897046b057 Merge branch 'master' into 'master' 
Add and Fix some GRN cards

See merge request core-developers/forge!986
 2018-10-06 21:40:02 +00:00
austinio7116
d6b9f0cc0f GRN booster images 2018-10-06 22:11:20 +01:00
swordshine
ee752f8e8b - Added Thief of Sanity 2018-10-05 15:20:27 +08:00
swordshine
577d6270c4 - Added Plaguecrafter 2018-10-05 14:43:23 +08:00
swordshine
20373015b4 - Fixed three cards by stormcat 2018-10-05 14:19:37 +08:00
swordshine
98c8feac99 - Added Mnemonic Betrayal 2018-10-05 14:13:20 +08:00
swordshine
85a5fe380d - Fixed Commander tax 2018-10-05 14:10:21 +08:00
swordshine
ede5da10a1 - Fixed Find // Finality 2018-10-05 11:05:42 +08:00
swordshine
062c560ec5 Merge branch 'grnmissingcards2' into 'master' 
Updated Deck Generation Data - Added Mission Briefing from fsecco on the forum.  Updated to use Surveil rather than dig.

See merge request core-developers/forge!987
 2018-10-05 02:55:13 +00:00
austinio7116
2266824fc5 More GRN data for deck generation 
(cherry picked from commit 26468ac)
 2018-10-04 21:33:46 +01:00
austinio7116
39d2e62cc0 Added Mission Briefing from fsecco on the forum. Updated to use Surveil rather than dig. 2018-10-04 17:18:04 +01:00
swordshine
5b07b61b5c Merge branch 'grn-stuff' into 'master' 
Adding GRN quest mode precons, planeswalker achievements, and alt wincon achievements.

See merge request core-developers/forge!985
 2018-10-04 15:51:17 +00:00
swordshine
f793419a05 - Arclight Phoenix's TriggerDescription 2018-10-04 23:16:23 +08:00
swordshine
56ed75a244 - Fixed Arclight Phoenix 2018-10-04 23:09:46 +08:00
Michael Kamensky
abe4be9adf Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_GRN0a (Possibility Storm GRN pre-season puzzle 2).

See merge request core-developers/forge!984
 2018-10-04 15:07:22 +00:00
Agetian
4b34d5489f - Added GRN quest mode precons. 
- Added GRN planeswalker and alt wincon achievements (by Marek14, with minor changes to fit the overall naming style).
 2018-10-04 18:05:39 +03:00
Agetian
5aa25c55ed - Added puzzle PS_GRN0a. 2018-10-04 17:39:55 +03:00
Michael Kamensky
3af5d7e724 Merge branch 'master' into 'master' 
Added some remaining GRN cards from austinio7116's branch

See merge request core-developers/forge!982
 2018-10-04 14:17:22 +00:00
Michael Kamensky
3cef952d66 Merge branch 'circu' into 'master' 
Circu: functional update

See merge request core-developers/forge!983
 2018-10-04 14:16:41 +00:00
Hanmac
72b9b7d5f4 Circu: functional update 2018-10-04 14:08:09 +02:00
swordshine
12af09d255 - Added Vraska, Golgari Queen 2018-10-04 14:27:06 +08:00
swordshine
c77f9fe3ce - Added Discovery // Dispersal 2018-10-04 14:26:25 +08:00
swordshine
7f37b035fb - Added Charnel Troll 2018-10-04 14:25:16 +08:00
swordshine
f270a189f1 Merge branch 'master' into 'master' 
- Added some cards

See merge request core-developers/forge!981
 2018-10-04 04:05:04 +00:00
swordshine
b7d25ec5c8 - Added Nimbus Champion 2018-10-04 11:57:00 +08:00
swordshine
ece38aed9d - Added Treasure Nabber 2018-10-03 23:43:32 +08:00
swordshine
3f6c197af8 - Added Primordial Mist 2018-10-03 23:41:46 +08:00
swordshine
d469aaabfe Merge branch 'master' into 'master' 
- Fixed Apex of Power

See merge request core-developers/forge!979
 2018-10-03 13:53:10 +00:00
swordshine
3bd69a13c1 - Fixed Apex of Power 2018-10-03 21:50:27 +08:00
Michael Kamensky
5b0af5492b Merge branch 'fix-spell-blast-issue_#678' into 'master' 
Fix Spell Blast: Add missing Reference

Closes #678

See merge request core-developers/forge!977
 2018-10-02 18:50:51 +00:00
swordshine
e6f554a2c4 Merge branch 'master' into 'master' 
- Fixed Jade Monolith

See merge request core-developers/forge!976
 2018-10-02 14:59:40 +00:00
pfirpfel
d3d423079b Fix Spell Blast: Add missing Reference 2018-10-02 16:48:29 +02:00
swordshine
e8d1cbd01d - Fixed Jade Monolith 2018-10-02 22:36:43 +08:00
swordshine
bba18f9bc4 Merge branch 'master' into 'master' 
- Fixed Whispering Snitch

See merge request core-developers/forge!975
 2018-10-02 14:23:05 +00:00
swordshine
aa10ca0795 Merge branch 'fix-kraul_harpooner-add-pump' into 'master' 
Fix Kraul Harpooner: add pump to triggered ability

See merge request core-developers/forge!973
 2018-10-02 14:23:00 +00:00
swordshine
09b62681c1 - Fixed Whispering Snitch 2018-10-02 22:21:13 +08:00
austinio7116
ce119c518f Merge branch 'fix-finality-allow-cast-no-creatures' into 'master' 
Fix Finality to allow casting without controlling any creatures

See merge request core-developers/forge!974
 2018-10-02 13:05:10 +00:00
pfirpfel
8042a202a6 Fix Kraul Harpooner: add pump to triggered ability 2018-10-02 11:35:14 +02:00
pfirpfel
7a439fe26f Fix Finality to allow casting without controlling any creatures 2018-10-02 11:33:41 +02:00
Michael Kamensky
27f61201f8 Merge branch 'volver' into 'master' 
cards: update Volver to use ReplacementEffect

See merge request core-developers/forge!972
 2018-10-02 07:56:15 +00:00
Michael Kamensky
7c0eb68ed5 Merge branch 'tokenCardText' into 'master' 
Token card text

Closes #716

See merge request core-developers/forge!961
 2018-10-02 07:18:45 +00:00
Hanmac
4f004069c0 cards: update Volver to use ReplacementEffect 2018-10-02 07:52:43 +02:00
Sol
18ca338968 Merge branch 'bug-fixes' into 'master' 
avoid NPE when right clicking during draft

See merge request core-developers/forge!971
 2018-10-02 03:48:41 +00:00
Jamin W. Collins
4c6b59e7ec avoid NPE when right clicking during draft 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-10-01 21:46:19 -06:00
Krazy
b1e070e3f8 Merge branch 'android' into 'master' 
Preparing Forge for Android publish 1.6.16.001

See merge request core-developers/forge!970
 2018-10-02 03:45:09 +00:00
Sol
4349fc5647 Merge branch 'typo-Citywatch-Sphinx' into 'master' 
Fix typo in TriggerDescription of Citywatch Sphinx  (exile -> surveil)

See merge request core-developers/forge!969
 2018-10-01 13:02:48 +00:00
Sol
55ce48975d Merge branch 'patch-14' into 'master' 
Probably fixes Oni Possession.

See merge request core-developers/forge!968
 2018-10-01 13:02:27 +00:00