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,683 Commits 34 Branches 187 Tags
2d86d240a795f6829c3e299d2f22d1a6b51f995f
Commit Graph

42683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ryan1729
eabcf47b27 more mechanical, samey transformations 2019-09-14 15:14:40 -06:00
Michael Kamensky
334a0ea0b4 Merge branch '1153-multiple-staticability-pump-on-same-creature-does-conflict' into 'master' 
Resolve "multiple StaticAbility Pump on same creature does conflict"

Closes #1153 and #1156

See merge request core-developers/forge!2119
 2019-09-14 16:33:56 +00:00
Hans Mackowiak
47d3a74387 Resolve "multiple StaticAbility Pump on same creature does conflict" 2019-09-14 16:33:56 +00:00
swordshine
efac184ffb add more forgescribed cards 2019-09-14 23:29:40 +08:00
swordshine
44ae0c5039 Add forgescribed cards 2019-09-14 22:53:31 +08:00
swordshine
2d5ab947ab Merge branch 'update_run_trigger_callers_part_3' into 'master' 
Update run trigger callers part 3

See merge request core-developers/forge!2123
 2019-09-14 09:11:26 +00:00
Ryan1729
827e035286 delete unused imports 2019-09-14 01:10:38 -06:00
Ryan1729
aaf1919905 more mechanical transformations 2019-09-14 01:05:16 -06:00
Anthony Calosa
ccfbe4d956 countHuman instead of noAIPlayer 2019-09-14 15:05:01 +08:00
Ryan1729
d8ffcbb132 simplify Integer to int 2019-09-14 01:04:58 -06:00
Ryan1729
b532d1a0ca more mechanical transformations 2019-09-14 00:03:12 -06:00
Ryan1729
a9c020d2ac remove code that has been commented out since 2019-05-04 (commit 38178cfb) 2019-09-13 22:52:43 -06:00
CCTV-1
df98af5294 Merge remote-tracking branch 'upstream/master' 2019-09-14 12:19:46 +08:00
swordshine
042da7e95f Merge branch 'master' into 'master' 
Added puzzle PS_M209 - Possibility Storm - Magic Core Set 2020 09

See merge request core-developers/forge!2122
 2019-09-14 04:07:42 +00:00
Agetian
ff5dbf2c96 - Added puzzle PS_M209. 2019-09-14 06:50:47 +03:00
Anthony Calosa
ace050a8c0 Merge remote-tracking branch 'remotes/core/master' 2019-09-13 21:12:30 +08:00
CCTV-1
ff89114315 Merge remote-tracking branch 'upstream/master' 2019-09-13 19:21:53 +08:00
CCTV-1
7725d2ed42 Merge remote-tracking branch 'upstream/master' 2019-09-13 19:19:20 +08:00
swordshine
808d1fbd47 Merge branch 'patch' into 'master' 
ELD cards

See merge request core-developers/forge!2116
 2019-09-13 11:18:46 +00:00
CCTV-1
372d9cce94 update forge-android support simplified chinese characters 2019-09-13 19:18:05 +08:00
swordshine
1ac14eb466 Merge branch 'master' into 'master' 
update translation

See merge request core-developers/forge!2121
 2019-09-13 11:13:38 +00:00
CCTV-1
229688f26f update translation 2019-09-13 18:37:58 +08:00
Anthony Calosa
a107d41fed Merge branch 'master' into 'master' 
# Conflicts:
#   forge-gui-mobile/src/forge/screens/match/MatchScreen.java
 2019-09-13 10:35:22 +00:00
swordshine
9f626c73ea Merge branch 'localizerfix' into 'master' 
Guess String Encoding. Fixes Issue #1155

See merge request core-developers/forge!2118
 2019-09-13 10:20:45 +00:00
swordshine
520ab3959f Merge branch 'mobiletranslations03' into 'master' 
Mobile - Translation: Deck Chooser, Deck Editor and Match Screen

See merge request core-developers/forge!2120
 2019-09-13 10:20:15 +00:00
Peter
16da63aa9c Mobile - Translation: Deck Chooser, Deck Editor and Match Screen. 
Fix compare String with equals()
 2019-09-13 11:19:35 +02:00