Myrd
267c8c6b0d
Avoid combat simulation if the current player has no creatures in play.
2019-12-20 16:57:14 +00:00
Myrd
06fc409234
Merge branch 'optimize_param_parsing' into 'master'
...
Optimize FileSection.parse()/parseMap().
See merge request core-developers/forge!2340
2019-12-20 16:37:31 +00:00
Alexei Svitkine
77ed24a203
Revert changes to GameCopier.
2019-12-20 11:28:11 -05:00
Alexei Svitkine
ed3c519404
Remove game copier logging code.
2019-12-20 11:25:43 -05:00
Myrd
9fcf8e82ef
Merge branch 'reland_opts' into 'master'
...
Optimize some code paths in Forge (card type logic and property get with default).
See merge request core-developers/forge!2339
2019-12-20 16:24:11 +00:00
Alexei Svitkine
dd4df9baaa
Optimize FileSection.parse()/parseMap().
...
This was showing up in profiles with simulation AI. The change
makes constants for the patterns used, so they don't have to be
"compiled" each time and also introduces a cache for these.
With this change, a GameCopier operation is sped up by about 30%
from my local measurement (I tried with a modern deck I have).
2019-12-20 11:22:06 -05:00
Alexei Svitkine
4384b1621b
Switch card types lists to sets to avoid costly look ups and
...
optimize getParamOrDefault() to do a single look up, instead of
two. These were showing up in profiles when using simulation AI.
2019-12-20 11:15:38 -05:00
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
