external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,177 Commits 32 Branches 187 Tags
aede20c610ef9ae6f7c20545061a8844d427fc8c
Commit Graph

44177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Myrd
0e1c82a31f Merge branch 'revert-b7c47200' into 'master' 
Revert "Merge branch 'master' into 'master'"

See merge request core-developers/forge!2338
 2019-12-20 15:53:35 +00:00
Hans Mackowiak
b5babd5451 Merge branch 'vanguard-missing-ability-text' into 'master' 
Fix Vanguards etc not displaying abilities

See merge request core-developers/forge!2336
 2019-12-20 15:52:18 +00:00
Myrd
5cb8502566 Revert "Merge branch 'master' into 'master'" 
This reverts merge request !2334
 2019-12-20 15:48:04 +00:00
Myrd
b7c4720030 Merge branch 'master' into 'master' 
Optimize some code paths in Forge (card type logic and property get with default).

See merge request core-developers/forge!2334
 2019-12-20 15:47:44 +00:00
Michael Kamensky
074243891c Merge branch 'sort_flip_results' into 'master' 
Sort coing flips for Krark's Thumb

See merge request core-developers/forge!2335
 2019-12-20 05:03:43 +00:00
CCTV-1
1117ff1e7c update translation 2019-12-20 12:36:53 +08:00
CCTV-1
5dd24341e1 translate all confirmPayment message argument 2019-12-20 12:36:30 +08:00
CCTV-1
19d4f36faa translate desktop AddBasicLandDialog.java 2019-12-20 12:34:28 +08:00
CCTV-1
ac9f8e3191 translate "Select Order" 2019-12-20 12:31:32 +08:00
CCTV-1
9d193fb3bb translate "OK","No" 2019-12-20 12:30:18 +08:00
friarsol
c20b0c3620 Fix Vanguards etc not displaying abilities 2019-12-19 23:23:39 -05:00
friarsol
8409a7e6d1 Sort coing flips for Krark's Thumb 2019-12-19 22:43:33 -05:00
Alexei Svitkine
3d59118b94 Use Sets instead of Lists for card types to avoid slow lookups. 2019-12-19 20:49:29 -05:00
Alexei Svitkine
e0fb373b3d Use Java 8's getOrDefault() 2019-12-19 20:48:01 -05:00
swordshine
f0c8deb25e Merge branch 'master' into 'master' 
some translate fix

See merge request core-developers/forge!2332
 2019-12-19 01:16:42 +00:00
Michael Kamensky
b288c9f61a Merge branch 'Hanmac-master-patch-98814' into 'master' 
Spell:checkOtherRestrictions check CantBeCast for changed Cardface

Closes #1198

See merge request core-developers/forge!2333
 2019-12-18 11:57:26 +00:00
Hans Mackowiak
823c278cd7 Spell:checkOtherRestrictions check CantBeCast for changed Cardface 2019-12-18 11:57:26 +00:00
Michael Kamensky
ba4ba8d051 Merge branch 'keyword-escape' into 'master' 
Keyword: add Escape Mechanic

Closes #1199

See merge request core-developers/forge!2331
 2019-12-18 10:38:02 +00:00
Hans Mackowiak
467268c451 Keyword: add Escape Mechanic 2019-12-18 10:38:02 +00:00
CCTV-1
3f1f8321d3 do not translate "for {CR}" 2019-12-18 18:04:50 +08:00
CCTV-1
5730a407c3 Merge remote-tracking branch 'upstream/master' 2019-12-18 17:56:47 +08:00
CCTV-1
22974f8bf4 fix typo 2019-12-18 17:52:29 +08:00
CCTV-1
6414347d91 fix:wrong comment 2019-12-18 17:51:59 +08:00
swordshine
113f891348 Merge branch 'master' into 'master' 
translate some text

See merge request core-developers/forge!2328
 2019-12-18 09:19:40 +00:00
CCTV-1
cbab3e6000 LoadQuestScreen.java "New" should not be use lblNew 2019-12-18 13:21:32 +08:00
CCTV-1
17663bd2c0 translate mobile quest 2019-12-18 12:56:41 +08:00
CCTV-1
c226a4dbd5 Merge remote-tracking branch 'upstream/master' 2019-12-18 12:44:02 +08:00
Michael Kamensky
0c2d0e6cb6 Merge branch 'puzzle-improvements' into 'master' 
Puzzle improvements

See merge request core-developers/forge!2330
 2019-12-18 04:30:45 +00:00
friarsol
d63106a71a Save completed puzzles, and sort them to the bottom of the screen 2019-12-17 21:16:17 -05:00
Michael Kamensky
2c26e3f509 Merge branch 'master' into 'master' 
Added puzzle PS_ELD9 - Possibility Storm - Throne of Eldraine 09

See merge request core-developers/forge!2329
 2019-12-17 14:55:42 +00:00
Agetian
50e0387cda - Fix AI persistent mana in PS_ELD9. 2019-12-17 17:52:17 +03:00
Agetian
b05dc40a1c - Added puzzle PS_ELD9. 2019-12-17 17:50:25 +03:00
CCTV-1
3846be2321 translate some text 2019-12-17 19:49:11 +08:00
swordshine
2fa3179a31 Merge branch 'master' into 'master' 
translate InputAttack.java and InputBlock.java

See merge request core-developers/forge!2326
 2019-12-17 01:30:07 +00:00
CCTV-1
2617ff339d translate InputAttack.java and InputBlock.java 2019-12-16 20:03:28 +08:00
swordshine
e36311db44 Merge branch 'master' into 'master' 
More upcoming THB cards

See merge request core-developers/forge!2324
 2019-12-16 07:38:06 +00:00
Michael Kamensky
2449166c36 Merge branch 'patch-6' into 'master' 
Update enchanted_carriage: fixed trigger

See merge request core-developers/forge!2325
 2019-12-15 06:01:35 +00:00
Hans Mackowiak
eb16486ee6 Update enchanted_carriage: fixed trigger 2019-12-15 06:01:35 +00:00
friarsol
e0c858a3d6 Only split the first colon from Puzzle metadata 2019-12-14 22:21:23 -05:00
Northmoc
71749cef3f More upcoming THB 2019-12-14 16:47:25 -05:00
Northmoc
15839e343e More upcoming THB 2019-12-14 12:50:24 -05:00
Northmoc
9a98b39e94 More upcoming THB 2019-12-13 13:58:46 -05:00
Northmoc
9c6c0f1861 More upcoming THB 2019-12-13 12:24:47 -05:00
Northmoc
318d919111 More upcoming THB 2019-12-12 14:03:12 -05:00
Northmoc
c753a1c875 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 
 Conflicts:
	forge-gui/res/cardsfolder/upcoming/moss_viper.txt
 2019-12-11 10:57:43 -05:00
Northmoc
e304337a62 More upcoming THB 2019-12-11 10:33:10 -05:00
Michael Kamensky
3768ca8f77 Merge branch 'master' into 'master' 
Added puzzle PS_ELD8 - Possibility Storm - Throne of Eldraine 08

See merge request core-developers/forge!2322
 2019-12-10 17:26:30 +00:00
Agetian
12f76827e9 - Added puzzle PS_ELD8. 2019-12-10 19:51:41 +03:00
Michael Kamensky
3c5f464039 Merge branch 'master' into 'master' 
Set ExiledWith for the LKI copies (fixes Colfenor's Plans)

Closes #1215

See merge request core-developers/forge!2321
 2019-12-10 16:43:41 +00:00
Agetian
9f2304b1a5 - Set ExiledWith for the LKI copies (fixes Colfenor's Plans) 2019-12-10 19:35:10 +03:00