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
43,716 Commits 32 Branches 187 Tags
f6509dd30e5cbb96d4fd42a0fade1a24f06e9d20
Commit Graph

43716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
CCTV-1
45f33106f2 display escape exile card progress 2020-01-31 09:10:01 +08:00
Michael Kamensky
415f911e46 Merge branch 'stupidideas' into 'master' 
Soul Echo!

See merge request core-developers/forge!2475
 2020-01-30 13:19:27 +00:00
Tim Mocny
7b4b869992 Soul Echo! 2020-01-30 13:19:26 +00:00
Michael Kamensky
3d57759d73 Merge branch 'patch-3' into 'master' 
Update net-decks.txt adding Current MTGA Decks

See merge request core-developers/forge!2473
 2020-01-30 13:15:26 +00:00
Michael Kamensky
ad0bec318f Merge branch '29Jan2020forumfixes' into 'master' 
Various fixes reported on forum

See merge request core-developers/forge!2476
 2020-01-30 13:12:24 +00:00
Tim Mocny
9571b2695f Various fixes reported on forum 2020-01-30 13:12:24 +00:00
Michael Kamensky
f09bcc4a66 Merge branch 'master' into 'master' 
Fix Garruk, Cursed Huntsman achievement definition.

Closes #1262

See merge request core-developers/forge!2477
 2020-01-30 13:09:39 +00:00
Agetian
fc424b1bdd - Fix Garruk, Cursed Huntsman achievement definition. 2020-01-30 14:19:13 +03:00
CCTV-1
8a9b7c562c fix lblReturnForLondon translation 2020-01-30 11:00:45 +08:00
CCTV-1
4d9c730f6f make zh-CN reminder text work(update generate script) 2020-01-29 20:16:14 +08:00
CCTV-1
9a1223c228 fix INVALID PROPERTY: 'Report' 2020-01-29 09:58:21 +08:00
CCTV-1
d7787dc974 update translation 2020-01-29 08:12:55 +08:00
CCTV-1
a3f30d899b fix missing prompt translation 2020-01-29 08:12:38 +08:00
Churrufli
ca48e75a9d Update net-decks.txt adding Current MTGA Decks 2020-01-28 22:16:33 +00:00
CCTV-1
e5051d2635 Merge remote-tracking branch 'upstream/master' 2020-01-28 22:34:10 +08:00
Michael Kamensky
c5a6145ed7 Merge branch 'patch-7' into 'master' 
Mobile: AI Personality Translation

See merge request core-developers/forge!2454
 2020-01-28 13:23:50 +00:00
Michael Kamensky
b2398ec8e0 Merge branch 'thbtranslation' into 'master' 
Updated card translations (Theros: Beyond Death)

See merge request core-developers/forge!2471
 2020-01-28 13:22:52 +00:00
Michael Kamensky
1b739ab6e5 Merge branch 'fix-thb-edition' into 'master' 
Updating edition file until we have extra art ready to download

See merge request core-developers/forge!2465
 2020-01-28 13:22:27 +00:00