external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,754 Commits 32 Branches 187 Tags
af14c33e39f0199ca66cdca29eefda7418cc1df5
Commit Graph

35754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Schnautz
e2189ea877 Fix drafting and basic lands 2018-01-15 18:49:07 +00:00
Sol
fe31d692f2 Merge branch 'patch-1' into 'master' 
Update formats.txt, effective 1/19/18 with release of RIX.

See merge request core-developers/forge!103
 2018-01-15 16:24:57 +00:00
Rob Schnautz
84c2ac918b Update formats.txt, effective 1/19/18 with release of RIX. 2018-01-15 16:17:51 +00:00
Sol
6cf97aa2fc Merge branch 'rix-cards' into 'master' 
Added Golden Guardian [RIX]

See merge request core-developers/forge!102
forge-1.6.6 		2018-01-15 13:48:13 +00:00
Agetian
b58a561863 - Updating CHANGES.txt. 2018-01-15 16:02:01 +03:00
Agetian
06c13804a4 Merge branch 'master' of git.cardforge.org:core-developers/forge into rix-cards 2018-01-15 16:01:13 +03:00
Agetian
bf8e88f76b - Added Golden Guardian [RIX]. Will eventually need to be reworked to use AF DelayedTrigger. 2018-01-15 16:00:52 +03:00
Michael Kamensky
84528b5251 Merge branch 'newcard' into 'master' 
- Merieke Ri Berit's ability has a delayed trigger

See merge request core-developers/forge!101
 2018-01-15 12:18:26 +00:00
Sol
f76428b668 Merge branch 'two-explores' into 'master' 
Fix Jadelight Ranger description

See merge request core-developers/forge!100
 2018-01-15 04:31:41 +00:00
swordshine
d8abdf1a2e - Merieke Ri Berit's ability has a delayed trigger 2018-01-15 09:25:10 +08:00
Chris H
f9f83660f5 Fix Jadelight Ranger description 2018-01-14 17:55:24 -05:00
Michael Kamensky
ddfd97c395 Merge branch 'upcoming_rix2' into 'master' 
Added token image for rekindling phoenix

See merge request core-developers/forge!99
 2018-01-14 16:49:32 +00:00
austinio7116
f658ba29c9 Added token image for rekindling phoenix 2018-01-14 15:12:39 +00:00
Sol
57cf22af43 Merge branch 'newcard' into 'master' 
Fixed a card

See merge request core-developers/forge!98
 2018-01-14 14:48:51 +00:00
Sol
eaea379532 Merge branch 'upcoming_rix2' into 'master' 
Ability description fix for Kumena

See merge request core-developers/forge!97
 2018-01-14 13:36:33 +00:00
swordshine
2ac3829b6f - Wormfang Drake should not exile an opponent's creature 2018-01-14 18:07:14 +08:00
swordshine
29e3cf4a79 - Fixed the the plural merfolk in the typelist 2018-01-14 18:03:11 +08:00
maustin
d84e2e4e23 Merge remote-tracking branch 'origin/upcoming_rix2' into upcoming_rix2 2018-01-14 09:58:48 +00:00
austinio7116
02b8d39791 Ability description fix for Kumena 2018-01-14 09:58:32 +00:00
austinio7116
f7a74edc6e Ability description fix for Kumena 2018-01-14 09:50:31 +00:00
swordshine
8feaf0795f - Simplified the code 2018-01-14 10:53:21 +08:00
Sol
87a857220f Merge branch 'upcoming_rix2' into 'master' 
Induced Amnesia

See merge request core-developers/forge!96
 2018-01-14 01:48:59 +00:00
austinio7116
403550af5f Update ChooseCardEffect.java 2018-01-14 00:54:04 +00:00
maustin
d6ffdddfc6 Text correction "a creature" -> creature(s) for new WithTotalPower effect 2018-01-14 00:51:55 +00:00
austinio7116
7663df024c Added Induced Amnesia - cleaned up unneeded define 2018-01-14 00:32:17 +00:00
maustin
704c735bc5 Merge remote-tracking branch 'origin/upcoming_rix2' into upcoming_rix2 2018-01-14 00:21:21 +00:00
austinio7116
ec72e9f7d7 Added Induced Amnesia 2018-01-14 00:20:55 +00:00
austinio7116
f95ada602c Added Induced Amnesia 2018-01-14 00:19:04 +00:00
Hanmac
7c10272d03 Fix: added References to tilonallis_summoner 2018-01-13 22:17:36 +01:00
Hanmac
3c3c64a11a AtEOT: add AtEOTCondition & AtEOTDesc 2018-01-13 17:11:23 +01:00
Michael Kamensky
722c16e925 Merge branch 'rix-rename' into 'master' 
Migrate RIX to appropriate card letter folders

See merge request core-developers/forge!95
 2018-01-13 15:45:18 +00:00
Chris H
4a799cf45f Migrate RIX to appropriate card letter folders 2018-01-13 10:21:23 -05:00
Sol
16acf2d46c Merge branch 'rix-cards' into 'master' 
Added Flood of Recollection [RIX]

See merge request core-developers/forge!91
 2018-01-13 14:35:16 +00:00
Sol
413c14a1dc Merge branch 'RIX' into 'master' 
Rix

See merge request core-developers/forge!94
 2018-01-13 14:34:57 +00:00
swordshine
826f37e4b9 - Added Cherished Hatchling 2018-01-13 22:15:55 +08:00
swordshine
39654e498c - Updated more scripts 2018-01-13 21:56:05 +08:00
swordshine
e3432ced3c - More oracle updates 2018-01-13 21:25:20 +08:00
swordshine
917ae1daab - Updated the Dinosaur type for a few cards 2018-01-13 21:15:50 +08:00
Michael Kamensky
a09086bfc2 Merge branch 'RIX' into 'master' 
Updated the chooseCard effect for Slaughter the Strong

See merge request core-developers/forge!93
 2018-01-13 13:08:20 +00:00
swordshine
2ac38e6639 - one more update 2018-01-13 20:02:59 +08:00
swordshine
3dc54790cc - Updated the chooseCard effect for Slaughter the Strong 2018-01-13 19:50:14 +08:00
Agetian
ce780c5175 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-01-13 12:25:02 +03:00
Michael Kamensky
35a76b4a43 Merge branch 'RIX' into 'master' 
- Added Slaughter the Strong

See merge request core-developers/forge!92
 2018-01-13 09:22:02 +00:00
swordshine
999f990870 - Added Awakened Amalgam by Marek14 2018-01-13 16:39:37 +08:00
swordshine
e050a62b0c - Added Slaughter the Strong 2018-01-13 16:21:59 +08:00
Agetian
1cd278afcf - Added Flood of Recollection [RIX]. 2018-01-13 09:05:09 +03:00
Agetian
208089a5cd Merge remote-tracking branch 'upstream/master' 2018-01-13 08:16:02 +03:00
Michael Kamensky
0c66c256b3 Merge branch 'sort-deck-folders' into 'master' 
Sort the folder list in the deck editor

See merge request core-developers/forge!88
 2018-01-13 05:13:59 +00:00
Agetian
66e8154243 Merge remote-tracking branch 'upstream/master' 2018-01-13 08:04:48 +03:00
Michael Kamensky
ff4db64802 Merge branch 'patch-6' into 'master' 
Patch for Issue #8, coded by @friarsol

See merge request core-developers/forge!86
 2018-01-13 04:51:09 +00:00