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,044 Commits 31 Branches 187 Tags
8f0457f0fa45273c2bcdaa4b49b4400c45e2b3af
Commit Graph

41044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
8f0457f0fa Merge branch 'master' into 'master' 
A couple card fixes.

Closes #981

See merge request core-developers/forge!1639
 2019-05-11 04:34:17 +00:00
Michael Kamensky
e22bf5944b - Fixed Band Together. 
- Adding a couple missing references to Incubation Druid.
 2019-05-11 04:34:17 +00:00
swordshine
43f71b0d1e Merge branch 'patch-9' into 'master' 
Band Together correction

See merge request core-developers/forge!1638
 2019-05-10 02:57:39 +00:00
Charles Baker
08551d8ac9 Band Together correction 2019-05-10 02:26:45 +00:00
swordshine
d4b8174fcb Merge branch 'patch-2' into 'master' 
Update dreadhorde_invasion.txt

See merge request core-developers/forge!1637
 2019-05-10 01:21:28 +00:00
Sol
a32a3e5feb Update dreadhorde_invasion.txt 2019-05-10 01:10:33 +00:00
Michael Kamensky
19116c70b0 Merge branch 'wardeckgen' into 'master' 
Early WAR standard deck generation data

See merge request core-developers/forge!1636
 2019-05-09 11:11:33 +00:00
austinio7116
3e26cf25f1 Early WAR standard deck generation data 
(cherry picked from commit ab59734)
 2019-05-09 06:30:47 +01:00
Michael Kamensky
576fc9834b Merge branch 'master' into 'master' 
Added puzzle PS_WAR1 (Possibility Storm - War of the Spark 01)

See merge request core-developers/forge!1635
 2019-05-09 04:48:05 +00:00
Agetian
99b324162c - Added puzzle PS_WAR1. 2019-05-09 07:47:21 +03:00
swordshine
59e3e01481 Merge branch 'patch-7' into 'master' 
Jaya, Vernerated Firemage correction

See merge request core-developers/forge!1633
 2019-05-09 04:38:54 +00:00
Charles Baker
ede13b134f Updated so that only other red sources the player controls get the additional 1 damage. Jaya's ability will now only do 2 damage instead of 3. 2019-05-09 01:33:05 +00:00
swordshine
335f2176df Merge branch 'undefined' into 'master' 
Azra Oddsmaker

See merge request core-developers/forge!1626
 2019-05-09 00:48:07 +00:00
Charles Baker
6969adcbb1 Update azra_oddsmaker.txt 2019-05-08 23:51:15 +00:00
Charles Baker
e9e85cc413 This code was able to produce the effects of the card without targeting. 2019-05-08 23:43:54 +00:00
Sol
d60be863d1 Merge branch 'pwNumActivated' into 'master' 
Pw num activated

Closes #963

See merge request core-developers/forge!1631
 2019-05-08 01:36:10 +00:00
Hanmac
a5a8386b58 cards: some card fixes 2019-05-07 23:01:12 +02:00
Hanmac
7160670597 PW Ability: store num of activations in card 2019-05-07 23:00:24 +02:00
swordshine
4cae773077 Merge branch 'patch-3' into 'master' 
Together Forever - Tested and Working

See merge request core-developers/forge!1627
 2019-05-07 02:17:47 +00:00
Charles Baker
b1ad461e80 Should now be choose instead of target. 2019-05-06 22:33:04 +00:00
Charles Baker
7515126302 Update together_forever.txt 2019-05-06 21:07:27 +00:00
swordshine
beba8121c1 Merge branch 'patch-2' into 'master' 
Virulent Wound: Change SubAbility from DBAnimate to DBEffect. Changed Oracle to match current.

See merge request core-developers/forge!1625
 2019-05-06 02:47:51 +00:00
Charles Baker
f20580084e Update virulent_wound.txt 2019-05-06 02:15:14 +00:00
Charles Baker
44b6b8fcf4 Update virulent_wound.txt 2019-05-06 02:14:42 +00:00
swordshine
d813648464 Merge branch 'patch-4' into 'master' 
Ajani Goldmane Avatar Token was spawning without P/T with the previous script (causing it to die...

See merge request core-developers/forge!1628
 2019-05-06 00:59:32 +00:00
Charles Baker
fb6e04720c Shadowbane - Tested and working 2019-05-05 19:09:29 +00:00
Charles Baker
f93a4aba47 Update together_forever 2019-05-05 19:08:06 +00:00
Charles Baker
5338becbfb Token was spawning without P/T with the previous script (causing it to die ASAP). This modification allows the token to spawn with the desired X value. 2019-05-05 18:38:10 +00:00
Charles Baker
9fe925dc6c Together Forever - Tested and Working 2019-05-05 17:06:53 +00:00
Charles Baker
4954aebc96 Update virulent_wound.txt 2019-05-05 16:46:30 +00:00
Charles Baker
ce68bde583 Azra Oddsmaker - Tested and Working 2019-05-05 16:41:08 +00:00
Charles Baker
943269cfac Change SubAbility from DBAnimate to DBEffect. Changed Oracle to match current. 2019-05-05 16:34:23 +00:00
swordshine
5cd60cf9a3 Merge branch 'patch' into 'master' 
Some nonfunctional changes according to the update bulletin

See merge request core-developers/forge!1624
 2019-05-05 04:38:39 +00:00
swordshine
ec97a6f966 Some nonfunctional changes according to the update bulletin 2019-05-05 11:55:25 +08:00
Agetian
620a407e59 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-05 06:37:40 +03:00
swordshine
aa8e41ec27 Merge branch 'patch' into 'master' 
Fix more cards

See merge request core-developers/forge!1623
 2019-05-05 01:00:14 +00:00
swordshine
7def9b88e8 Fix Narset's Reversal 2019-05-05 08:59:51 +08:00
swordshine
862fe57401 Fix Role Reversal 2019-05-05 08:58:10 +08:00
swordshine
27caf79e8f Merge branch 'patch' into 'master' 
Fix a few cards

See merge request core-developers/forge!1622
 2019-05-05 00:50:22 +00:00
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