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

41693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
b8a0882b66 Merge branch 'master' into 'master' 
Don't fall through to other switch cases in CardView to avoid subtle bugs.

See merge request core-developers/forge!1652
 2019-05-19 04:03:10 +00:00
Agetian
85b697d54e - Don't fall through to other switch cases in CardView to avoid subtle bugs. 2019-05-19 06:58:37 +03:00
Sol
0fb8ed7f0a Merge branch 'bolasVivien' into 'master' 
Bolas's Citadel and Vivien, Champion of the Wilds

See merge request core-developers/forge!1650
 2019-05-19 02:36:56 +00:00
Hans Mackowiak
e9ad4be05d - CardView: fall through in case a card in exile is face down, so that all the relevant checks are made. 2019-05-19 02:36:56 +00:00
Sol
1eb9589548 Ugin the Ineffable 2019-05-19 02:06:32 +00:00
Michael Kamensky
39267b4723 Merge branch 'master' into 'master' 
Fixed a logic error in DigAi which prevented the AI from paying a X cost for Vivien's Arkbow

Closes #988

See merge request core-developers/forge!1649
 2019-05-17 13:27:41 +00:00
Agetian
e93421d4b7 - Fixed a logic error in DigAi which prevented the AI from paying a mana cost e.g. for Vivien's Arkbow. 2019-05-17 16:22:54 +03:00
swordshine
a090479253 Merge branch 'patch-13' into 'master' 
Fblthp, the Lost correction

See merge request core-developers/forge!1648
 2019-05-16 00:47:49 +00:00
Charles Baker
20eb6777d2 added Legendary type 2019-05-15 22:26:40 +00:00
Michael Kamensky
b00851ed24 Merge branch 'patch-12' into 'master' 
Storrev, Devkarin Lich from War of the Spark

See merge request core-developers/forge!1646
 2019-05-15 03:25:17 +00:00
Charles Baker
a922697d26 Storrev, Devkarin Lich from War of the Spark 2019-05-15 01:28:59 +00:00
Michael Kamensky
3b605adb4d Merge branch 'war-tricky-cards' into 'master' 
Added Ashiok, Dream Render.

See merge request core-developers/forge!1644
 2019-05-14 15:22:19 +00:00
Agetian
31d9a1e6b3 - Attempting to consolidate the implementation for "can't search library". 2019-05-14 16:33:09 +03:00
Agetian
3913f7661f - Some AI support for CantSearchLibrary / Ashiok effect. 2019-05-14 12:13:10 +03:00
Michael Kamensky
83be371d1c Merge branch 'patch-8' into 'master' 
Fade Away from Exodus

See merge request core-developers/forge!1634
 2019-05-14 08:35:47 +00:00
Agetian
72d623784a - Added Ashiok, Dream Render. 2019-05-14 08:38:24 +03:00
Michael Kamensky
681446cba4 Merge branch 'master' into 'master' 
Added puzzle PS_WAR2 (Possibility Storm - War of the Spark 02)

See merge request core-developers/forge!1643
 2019-05-14 05:25:52 +00:00
Agetian
5eb56e0d0e - Added puzzle PS_WAR2. 2019-05-14 07:27:46 +03:00
Agetian
b45ab00cf6 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-14 07:15:56 +03:00
Michael Kamensky
5ce0340240 Merge branch 'activationLimitStatic' into 'master' 
Card: store activations in Card

See merge request core-developers/forge!1640
 2019-05-13 14:39:11 +00:00
Hans Mackowiak
8e5e8e1759 Card: store activations in Card 2019-05-13 14:39:11 +00:00
Charles Baker
00bd55f063 Add new file 2019-05-11 18:19:37 +00:00
Agetian
ad80eaa4e9 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-11 20:15:48 +03:00
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
Agetian
984b807f27 - Fixed Band Together, part 2. 2019-05-11 07:10:40 +03:00
Agetian
eb5d50da40 - Merge upstream. 2019-05-11 07:09:49 +03:00
Agetian
3d320603b2 - Fixed Band Together. 
- Adding a couple missing references to Incubation Druid.
 2019-05-11 07:00:58 +03:00
Charles Baker
48b3fe1209 Update fade_away.txt 2019-05-10 10:40:34 +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
b2a1f696e6 Fade Away from Exodus 2019-05-09 01:54:50 +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
churrufli
70655c0f26 Moving hard-coded text to en-US.properties file 2019-05-09 00:03:38 +02:00
churrufli
d041a1d315 updating res files 2019-05-08 23:21:03 +02:00
churrufli
e9b266e1d2 updating res files 2019-05-08 23:21:03 +02:00
churrufli
ae4bb531f0 updating res files 2019-05-08 23:21:03 +02:00
churrufli
08ae29c502 updating res files 2019-05-08 23:21:03 +02:00
churrufli
efb3401eff Update language properties 2019-05-08 23:21:03 +02:00
churrufli
662d725aa4 updating res files 2019-05-08 23:21:03 +02:00