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

42683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ryan1729
bafbe73bd6 convert missed keys to enum 2019-09-18 21:12:13 -06:00
CCTV-1
e46fbb4d01 Merge remote-tracking branch 'upstream/master' 2019-09-18 21:14:59 +08:00
swordshine
0fe6b3b52b Add Once and Future 2019-09-18 20:03:56 +08:00
swordshine
c6a3122110 Update a reference 2019-09-18 18:54:08 +08:00
swordshine
a2da91eb3a Merge branch 'patch' into 'master' 
More ELD cards

See merge request core-developers/forge!2135
 2019-09-18 10:51:40 +00:00
swordshine
4fe155959e Merge branch 'push_down_toStringMap_part_1' into 'master' 
Push down toStringMap part 1

See merge request core-developers/forge!2127
 2019-09-18 10:48:34 +00:00
swordshine
f89cc76a76 Update Once Upon a Time 2019-09-18 17:45:30 +08:00
swordshine
158b1d0f59 Merge branch 'deutschupdate01' into 'master' 
Updated german translation

See merge request core-developers/forge!2136
 2019-09-18 09:39:48 +00:00
Peter
9d6aa6b755 Updated german translation 
Contributed by twosat at https://www.slightlymagic.net/forum/viewtopic.php?f=26&t=23215#p230047
 2019-09-18 10:58:06 +02:00
swordshine
97ebdff835 Add Clackbridge Troll 2019-09-18 12:46:52 +08:00
swordshine
87fffa0ddd Add Dance of the Manse 2019-09-18 12:29:05 +08:00
swordshine
cf9a72fc42 Add Once Upon a Time 2019-09-18 10:24:04 +08:00
Ryan1729
30d37c11b0 remove import 2019-09-17 19:40:45 -06:00
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