Commit Graph

39934 Commits

Author SHA1 Message Date
Michael Kamensky
195fe58dcb Merge branch 'master' into 'master'
fix bug in min number of cards to select in digs

See merge request core-developers/forge!1302
2019-01-23 09:38:00 +00:00
Peter F. Patel-Schneider
afd1070850 fix bug in min number of cards to select in digs 2019-01-23 03:42:45 -05:00
Michael Kamensky
8ed1ad4afc Merge branch 'master' into 'master'
remember old location and size of pop-up card list window

See merge request core-developers/forge!1300
2019-01-22 04:18:38 +00:00
Peter F. Patel-Schneider
67ca319674 remove debugging print in manipulateCardList 2019-01-21 18:10:30 -05:00
Peter F. Patel-Schneider
1f4142e368 remember old location and size of pop-up card list window 2019-01-21 18:05:19 -05:00
Michael Kamensky
b8147a2e58 Merge branch 'master' into 'master'
use multi-select for dig

Closes #799

See merge request core-developers/forge!1296
2019-01-21 14:47:08 +00:00
Michael Kamensky
2b8a756932 Merge branch 'schnautzr-master-patch-51486' into 'master'
Collector Number Sort update for RNA

See merge request core-developers/forge!1297
2019-01-21 05:06:20 +00:00
Rob Schnautz
f78bfce802 RNA looks at artifact casting cost only 2019-01-21 03:31:16 +00:00
Peter F. Patel-Schneider
ebcb4e28de Add desktop GUI and Dig changes to CHANGES.txt 2019-01-20 21:23:16 -05:00
Peter F. Patel-Schneider
f0c45cf814 Add visual chooser for two lists and use it for and/or dig 2019-01-20 21:23:16 -05:00
Peter F. Patel-Schneider
aff8d5ce01 Use chooseEntitiesForEffect for dig (except and/or dig) 2019-01-20 21:23:16 -05:00
Peter F. Patel-Schneider
94064a2a13 Fix bug in chooseEntitiesforEffect in Mobile GUI 2019-01-20 21:16:34 -05:00
Sol
6359021370 Merge branch 'master' into 'master'
Fix for Invalid Deck or Proxy File Names

Closes #560

See merge request core-developers/forge!1279
2019-01-21 00:55:35 +00:00
Evan Murawski
6090bc8117 Fix for Invalid Deck or Proxy File Names 2019-01-21 00:55:35 +00:00
Peter F. Patel-Schneider
264744645e Merge branch 'highlighting' 2019-01-20 16:41:50 -05:00
Michael Kamensky
ab1e1d2386 Merge branch 'master' into 'master'
put a cyan border on valid cards when selecting targets and costs (desktop UI only)

See merge request core-developers/forge!1281
2019-01-20 19:27:11 +00:00
Hans Mackowiak
87ad257c46 Merge branch 'damageMapClear' into 'master'
DamageMap: add clear after being triggered

See merge request core-developers/forge!1290
2019-01-20 09:12:04 +00:00
Sol
bc5e7f07ae Merge branch 'gift-pack-edition' into 'master'
M19 Gift Pack edition file

See merge request core-developers/forge!1293
2019-01-20 02:59:39 +00:00
Chris H
f18651be7a M19 Gift Pack edition file 2019-01-19 21:02:24 -05:00
Sol
3ade967f85 Merge branch 'patch-1' into 'master'
Update skitter_eel.txt

See merge request core-developers/forge!1292
2019-01-20 01:44:01 +00:00
Sol
243c90ced9 Update skitter_eel.txt 2019-01-20 01:43:46 +00:00
Hanmac
c1c421fff0 DamageMap: add clear after being triggered 2019-01-19 18:11:55 +01:00
Michael Kamensky
bf6f8048d6 Merge branch 'spellCostReduceTarget' into 'master'
CostAdjustment: use Relative for Amount that depends on the SpellAbility

See merge request core-developers/forge!1289
2019-01-19 12:52:12 +00:00
Hanmac
f26935f37f CostAdjustment: use Relative for Amount that depends on the SpellAbility, only works for Self 2019-01-19 13:27:19 +01:00
Michael Kamensky
f3f7700ba9 Merge branch 'patch-1' into 'master'
Update sharktocrab.txt

See merge request core-developers/forge!1288
2019-01-19 10:41:41 +00:00
Hans Mackowiak
2817c4ef61 Update sharktocrab.txt 2019-01-19 10:28:33 +00:00
Michael Kamensky
166700b573 Merge branch 'master' into 'master'
Added puzzle PS_RNA0 (Ravnica Allegiance Card Preview Puzzle).

See merge request core-developers/forge!1287
2019-01-19 10:14:20 +00:00
Agetian
6edb5ad591 - Added puzzle PS_RNA0 (Ravnica Allegiance Card Preview Puzzle). 2019-01-19 13:13:41 +03:00
Hans Mackowiak
66f2ab4e91 Merge branch 'patch-1' into 'master'
Update sharktocrab

See merge request core-developers/forge!1286
2019-01-19 10:11:43 +00:00
Hans Mackowiak
1f211e6ed5 Update sharktocrab 2019-01-19 10:11:15 +00:00
Michael Kamensky
41093c2f7f Merge branch 'ai-hints-rna' into 'master'
First pass of AI hints for RNA.

See merge request core-developers/forge!1284
2019-01-19 10:02:13 +00:00
Agetian
f4df89dca8 Merge remote-tracking branch 'origin/ai-hints-rna' into ai-hints-rna
# Conflicts:
#	forge-gui/res/cardsfolder/upcoming/ethereal_absolution.txt
#	forge-gui/res/cardsfolder/upcoming/watchful_giant.txt
2019-01-19 10:27:27 +03:00
Agetian
ffabf14192 - AI hints for RNA. 2019-01-19 10:25:43 +03:00
Michael Kamensky
5ce9db0b08 Merge branch 'upcomingFix20190119' into 'master'
Fix for upcoming cards

Closes #798

See merge request core-developers/forge!1285
2019-01-19 07:23:14 +00:00
Hanmac
5165c16233 Fix for upcoming cards 2019-01-19 07:57:08 +01:00
Agetian
1e34fd27fe - AI hints for RNA. 2019-01-19 09:34:58 +03:00
Sol
12b464dbcb Merge branch 'Austin/forge-ravnicaallegiance' into 'master'
Austin/forge ravnicaallegiance

See merge request core-developers/forge!1275
2019-01-19 02:53:56 +00:00
Chris H
76e3f0305b Do Type changes affect Svar keys? That sounds bad 2019-01-18 21:29:24 -05:00
Chris H
bb57003518 Biogenic Ooze -> TokenScripts 2019-01-18 21:26:47 -05:00
Chris H
dfbfcf0a11 Hero of Precinct One -> TokenScripts 2019-01-18 21:24:29 -05:00
Chris H
c4c061d669 Fix Rampage of the Clans 2019-01-18 21:23:05 -05:00
Chris H
e76db8e7ff Fix Gruul Spellbreaker affected 2019-01-18 21:15:23 -05:00
Chris H
9c4fd8b570 Fix Spectacle 2019-01-18 21:02:36 -05:00
Chris H
5d2e7a16d3 Fix Afterlife crashes 2019-01-18 21:02:36 -05:00
Chris H
cf3a28b120 Remove bogus card 2019-01-18 21:02:35 -05:00
austinio7116
10f8616e37 First pass of remaining spoilers, commiting and fixing up those that forgescribe got close 2019-01-18 21:02:32 -05:00
maustin
1bade895e1 Complete Ravnica Allegiance editions file 2019-01-18 21:00:53 -05:00
austinio7116
1940bca932 More straightforward RNA cards 2019-01-18 21:00:46 -05:00
austinio7116
620c27a117 Attempts to fix comments in MR - correct RemAI, fix combine guildname move counters and add X Svar to electrodominance 2019-01-18 21:00:43 -05:00
austinio7116
3071f1f74b First batch of easy forgescribe cleanups with editions file 2019-01-18 21:00:42 -05:00