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
42,672 Commits 34 Branches 187 Tags
5e90679d76b2080e01a78a8cf0c46f1d5370db8c
Commit Graph

42672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
23d72cb59a More ELD cards 2019-09-21 16:24:34 +08:00
swordshine
695d2324ac Fix Lovestruck Beast 2019-09-21 16:12:32 +08:00
swordshine
661c3d96aa More ELD cards 2019-09-21 16:07:28 +08:00
swordshine
18cd8d68e1 More ELD cards 2019-09-21 12:47:36 +08:00
swordshine
3887dc1440 Add Beanstalk Giant 2019-09-21 11:53:29 +08:00
Ryan1729
1c11465041 Merge branch 'master' of git.cardforge.org:core-developers/forge into push_down_toStringMap_part_3 2019-09-20 21:06:00 -06:00
swordshine
f938366d40 Update ELD edition file 2019-09-21 10:38:57 +08:00
swordshine
fc1d5543d8 More ELD cards 2019-09-21 10:21:52 +08:00
swordshine
94e81531db Merge branch 'master' into 'master' 
More ELD cards

See merge request core-developers/forge!2148
 2019-09-21 01:33:27 +00:00
swordshine
dd7b419806 Merge branch 'push_down_toStringMap_part_2' into 'master' 
Push down to string map part 2

See merge request core-developers/forge!2134
 2019-09-21 01:33:20 +00:00
swordshine
2e04ae0549 Merge branch '1144-eld-adventure-spells' into 'master' 
Resolve "ELD: Adventure Spells"

Closes #1144

See merge request core-developers/forge!2102
 2019-09-21 01:17:08 +00:00
Hanmac
9b3fa50dee Adventure: If an object becomes a copy of an object that has an Adventure, the copy also has an Adventure. 2019-09-20 18:03:06 +02:00
Hanmac
b7b1c3a437 As Foretold: fix the cmc check 2019-09-20 16:20:35 +02:00
Hanmac
1e7ed84522 CardProperty: add AdventureCard for Creature with adventure 2019-09-20 15:54:47 +02:00
Hans Mackowiak
feaa01f70c ELD: Merchant of the Vale 2019-09-20 15:54:47 +02:00
Hans Mackowiak
7a504bf3c8 Update CardFactoryUtil.java 2019-09-20 15:54:47 +02:00
Hans Mackowiak
d9dd31b263 ELD: Animating Faerie 2019-09-20 15:54:47 +02:00
Hans Mackowiak
94805103da Spell: add extra check for Adventure cards 2019-09-20 15:54:47 +02:00
Hanmac
378d0e26ab Adventure: add - separator 2019-09-20 15:54:47 +02:00
Hanmac
0c354e8a70 Adventure: add Logic to cast as Spell 2019-09-20 15:54:47 +02:00
swordshine
cb18c22649 Add Hushbringer 2019-09-20 21:29:36 +08:00
swordshine
96c840eebe More ELD cards 2019-09-20 20:54:16 +08:00
swordshine
e07504a55e Update 3 scripts 2019-09-20 20:37:06 +08:00
swordshine
dfeeff6e3b More ELD cards 2019-09-20 20:29:41 +08:00
swordshine
bc882e6593 Merge branch 'german-translation' into 'master' 
german translation update & fix some typos

See merge request core-developers/forge!2147
 2019-09-20 08:16:12 +00:00
Dagin Svezek
904822eb78 german translation update & fix some typos 2019-09-20 05:37:35 +00:00
Ryan1729
4c43f70ea6 Merge branch 'push_down_toStringMap_part_2' into push_down_toStringMap_part_3 2019-09-19 21:13:03 -06:00
Ryan1729
626df0df1c Merge branch 'master' of git.cardforge.org:core-developers/forge into push_down_toStringMap_part_2 2019-09-19 20:49:44 -06:00
Anthony Calosa
6f5b9ddfff Add card highlighting 2019-09-19 23:23:56 +08:00
Anthony Calosa
73f3a5ff85 Prevent NPE 2019-09-19 23:22:59 +08:00
Anthony Calosa
913d108f69 Merge remote-tracking branch 'remotes/core/master' into HEAD 2019-09-19 23:11:56 +08:00
Anthony Calosa
77ab276d83 Add Path to Exile, Act of Treason test (The player whose controller of the creature taken by Act of Treason in this test after casting Path to Exile to the creature is the one who will get the benefit of getting the land) 2019-09-19 14:11:12 +00:00
swordshine
df4d6568d9 Merge branch 'patch' into 'master' 
Update ability text in card detail panel if it's not translated

See merge request core-developers/forge!2145
 2019-09-19 13:34:44 +00:00
swordshine
80c6c23289 Update ability text if it's not translated 2019-09-19 20:57:49 +08:00
swordshine
1cad0ecbc2 Merge branch 'patch' into 'master' 
More ELD cards

See merge request core-developers/forge!2143
 2019-09-19 11:15:52 +00:00
swordshine
42aa6f0eb3 More forgescribed cards 2019-09-19 19:08:09 +08:00
swordshine
99c8899186 Merge branch 'hotfixDieharmoniconTrigger' into 'master' 
TriggerHandler: fix Dieharmonicon with new TriggerKeys

See merge request core-developers/forge!2144
 2019-09-19 10:54:34 +00:00
Hans Mackowiak
a90b6033b0 TriggerHandler: fix Dieharmonicon with new TriggerKeys 2019-09-19 10:54:34 +00:00
swordshine
191ffa67be More ELD cards 2019-09-19 16:47:56 +08:00
swordshine
efc849740b Merge branch 'patch' into 'master' 
More ELD cards

See merge request core-developers/forge!2137
 2019-09-19 08:30:25 +00:00
swordshine
ee53353501 More forgescribed cards 2019-09-19 16:20:11 +08:00
swordshine
6d73201393 Merge branch 'master' into 'master' 
translation Forge.java and update forge-android supported simplified chinese character

See merge request core-developers/forge!2141
 2019-09-19 06:58:08 +00:00
swordshine
6f333589b8 Merge branch 'patch-4' into 'master' 
Fix setloadingaMatch prematurely

See merge request core-developers/forge!2140
 2019-09-19 06:56:57 +00:00
CCTV-1
1b9bce5165 translation Forge.java 2019-09-19 13:53:55 +08:00
CCTV-1
dd55b73199 Merge remote-tracking branch 'upstream/master' 2019-09-19 13:16:53 +08:00
Anthony Calosa
91abbcd3c5 Fix setloadingaMatch prematurely, if the startgame is null there must be an error/showdialog happened. 2019-09-19 04:31:42 +00:00
swordshine
3573a27bdb Add some forgescribed cards 2019-09-19 12:16:41 +08:00
swordshine
78cee77b87 Merge branch 'fix_deckgen_restriction_bug' into 'master' 
fix restricted cards not being restricted to one.

See merge request core-developers/forge!2138
 2019-09-19 04:15:27 +00:00
Ryan1729
7ca72974b6 push toStringMap into performTest, eliminating the need for the toStringMap call. 2019-09-18 22:00:28 -06:00
Ryan1729
9ab35769d5 fix restricted cards not being restricted to one. 2019-09-18 21:34:19 -06:00