churrufli
07c2065917
Translating hard-coded text to res en-US.properties
2019-01-18 08:20:02 +01:00
Michael Kamensky
40c64a943a
Merge branch 'patch-1' into 'master'
...
FIX Protean Raider
See merge request core-developers/forge!1280
2019-01-17 06:01:13 +00:00
Hans Mackowiak
4f953bf2e1
FIX Protean Raider
2019-01-17 05:42:10 +00:00
Michael Kamensky
39204513fb
Merge branch 'master' into 'master'
...
Added puzzle PS_CFB (Possibility Storm: How Much Fireball Can You Channel).
See merge request core-developers/forge!1278
2019-01-16 07:17:02 +00:00
Agetian
ebaa96004f
- Added puzzle PS_CFB (How Much Fireball Can You Channel).
2019-01-16 10:16:20 +03:00
Michael Kamensky
d381251472
Merge branch 'master' into 'master'
...
code cleanup for moveable card displays; add movement by clicking to display-based scry
See merge request core-developers/forge!1276
2019-01-16 07:07:16 +00:00
Michael Kamensky
f00e759a93
Merge branch 'removeCountersAnyNumber' into 'master'
...
CountersRemoveEffect: add ValidSource and CounterNum$ Any
See merge request core-developers/forge!1277
2019-01-16 07:05:06 +00:00
Hanmac
aab63e2029
CountersRemoveEffect: add ValidSource and CounterNum$ Any
2019-01-16 07:30:24 +01:00
Peter F. Patel-Schneider
3749f2a5de
fix bug in computing manipulable card views
2019-01-15 22:10:05 -05:00
Peter F. Patel-Schneider
aa7ad578d5
change manipulateCardList to CardView
2019-01-15 06:24:11 -05:00
Peter F. Patel-Schneider
fb80dece04
ListCardArea augment clicking
2019-01-15 06:24:11 -05:00
Peter F. Patel-Schneider
482ab4b87c
Add left-click to top and right-click to bottom for ListCardArea
2019-01-15 06:24:11 -05:00
Peter F. Patel-Schneider
f3f9a915d5
Base FloatingZone on FloatingCardArea
2019-01-15 06:24:11 -05:00
Peter F. Patel-Schneider
52184e24ce
Add intermediate FloatingCardArea to hold commonalities between FloatingZone and ListCardArea
2019-01-15 06:24:11 -05:00
Michael Kamensky
b6dbfcee96
Merge branch 'master' into 'master'
...
fixes for multi-player scry; fix bug when human player scrying entire library
See merge request core-developers/forge!1271
2019-01-15 10:59:30 +00:00
Peter F. Patel-Schneider
e07be68786
Remove unused import in GameAction
2019-01-14 07:40:50 -05:00
Peter Patel-Schneider
9c3ae840b8
Merge branch 'pfps_master' into 'master'
...
GameAction: add PlayerController:confirmMulliganScry
See merge request pfps/forge!1
2019-01-14 01:43:38 +00:00
Hanmac
20eba0fbd7
GameAction: add PlayerController:confirmMulliganScry
2019-01-13 22:01:22 +01:00
Peter F. Patel-Schneider
735516e6d5
Fix bug in scry when scrying entire library
2019-01-13 10:25:35 -05:00
Peter F. Patel-Schneider
087495f5a0
Force AI to accept mulligan scry (otherwise there is a crash)
2019-01-13 10:24:40 -05:00
Peter F. Patel-Schneider
b94ec24948
Changes to do parts of multi-player scry in correct order
2019-01-13 10:08:29 -05:00
Michael Kamensky
e3257e025d
Merge branch 'sunburst' into 'master'
...
Sunburst: rewrite using ETB counter
See merge request core-developers/forge!1269
2019-01-13 14:10:44 +00:00
Hans Mackowiak
2640a509f9
Sunburst: rewrite using ETB counter
2019-01-13 14:10:44 +00:00
Michael Kamensky
e2eb957af9
Merge branch 'sentry2019Breadcrumbs' into 'master'
...
Sentry: add more Breadcumbs
See merge request core-developers/forge!1274
2019-01-13 09:44:15 +00:00
Hans Mackowiak
81f07cb8a3
Sentry: add more Breadcumbs
2019-01-13 09:44:15 +00:00
Michael Kamensky
1e3cb2e66c
Merge branch 'multiplayer-mulligan' into 'master'
...
Remove partial paris mulligan
See merge request core-developers/forge!1273
2019-01-13 09:17:00 +00:00
Michael Kamensky
76da5b0cac
Merge branch 'token_asterisk_replacement' into 'master'
...
Replace asterisks with x's for token filenames
See merge request core-developers/forge!1272
2019-01-13 09:15:53 +00:00
Chris H
fdc1c32287
Remove partial paris mulligan
2019-01-12 23:49:09 -05:00
Chris H
3b38547fc9
Replace asterisks with x's for token filenames
2019-01-12 22:55:23 -05:00
Michael Kamensky
53d1716255
Merge branch 'deckAnyNumber' into 'master'
...
DeckFormat: A deck can have any number of cards named CARDNAME.
See merge request core-developers/forge!1270
2019-01-12 16:13:00 +00:00
Hans Mackowiak
0606a00942
DeckFormat: A deck can have any number of cards named CARDNAME.
2019-01-12 16:13:00 +00:00
swordshine
af3c645521
Merge branch 'adaptReduceCost' into 'master'
...
Adapt: add ReduceCost for Pteramander
See merge request core-developers/forge!1267
2019-01-12 07:49:50 +00:00
swordshine
e5093c6d2f
Merge branch 'patch-2' into 'master'
...
Fix vicious_rumors.txt not discarding
See merge request core-developers/forge!1268
2019-01-12 07:48:49 +00:00
Sol
59102b0e08
Update vicious_rumors.txt
2019-01-12 01:36:29 +00:00
Hanmac
17cff99c2b
Adapt: add ReduceCost for Pteramander
2019-01-11 21:15:27 +01:00
Michael Kamensky
7d0dbff8bc
Merge branch 'master' into 'master'
...
Select cards from any Zone that can be shown and do arrangeForScry by popping up library and moving cards (in desktop GUI); Pass min/max card selections through to GUI
See merge request core-developers/forge!1260
2019-01-11 17:08:50 +00:00
Sol
6974e2de27
Merge branch 'patch-2' into 'master'
...
CostPayLife: fix unused import
See merge request core-developers/forge!1266
2019-01-11 13:27:37 +00:00
Hans Mackowiak
770ed4524a
CostPayLife: fix unused import
2019-01-11 13:24:33 +00:00
Hans Mackowiak
7f4dc85554
Merge branch '793-new-feature-paylife-trigger' into 'master'
...
New Feature: PayLife Trigger
Closes #793
See merge request core-developers/forge!1265
2019-01-11 13:01:08 +00:00
Hans Mackowiak
005fa3d732
Font of Agonies: use new PayLife trigger
2019-01-11 10:28:27 +00:00
Hans Mackowiak
bbe8d79400
Player: add PayLife Trigger
2019-01-11 10:16:29 +00:00
Hans Mackowiak
edaab9d7de
TriggerType: add PayLife
2019-01-11 09:38:02 +00:00
Hans Mackowiak
842c6e681d
TriggerPayLife: add new Trigger
2019-01-11 09:33:56 +00:00
Hans Mackowiak
05be8406cc
Update TriggerLifeGained: better format
2019-01-11 09:31:53 +00:00
Hans Mackowiak
7aa879fb8e
Update CostDraw: fix Description
2019-01-11 09:19:12 +00:00
Hans Mackowiak
1e6a9b8c26
Update CostDamage, fix Description
2019-01-11 09:17:55 +00:00
Hans Mackowiak
b2e9c88f62
CostPayLife: refund never called and doesn't work
...
negative amount can't be paid in the function
2019-01-11 09:16:50 +00:00
Peter F. Patel-Schneider
3609ff9eff
only use new input methods if in desktop GUI; remove debugging prints
2019-01-11 03:48:42 -05:00
Peter F. Patel-Schneider
09fc3ae60c
add new GUI interface allowing cards to be moved around in a list and use for arrangeForScry if preference UI_SELECT_FROM_CARD_DISPLAYS is set
2019-01-09 21:13:09 -05:00
Michael Kamensky
948c13dd15
Merge branch 'deckicons' into 'master'
...
Add icons to duels and challenges in LEB and ARN worlds
See merge request core-developers/forge!1262
2019-01-09 06:04:07 +00:00
