Adam Pantel
65288905d0
Clear controller when leaving battlefield/stack
2020-01-08 20:12:13 -05:00
swordshine
71787b7059
Merge branch 'patch' into 'master'
...
Add Altar of the Pantheon
See merge request core-developers/forge!2392
2020-01-08 10:43:50 +00:00
Hans Mackowiak
896eb79d2c
CardFactoryUtil: add Escaped Modifier
2020-01-08 10:18:56 +00:00
Blacksmith
1b130ab157
[maven-release-plugin] prepare for next development iteration
2020-01-08 02:20:36 +00:00
Blacksmith
74005529f5
[maven-release-plugin] prepare release forge-1.6.31
2020-01-08 02:20:31 +00:00
swordshine
4366db1acc
Add Altar of the Pantheon
2020-01-08 08:42:28 +08:00
Adam Pantel
a27f69b1c5
DigUntil does nothing on 0
2020-01-07 10:06:33 -05:00
Sol
41844ee7e3
Extracting two bugfixes from Lerio's MR
2020-01-07 04:12:37 +00:00
Hans Mackowiak
adcd86e7d7
Dash: fix keyword after AlternativeCost
2020-01-06 06:35:14 +00:00
swordshine
3d59f1832c
Allure of the Unknown should reveal first
2020-01-05 14:09:33 +08:00
Michael Kamensky
bdde3520f4
Merge branch 'patch' into 'master'
...
Update Haktos the Unscarred
See merge request core-developers/forge!2371
2020-01-04 10:21:08 +00:00
Adam Pantel
0536ebf1c8
Fix more localization mismatches
2020-01-03 23:21:13 -05:00
swordshine
fb176abe05
Update Haktos the Unscarred
2020-01-04 12:08:52 +08:00
Adam Pantel
d70e699c81
Mismatched localization labels
2020-01-03 16:06:01 -05:00
CCTV-1
0caf41f1d6
convert indentation to spaces
2020-01-03 13:33:59 +08:00
CCTV-1
817aadb995
Merge remote-tracking branch 'upstream/master'
2020-01-03 13:32:15 +08:00
Hans Mackowiak
b2fcc6e743
Refactor Escape and AlternativeCost
2020-01-03 04:40:09 +00:00
CCTV-1
8ebabd978f
add cast check
2020-01-02 12:17:38 +08:00
CCTV-1
51fae70e24
Merge remote-tracking branch 'upstream/master'
2020-01-02 11:51:07 +08:00
CCTV-1
2f0024a8dd
rollback unsafe changes
2020-01-02 11:45:38 +08:00
Adam Pantel
c81d9f6bc2
Add null check for Volrath's Shapeshifter
2019-12-31 17:05:29 -05:00
CCTV-1
e13e5d0b16
'reduce the number of words'
2019-12-31 21:37:05 +08:00
CCTV-1
ceb892d610
use localization card name in translation text
2019-12-31 21:16:06 +08:00
CCTV-1
4793425c58
translate ZoneType
2019-12-30 19:08:57 +08:00
CCTV-1
c9f33415e1
translate enum ZoneType
2019-12-30 10:35:16 +08:00
CCTV-1
92e6c303ad
update translation text to use have placeholder string
2019-12-27 15:22:01 +08:00
CCTV-1
dc77591571
Merge remote-tracking branch 'upstream/master'
2019-12-26 08:16:43 +08: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
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
Hans Mackowiak
397b340701
Escape: fix Crash when outside of Game
2019-12-21 08:25:42 +00:00
Myrd
d68c740e1d
Use FileSection.parseToMap() from TriggerHandler.
2019-12-20 22:18:00 +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
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
friarsol
c20b0c3620
Fix Vanguards etc not displaying abilities
2019-12-19 23:23:39 -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
Hans Mackowiak
823c278cd7
Spell:checkOtherRestrictions check CantBeCast for changed Cardface
2019-12-18 11:57:26 +00:00
Hans Mackowiak
467268c451
Keyword: add Escape Mechanic
2019-12-18 10:38:02 +00:00
CCTV-1
3846be2321
translate some text
2019-12-17 19:49:11 +08:00
Northmoc
9c6c0f1861
More upcoming THB
2019-12-13 12:24:47 -05:00
Agetian
9f2304b1a5
- Set ExiledWith for the LKI copies (fixes Colfenor's Plans)
2019-12-10 19:35:10 +03:00
Alessandro Coli
26dc246c52
Merge remote-tracking branch 'upstream/master'
2019-11-18 13:44:34 +01:00
Anthony Calosa
5069c71dd8
Fix declare attackers
2019-11-18 04:19:10 +00:00
Alessandro Coli
e9c2e1034c
Merge remote-tracking branch 'upstream/master'
2019-11-17 17:48:03 +01:00
Alessandro Coli
cc3c631cad
Introduction of modal popup to notify when something is added to the
...
stack, including images for cards, complete with sources and targets.
2019-11-17 17:26:31 +01:00
