Commit Graph

43884 Commits

Author SHA1 Message Date
Tim Mocny
16ecae29f0 2/5/2020 fixes 2020-02-06 09:37:18 +00:00
Michael Kamensky
7a9fb7a4d8 Merge branch '4Feb2020' into 'master'
Today's tweaks

See merge request core-developers/forge!2495
2020-02-05 03:45:14 +00:00
Tim Mocny
aef84aed51 Today's tweaks 2020-02-05 03:45:14 +00:00
klaxnek
a8b1ce3c32 Update es-ES.properties 2020-02-04 20:39:51 +00:00
klaxnek
7dde40beff Update new translations es-ES.properties 2020-02-03 20:15:15 +00:00
Adam Pantel
ccf39adde4 Improve cleanup on ashiok 2020-02-03 14:24:48 -05:00
Michael Kamensky
5b37a6fb53 Merge branch 'rebirth' into 'master'
Rebirth

See merge request core-developers/forge!2487
2020-02-03 16:00:50 +00:00
Tim Mocny
942225291f Rebirth 2020-02-03 16:00:50 +00:00
Michael Kamensky
4787784d15 Merge branch 'master' into 'master'
translate some text and fix Localizer

Closes #1270

See merge request core-developers/forge!2450
2020-02-03 15:05:28 +00:00
Sol
093f157f77 Merge branch 'master' into 'master'
MillAI logic for Rebirth.

See merge request core-developers/forge!2489
2020-02-03 14:55:17 +00:00
Agetian
78f3614c0a - Smaller life threshold for AILogic Rebirth. 2020-02-03 17:49:01 +03:00
Agetian
ae060a1b76 - MillAI logic for Rebirth. 2020-02-03 17:29:46 +03:00
Michael Kamensky
244b3d6d24 Merge branch 'staticKeywordChangeList' into 'master'
refactor Keywords using Chosen Values

See merge request core-developers/forge!2462
2020-02-03 11:35:28 +00:00
Hans Mackowiak
01bf10c719 refactor Keywords using Chosen Values 2020-02-03 11:35:28 +00:00
CCTV-1
5718072f60 fix miss call Localizer.getInstance().getMessage 2020-02-03 19:31:57 +08:00
CCTV-1
1dfd977238 fix compile error 2020-02-03 18:48:30 +08:00
CCTV-1
9030a39d1d update translation 2020-02-03 18:43:10 +08:00
CCTV-1
d74a4143f3 translate mulligan log 2020-02-03 18:42:35 +08:00
CCTV-1
f6509dd30e Merge remote-tracking branch 'upstream/master' 2020-02-03 18:40:13 +08:00
Michael Kamensky
6c512dd451 Merge branch 'allBasicLandType' into 'master'
All basic land type and AdjustLandPlays

See merge request core-developers/forge!2467
2020-02-03 10:09:45 +00:00
Hans Mackowiak
00c83f1d25 All basic land type and AdjustLandPlays 2020-02-03 10:09:45 +00:00
Michael Kamensky
28615040e8 Merge branch '1269-momir-basic-mode-broken' into 'master'
Resolve "Momir Basic Mode Broken"

Closes #1269

See merge request core-developers/forge!2488
2020-02-03 09:44:42 +00:00
Hans Mackowiak
0482d4636b Resolve "Momir Basic Mode Broken" 2020-02-03 09:44:42 +00:00
Michael Kamensky
86de537fcb Merge branch 'keywordLanguageChange' into 'master'
Keyword: fix problems with other languages

See merge request core-developers/forge!2485
2020-02-03 05:03:29 +00:00
Hans Mackowiak
fb7fdb65f2 Keyword: fix problems with other languages 2020-02-03 05:03:29 +00:00
Sol
15c36118d6 Merge branch '2Feb2020' into 'master'
little Elspeth PW deck edition tweak

See merge request core-developers/forge!2486
2020-02-03 02:26:43 +00:00
Tim Mocny
092eae52fe little Elspeth PW deck edition tweak 2020-02-03 02:26:43 +00:00
CCTV-1
ac58058938 escape single quotes 2020-02-03 09:26:58 +08:00
CCTV-1
64117ad1fc update translation 2020-02-02 19:48:56 +08:00
Michael Kamensky
317833af6d Merge branch 'master' into 'master'
Added puzzle PS_THB1 (both variants A and B)

See merge request core-developers/forge!2484
2020-02-02 10:25:30 +00:00
Agetian
54d367ae8c - Added puzzle PS_THB1 (both variants A and B). 2020-02-02 10:36:01 +03:00
CCTV-1
1381de7d55 add comment 2020-02-02 09:14:43 +08:00
CCTV-1
caacde3aad non creature permanent effect translation 2020-02-02 09:14:12 +08:00
CCTV-1
49e55f1326 update translation 2020-02-02 08:48:53 +08:00
CCTV-1
5082da429f log formatter full translation 2020-02-02 08:48:34 +08:00
CCTV-1
ea4e821f51 Merge remote-tracking branch 'upstream/master' 2020-02-02 08:43:42 +08:00
Sol
83c0195648 Merge branch '31Jan2020' into 'master'
Today's tweaks

See merge request core-developers/forge!2483
2020-02-01 03:58:34 +00:00
Tim Mocny
5c465f8bf0 Today's tweaks 2020-02-01 03:58:34 +00:00
Michael Kamensky
c670d175d9 Merge branch 'master' into 'master'
Check to make sure the cards are targetable by AI in DamageDealAi (mandatory).

See merge request core-developers/forge!2481
2020-01-31 14:38:37 +00:00
Agetian
415e2a1623 - Remove the unneeded mandatory parameter. 2020-01-31 16:54:29 +03:00
Agetian
dff5962b8e - Check to make sure the cards are targetable by AI. 2020-01-31 15:05:56 +03:00
Michael Kamensky
d7febae2e1 Merge branch 'master' into 'master'
Improved DamageDealAi and DrawAi

Closes #1267

See merge request core-developers/forge!2480
2020-01-31 10:20:22 +00:00
Michael Kamensky
a757e033d9 Merge branch 'triggerRunParams' into 'master'
Trigger: remove runParams from Trigger

See merge request core-developers/forge!2479
2020-01-31 10:15:31 +00:00
Hans Mackowiak
c3b05157c5 Trigger: remove runParams from Trigger 2020-01-31 10:15:31 +00:00
Agetian
cb3430b806 - Remove the unneeded mandatory check 2020-01-31 13:08:01 +03:00
Agetian
a86dad40c3 - DamageDealAi: target own indestructible stuff when able (if mandatory and has no better targets) 2020-01-31 12:46:32 +03:00
Agetian
04066b9bc2 - Fix DrawAi not accounting for pay costs on trigger 2020-01-31 12:34:05 +03:00
Agetian
6580883ccc - Improved DamageDealAi for mandatory triggers requiring a choice of planeswalker (e.g. Chandra, Artisan of Fire vs. a Hexproof opponent) 2020-01-31 09:58:51 +03:00
CCTV-1
fa30bbe67c Merge remote-tracking branch 'upstream/master' 2020-01-31 09:10:46 +08:00
CCTV-1
e39b70a5d8 update translation 2020-01-31 09:10:29 +08:00