external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,395 Commits 34 Branches 187 Tags
f44c6ac1a529e498be985b1184b7b95f95c1735c
Commit Graph

41395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
dfc8db1b75 - Preparing Forge for Android publish 1.6.24.001 [incremental]. 2019-05-02 06:40:02 +03:00
Blacksmith
f846e1c262 Clear out release files in preparation for next release 2019-05-02 01:21:38 +00:00
Blacksmith
52ad5d559a [maven-release-plugin] prepare for next development iteration 2019-05-02 01:16:44 +00:00
Blacksmith
711bc38276 [maven-release-plugin] prepare release forge-1.6.24 forge-1.6.24 2019-05-02 01:16:39 +00:00
Blacksmith
eed91b4354 Update README.txt for release 2019-05-02 01:14:00 +00:00
Sol
cbcb2037ea Merge branch 'war-release-info' into 'master' 
Release info

See merge request core-developers/forge!1605
 2019-05-02 01:12:10 +00:00
Chris H
d3e0e8ecde Release info 2019-05-01 21:04:06 -04:00
swordshine
3a2c7e8c8e Merge branch 'patch' into 'master' 
Fix two cards

See merge request core-developers/forge!1604
 2019-05-01 15:48:45 +00:00
swordshine
6b3d16267b Fix two cards 2019-05-01 23:48:20 +08:00
Sol
220e6eeb29 Merge branch 'migrate_war' into 'master' 
Migrate WAR

See merge request core-developers/forge!1603
 2019-05-01 14:06:40 +00:00
tehdiplomat
61d4faf5c0 Migrate WAR 2019-05-01 09:59:57 -04:00
Michael Kamensky
09a9718d02 Merge branch 'vitu-ghazi-test' into 'master' 
A test for Awakening of Vitu-Ghazi + Cytoshape.

See merge request core-developers/forge!1602
 2019-05-01 10:05:53 +00:00
Agetian
fd3deec51f - Test for the Goblin type. 
- Change assert to assertTrue for style similarity.
 2019-05-01 12:41:15 +03:00
Agetian
2447df4dde - Some more superfluous lines removed. 2019-05-01 12:35:41 +03:00
Agetian
7ae287b880 - Removed a couple duplicate lines. 2019-05-01 12:34:17 +03:00
Agetian
16797e67cd - Added a test for Awakening of Vitu-Ghazi + Cytoshape. 2019-05-01 12:32:06 +03:00
swordshine
f1b154319f Merge branch 'vituGhazi' into 'master' 
Vitu ghazi

See merge request core-developers/forge!1596
 2019-05-01 08:15:32 +00:00
Hans Mackowiak
698359cbc9 Vitu ghazi 2019-05-01 08:15:32 +00:00
Michael Kamensky
16cf063427 Merge branch 'differentColors' into 'master' 
Add Different colors to combo mana

See merge request core-developers/forge!1600
 2019-05-01 04:24:06 +00:00
Chris H
ea3cf1a7a8 Add Spell to mana restriction 2019-04-30 20:56:06 -04:00
Michael Kamensky
f72285e750 Merge branch 'master' into 'master' 
Added puzzle PS_WAR0a (Possibility Storm - War of the Spark 00a: Pre-release Puzzle)

See merge request core-developers/forge!1601
 2019-04-30 05:38:07 +00:00
Agetian
deae353e59 - Added puzzle PS_WAR0a. 2019-04-30 08:37:25 +03:00
Chris H
1f752ff210 Add Different colors to combo mana 2019-04-29 20:41:36 -04:00
swordshine
bb64aa8d25 Merge branch 'feather' into 'master' 
Feather the Redeemed

See merge request core-developers/forge!1598
 2019-04-29 12:41:02 +00:00
Hans Mackowiak
3f3b8bc41b Feather the Redeemed 2019-04-29 12:41:01 +00:00
Michael Kamensky
5ae6c9da0d Merge branch 'master' into 'master' 
Minor code cleanup, minor counter visualization fix.

See merge request core-developers/forge!1599
 2019-04-29 10:06:57 +00:00
Agetian
c609f199e4 - Minor code cleanup. 
- Fix visualization of the Slumber counter.
 2019-04-29 13:06:19 +03:00
Michael Kamensky
c38f1bf214 Merge branch 'sparkDouble' into 'master' 
ReplacementEffect: rewrite for Riot and Spark Double

See merge request core-developers/forge!1592
 2019-04-29 10:03:06 +00:00
Hans Mackowiak
1b47a81b8c ReplacementEffect: rewrite for Riot and Spark Double 2019-04-29 10:03:06 +00:00
Michael Kamensky
ca87a5d857 Merge branch 'fix_controlgain' into 'master' 
Fix ControlGain effect to properly parse Defined (e.g. Humble Defector).

Closes #951

See merge request core-developers/forge!1597
 2019-04-29 10:02:38 +00:00
Agetian
72101790ec - Fix ControlGain effect to properly parse Defined (e.g. Humble Defector). 2019-04-29 05:58:05 +03:00
swordshine
028afcb1be Merge branch 'patch' into 'master' 
Add a token script

See merge request core-developers/forge!1595
 2019-04-28 14:20:46 +00:00
swordshine
bdcf756eca Add a token script 2019-04-28 22:20:20 +08:00
swordshine
3e60e547e7 Merge branch 'morewarsparkcards' into 'master' 
Another batch of forgescribe scriptable cards

See merge request core-developers/forge!1594
 2019-04-28 14:19:26 +00:00
austinio7116
4f23fee435 Removed Serra for now 2019-04-28 07:22:55 +01:00
austinio7116
202667b708 Another batch of forgescriptable cards 2019-04-28 07:13:04 +01:00
Michael Kamensky
c4457110bc Merge branch 'patch-2' into 'master' 
Emblems are not part of the token list

See merge request core-developers/forge!1593
 2019-04-28 03:27:47 +00:00
Sol
074f180bbd Emblems are not part of the token list 2019-04-28 03:13:50 +00:00
swordshine
abfee4544d Merge branch 'nahari-storm-of-stone-x-damage' into 'master' 
Fix the X-damage ability of Nahiri, Storm of Stone

See merge request core-developers/forge!1591
 2019-04-28 01:26:57 +00:00
swordshine
e19980b16a Merge branch 'bleeding-edge-amass-fix' into 'master' 
Fix the amass on Bleeding Edge

See merge request core-developers/forge!1590
 2019-04-28 01:26:40 +00:00
Brock Fanning
39b16fd885 Fix the X-damage ability of Nahiri 2019-04-27 14:41:12 -04:00
Brock Fanning
29ed87af3a Fix the amass on Bleeding Edge 2019-04-27 14:40:16 -04:00
austinio7116
829aacf13b two cards taken from Nikita's MR to separate them from the Krenko clash 2019-04-27 08:47:49 +01:00
austinio7116
add3cf762a Merge branch 'war-cards' into 'master' 
Enter the God-Eternals, Sarkhan

See merge request core-developers/forge!1588
 2019-04-27 07:33:15 +00:00
Michael Kamensky
b8f7b3d4e7 Merge branch 'fix_charging_cinderhorn' into 'master' 
Fix Charging Cinderhorn not working for anyone except the first player + fix Make Yourself Useful

Closes #952 and #954

See merge request core-developers/forge!1586
 2019-04-27 05:07:44 +00:00
Agetian
8674487c4a - Fix Make Yourself Useful. 2019-04-27 07:52:31 +03:00
Adam Pantel
4930bc1fd1 Enter the God-Eternals, Sarkhan 2019-04-27 00:50:19 -04:00
Hans Mackowiak
2e6249cb71 Merge branch 'spark-harvest-fix' into 'master' 
Fix alt costs of Spark Harvest

See merge request core-developers/forge!1585
 2019-04-27 04:21:51 +00:00
Brock Fanning
5eceadb33a Fix alt costs of Spark Harvest 2019-04-27 04:21:51 +00:00
swordshine
8db8715222 Merge branch 'domris-ambush-fix' into 'master' 
Domri's Ambush fix to deal damage according to correct target

See merge request core-developers/forge!1584
 2019-04-27 01:09:40 +00:00