external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,709 Commits 33 Branches 187 Tags
17fabb0bec10213d0ba3840e2e1685a0264c438c
Commit Graph

42709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
2d9d53a19d Update Hollow One 2019-09-17 21:08:28 +08:00
swordshine
9921f21471 Merge branch 'patch' into 'master' 
More ELD cards

See merge request core-developers/forge!2131
 2019-09-17 12:52:46 +00:00
swordshine
d56568b499 Add Cauldron's Gift 2019-09-17 15:22:19 +08:00
swordshine
5d1618104e Add three cards 2019-09-17 15:22:06 +08:00
Ryan1729
350756435f add incorrectly not staged changes 2019-09-16 23:16:24 -06:00
Ryan1729
ad067b7444 push toStringMap down into Trigger eliminating the need for the conversion. 
Also add helper method `setTriggeringObjectsFrom` and change `getRunParams` into similar but not identical `getFromRunParams`
 2019-09-16 23:07:53 -06:00
swordshine
b462f0dba1 Update trigger description 2019-09-17 10:52:25 +08:00
CCTV-1
3768074fc2 Merge remote-tracking branch 'upstream/master' 2019-09-17 09:48:20 +08:00
Anthony Calosa
4cb8bca258 Merge remote-tracking branch 'remotes/core/master' 2019-09-17 02:37:29 +08:00
Michael Kamensky
147cf60076 Merge branch 'master' into 'master' 
Fix FLAG_KEEP_SCREEN_ON

See merge request core-developers/forge!2132
 2019-09-16 17:57:22 +00:00
Anthony Calosa
72079ad609 Fix Cinder Cloud and Noxious Gearhulk Interaction with Cards with CDA 
(Noxious Gearhulk -> Malignus, as reported on forums)
 2019-09-16 17:57:22 +00:00
Anthony Calosa
ed12d90d56 Merge remote-tracking branch 'remotes/core/master' 2019-09-17 00:57:30 +08:00
Anthony Calosa
d65d6d39c8 Return FLAG_KEEP_SCREEN_ON functionality 2019-09-17 00:53:47 +08:00
CCTV-1
48ee2057ac Merge remote-tracking branch 'upstream/master' 2019-09-16 22:38:05 +08:00
swordshine
e98cb0043d Add Robber of the Rich 2019-09-16 22:08:07 +08:00
swordshine
e529765c44 Merge branch 'patch' into 'master' 
More ELD cards

See merge request core-developers/forge!2129
 2019-09-16 13:36:11 +00:00
swordshine
5ded6fcfe0 Merge branch 'master' into 'master' 
Fix two cards

See merge request core-developers/forge!2130
 2019-09-16 13:31:54 +00:00
Anthony Calosa
4b031c6928 Fix Cinder Cloud and Noxious Gearhulk Interaction with Cards with CDA 
(Noxious Gearhulk -> Malignus, as reported on forums)
 2019-09-16 13:31:54 +00:00
Anthony Calosa
a9ac51bd9b Merge remote-tracking branch 'remotes/core/master' 2019-09-16 20:54:41 +08:00
Anthony Calosa
24452d509c Fix Cinder Cloud and Noxious Gearhulk Interaction with Cards with CDA 
(Noxious Gearhulk -> Malignus, as reported on forums)
 2019-09-16 20:53:53 +08:00
swordshine
c8cb56c416 Update a script 2019-09-16 20:20:07 +08:00
swordshine
70f640b414 Add two cards 2019-09-16 20:10:08 +08:00
swordshine
e0f2802eda Add Sundering Stroke 2019-09-16 18:49:46 +08:00
swordshine
716faf4706 Add Clockwork Servant 2019-09-16 18:35:31 +08:00
swordshine
12b05147e7 Update two Adamant cards 2019-09-16 18:27:10 +08:00
CCTV-1
cf3f467100 Merge remote-tracking branch 'upstream/master' 2019-09-16 17:36:47 +08:00
swordshine
0e5884d757 Add Henge Walker 2019-09-16 16:35:06 +08:00
swordshine
c42f003755 Add Folio of Fancies 2019-09-16 16:12:32 +08:00
swordshine
3d2d192286 Merge branch 'update_run_trigger_callers_part_4' into 'master' 
Update run trigger callers part 4

See merge request core-developers/forge!2126
 2019-09-16 08:10:43 +00:00
CCTV-1
2d26718587 Merge remote-tracking branch 'upstream/master' 2019-09-16 12:28:59 +08:00
swordshine
1312fee64a Merge branch 'patch' into 'master' 
More ELD cards

See merge request core-developers/forge!2128
 2019-09-16 00:39:58 +00:00
swordshine
f1cbaa9d95 Fix SVar name 2019-09-16 08:29:00 +08:00
swordshine
243726d307 Refactor "For each color among permanents you control, add one mana of that color" 2019-09-15 21:37:24 +08:00
swordshine
bfaf054e88 Add Wildborn Preserver 2019-09-15 20:10:27 +08:00
swordshine
83c6473a7c Add Vantress Gargoyle 2019-09-15 19:23:55 +08:00
swordshine
86f344450d Fix Midnight Clock 2019-09-15 19:04:18 +08:00
swordshine
c079467b9a Add two cards 2019-09-15 13:36:43 +08:00
swordshine
9446af4808 Add two cards 2019-09-15 13:19:55 +08:00
Ryan1729
8a160c88d0 No unused imports. Even in the tests. 2019-09-14 21:16:55 -06:00
Ryan1729
b69682064d fix empty EnumMap IllegalArgumentException bug and add a test for it 2019-09-14 21:11:25 -06:00
swordshine
0637c69bfe Add Irencrag Feat 2019-09-15 10:59:42 +08:00
CCTV-1
aee2ac9ab7 Merge remote-tracking branch 'upstream/master' 2019-09-15 10:27:07 +08:00
swordshine
ce4fe0239f Merge branch 'patch' into 'master' 
More ELD cards

See merge request core-developers/forge!2124
 2019-09-15 02:24:46 +00:00
swordshine
5b176b93d0 Merge branch 'master' into 'master' 
Various Improvement (Android)

See merge request core-developers/forge!2110
 2019-09-15 02:24:26 +00:00
Ryan1729
dae5a51acc add fromString test and make it pass. 2019-09-14 20:12:52 -06:00
swordshine
ad428e2285 Fix a subability SVar 2019-09-15 10:07:46 +08:00
Ryan1729
42d0695804 push down toStringMap further, which required using AbilityKey inside TriggerWaiting and several other places. 2019-09-14 19:44:27 -06:00
CCTV-1
acfcabe2b7 Merge remote-tracking branch 'upstream/master' 2019-09-15 08:24:46 +08:00
Ryan1729
2d548b93ec push toStingMap down a layer 2019-09-14 16:51:55 -06:00
Ryan1729
65ab715b91 eliminate all but the last call to runTriggerOld 2019-09-14 15:52:02 -06:00