Northmoc
0eed744018
3 THB Theme Booster rares
2019-12-25 21:04:50 +00:00
Northmoc
655737dcb5
3 THB Omens
2019-12-25 21:04:50 +00:00
Northmoc
488fa4a4dd
7 THB N creatures (mostly vanilla)
2019-12-25 21:04:50 +00:00
Northmoc
8344522e12
Fixing apostrophes in THB list
2019-12-25 21:04:50 +00:00
Northmoc
e1e085d610
Another round of THB
2019-12-25 21:04:50 +00:00
Northmoc
e35904e727
Another round of THB
2019-12-25 21:04:50 +00:00
Northmoc
6dc8d7648a
Fixing "you may search your library and/or your graveyard" cards so your library isn't auto-searched (and shuffled)
2019-12-25 21:04:49 +00:00
Agetian
c296b32209
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2019-12-25 19:36:53 +03:00
Agetian
69f2bb70e8
- Added puzzle PS_ELDS (Superfriends Winter Vacation Puzzle)
2019-12-25 19:35:21 +03:00
Hans Mackowiak
a499e0a551
Combat: copyLastState after damage is applied
2019-12-25 17:25:32 +01:00
Michael Kamensky
bc99962621
Fix a hang in Card.java (e.g. Approach of the Second Sun)
2019-12-25 16:01:26 +00:00
Agetian
bf9b7054b3
- Update the fix.
2019-12-25 18:56:14 +03:00
Agetian
50be973e57
- Fix a hang in Card.java (e.g. Approach of the Second Sun)
2019-12-25 15:34:46 +03:00
CCTV-1
108c39ef7c
fix missing translate
2019-12-25 18:42:35 +08:00
CCTV-1
ae6ea42aa9
update translation
2019-12-25 14:07:59 +08:00
CCTV-1
6c4ceccc30
translate mobile AssignDamage view
2019-12-25 14:07:28 +08:00
CCTV-1
fde7d6ff09
translate dev menu
2019-12-25 14:06:59 +08:00
CCTV-1
1af3505d0b
translate pay mana message
2019-12-25 14:06:35 +08:00
CCTV-1
047f018da4
update interactive message translate
2019-12-24 11:42:46 +08:00
CCTV-1
a90e9f05e2
translate ability/effects all interactive message(in Android because Chinese word wrap doesn't work,do not translate StackDescription for now)
2019-12-23 22:53:38 +08:00
CCTV-1
7db7e10934
Merge remote-tracking branch 'upstream/master'
2019-12-23 22:39:55 +08:00
Hans Mackowiak
397b340701
Escape: fix Crash when outside of Game
2019-12-21 08:25:42 +00:00
CCTV-1
a050b584ac
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2019-12-21 12:38:06 +08:00
Myrd
d68c740e1d
Use FileSection.parseToMap() from TriggerHandler.
2019-12-20 22:18:00 +00:00
Myrd
b807ce30c4
Merge branch 'dump_state_with_owner' into 'master'
...
Fix dumping state with cards with non-matching owner/controllers.
See merge request core-developers/forge!2342
2019-12-20 17:56:37 +00:00
Myrd
a4bd13d050
Fix dumping state with cards with non-matching owner/controllers.
2019-12-20 17:56:37 +00:00
Myrd
244960d0d7
Merge branch 'avoid_combat_sim' into 'master'
...
Avoid combat simulation if the current player has no creatures in play.
See merge request core-developers/forge!2341
2019-12-20 16:57:14 +00:00
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
