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
41,205 Commits 32 Branches 187 Tags
e020fce6085f7feec2fc1dc9fcb0b0056901a30c
Commit Graph

41205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
49bb679a12 Fix a few cards 2019-05-05 08:50:06 +08:00
Agetian
a4029cf114 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-04 16:39:20 +03:00
Michael Kamensky
1b76daa64f Merge branch 'patch' into 'master' 
Add Niv-Mizzet Reborn

See merge request core-developers/forge!1620
 2019-05-04 13:05:35 +00:00
swordshine
6b1343f6c9 Fix color pair 2019-05-04 20:55:29 +08:00
Michael Kamensky
21d980c36b Merge branch 'master' into 'master' 
Fix the duration on Karn, the Great Creator's +1 ability

Closes #969

See merge request core-developers/forge!1621
 2019-05-04 12:24:34 +00:00
Michael Kamensky
15964daa27 Fix the duration on Karn, the Great Creator's +1 ability 2019-05-04 12:24:34 +00:00
Agetian
6bac73fd37 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-04 15:23:29 +03:00
Agetian
add926535f - Fix Karn, the Great Creator's +1 ability duration. 2019-05-04 15:20:59 +03:00
swordshine
b6bfc9df3b Merge branch 'morphUpX' into 'master' 
CardFactoryUtil: fix X in Morph cost

Closes #968

See merge request core-developers/forge!1619
 2019-05-04 12:20:12 +00:00
Hans Mackowiak
7687ed591a CardFactoryUtil: fix X in Morph cost 2019-05-04 12:20:12 +00:00
swordshine
415edd2225 Merge branch 'patch-1' into 'master' 
Update dire_fleet_ravager.txt (Oracle Text had wrong name)

See merge request core-developers/forge!1618
 2019-05-04 12:19:58 +00:00
swordshine
e57ce5fa91 Reveal the picked cards 2019-05-04 20:01:40 +08:00
swordshine
e4fad75edd Add Niv-Mizzet Reborn 2019-05-04 19:43:01 +08:00
Computica
cc05043055 Update dire_fleet_ravager.txt (Oracle Text had wrong name) 2019-05-04 10:40:42 +00:00
Agetian
413ff146e7 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-04 13:12:37 +03:00
Michael Kamensky
54e163fb87 Merge branch 'godKefnetAi' into 'master' 
Kefnet: add AI logic for the reveal effect

See merge request core-developers/forge!1617
 2019-05-04 10:04:43 +00:00
Hans Mackowiak
fec2ea4bd8 Kefnet: add AI logic for the reveal effect 2019-05-04 10:04:43 +00:00
swordshine
ab340bf863 Merge branch 'war-ai-hints' into 'master' 
War of the Spark AI hints

See merge request core-developers/forge!1616
 2019-05-04 07:28:56 +00:00
Michael Kamensky
1be992af0c War of the Spark AI hints 2019-05-04 07:28:56 +00:00
Agetian
0bda3015d9 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-04 08:13:01 +03:00
swordshine
801ab7ceab Merge branch 'war_planeswalker_decks' into 'master' 
Added WAR planeswalker decks to quest precons, added WAR to planar conquest Ravnica plane.

See merge request core-developers/forge!1615
 2019-05-04 05:06:00 +00:00
Michael Kamensky
44a4e9c971 Added WAR planeswalker decks to quest precons, added WAR to planar conquest Ravnica plane. 2019-05-04 05:06:00 +00:00
Agetian
5f233e33a0 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-04 07:18:40 +03:00
swordshine
312dfc0205 Merge branch 'godEternalKefnet' into 'master' 
Refactor Miracle and add God Eternal Kefnet

See merge request core-developers/forge!1609
 2019-05-04 01:57:10 +00:00
Hans Mackowiak
38178cfb21 Refactor Miracle and add God Eternal Kefnet 2019-05-04 01:57:10 +00:00
austinio7116
3002cbb5a8 Merge branch 'patch' into 'master' 
Add some cards

See merge request core-developers/forge!1613
 2019-05-03 22:18:03 +00:00
swordshine
039cd133ce Update some scripts 2019-05-04 00:04:44 +08:00
swordshine
35446e583d Add Tolsimir, Friend to Wolves 2019-05-03 23:53:53 +08:00
swordshine
7cb593cec0 Add Kaya's Ghostform 2019-05-03 23:40:06 +08:00
swordshine
ef477f2b2e Update Deliver Unto Evil 2019-05-03 23:34:10 +08:00
swordshine
7aa1685590 Add Single Combat 2019-05-03 23:18:15 +08:00
swordshine
fd68a753b6 Add Gideon's Sacrifice 2019-05-03 22:56:36 +08:00
swordshine
24dff3250f Fix The Wanderer 2019-05-03 22:56:02 +08:00
swordshine
44eb2b34a2 Add Deliver Unto Evil 2019-05-03 22:28:11 +08:00
austinio7116
bfc79ca55f Merge branch 'patch' into 'master' 
WAR: add some cards

See merge request core-developers/forge!1612
 2019-05-03 09:14:19 +00:00
swordshine
284ef835b3 Removed a param in Command the Dreadhorde 2019-05-03 17:09:39 +08:00
swordshine
49e85c40b2 Add Command the Dreadhorde 
Fix assassin token's trigger description
 2019-05-03 17:06:50 +08:00
swordshine
be96de241d Add God-Eternal Rhonas 2019-05-03 16:11:13 +08:00
swordshine
a0f5afeaad Add Vraska, Swarm's Eminence 2019-05-03 13:07:14 +08:00
swordshine
00326240d4 WAR: add some cards 2019-05-03 12:47:20 +08:00
swordshine
fe20878e33 Merge branch 'patch' into 'master' 
Add Mobilized District

See merge request core-developers/forge!1608
 2019-05-03 03:05:35 +00:00
swordshine
0a44256403 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into patch 2019-05-03 11:00:16 +08:00
swordshine
8764534d51 Merge branch 'war-cards' into 'master' 
[WAR] Added 3 cards, fixed 1 card.

See merge request core-developers/forge!1607
 2019-05-03 02:57:20 +00:00
swordshine
f233a1c6aa Merge branch 'patch-2' into 'master' 
Update tenth_district_legionnaire.txt (Trigger didn't fire:Battlewise Hoplite w/Haste)

See merge request core-developers/forge!1611
 2019-05-03 02:56:51 +00:00
swordshine
a2c0704b51 Merge branch 'patch-1' into 'master' 
Update mu_yanling.txt (Add turn function wasn't called)

See merge request core-developers/forge!1610
 2019-05-03 02:55:21 +00:00
Computica
94472179ee Update tenth_district_legionnaire.txt (Trigger didn't fire:Battlewise Hoplite w/Haste) 2019-05-03 02:46:26 +00:00
Computica
76b8ba2b68 Update mu_yanling.txt (Add turn function wasn't called) 2019-05-03 02:24:03 +00:00
Agetian
40df90456e - Removed Teferi's Time Twist [to be recoded differently later]. 2019-05-02 22:00:30 +03:00
swordshine
1a78f0a4f3 Add Mobilized District 2019-05-02 23:45:16 +08:00
Agetian
64bd2c8bf7 - Fix Jace, Wielder of Mysteries. 2019-05-02 18:38:29 +03:00