Commit Graph

3490 Commits

Author SHA1 Message Date
Adam Pantel
5cd5020595 Fix draft bots running conspiracies 2019-03-24 21:32:14 -04:00
Alessandro Coli
f4b31082b8 Land sounds when land cards enter battlefield - even if they are not
played by hand
2019-03-15 20:34:22 +01:00
Alessandro Coli
0bd29eb1e7 Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-03-05 22:52:20 +01:00
Alessandro Coli
c4d859cb03 Sound support for multicolor lands 2019-03-05 19:17:48 +01:00
Michael Kamensky
940cd71d34 Merge branch 'master' into 'master'
ManaBurn sound working again + Edition files for Mythic Edition of Guild of Ravnica and Ravnica Allegiance

See merge request core-developers/forge!1437
2019-03-04 03:22:56 +00:00
Sol
c30086390d Merge branch 'master' into 'master'
Moving hard-coded text to en-US.properties file

See merge request core-developers/forge!1413
2019-03-03 20:44:33 +00:00
Alessandro Coli
df55bc5d34 Fixing of tabs as required 2019-03-03 10:13:22 +01:00
Alessandro
b7508b8c3a ManaBurn sound working again 2019-03-02 16:10:13 +01:00
KrazyTheFox
5377376585 Fix NPE when no quests are available to load 2019-02-27 21:49:31 -05:00
Rob Schnautz
ea55fa676f Merge branch 'master' into 'deprecation-cleanup'
Master

See merge request core-developers/forge!1430
2019-02-28 01:06:47 +00:00
churrufli
da5b1a18bf Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-27 20:13:44 +01:00
churrufli
a546339ea2 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-02-27 19:58:25 +01:00
Michael Kamensky
16c9cc7eac Merge branch 'lq-image-download-tweak' into 'master'
Update server download URL parsing

Closes #858

See merge request core-developers/forge!1421
2019-02-27 12:22:14 +00:00
Michael Kamensky
0662dc5964 Merge branch 'set-max-size-for-image-cache' into 'master'
Set max size for image cache (Reduces memory footprint)

See merge request core-developers/forge!1423
2019-02-27 12:19:52 +00:00
Rob Schnautz
143a254189 Sort Sorcery // Instant as an instant in Type sort. 2019-02-27 00:31:05 +00:00
tehdiplomat
f0efc2089c Ad LRU to ImageCache to get a handle on memory bloat 2019-02-26 15:40:36 -05:00
Tim Scott
17df25399f Use pattern matching to capture directory listing from the server URL string.
Add fallback to PNG for download if JPG is not found.

Correct quest-opponent-icons.txt.  Space reference should be "%20".
2019-02-24 17:22:28 -06:00
schnautzr
59214fe332 Code cleanup - deprecations 2019-02-23 20:59:19 -06:00
Sol
2f466834f9 Update QuestController.java 2019-02-20 01:56:13 +00:00
Sol
3282ccf6b1 Fix NPE in QuestController.java 2019-02-20 01:49:59 +00:00
Sol
b544718140 Merge branch 'master' into 'master'
Use PeekAndReveal for Sunbird's Invocation

Closes #841

See merge request core-developers/forge!1395
2019-02-18 16:47:42 +00:00
Chris H
f2c48a386b Add null check for getDeckConstructionRules() 2019-02-15 20:28:40 -05:00
Peter F. Patel-Schneider
f63e59fbda PlayEffect has ShowRemembered parameter which shows remembered cards if playing cards selected from a zone 2019-02-15 08:49:16 -05:00
Michael Kamensky
cdb47e0e10 Merge branch 'optimize' into 'master'
optimize redisplay of floating card areas

See merge request core-developers/forge!1337
2019-02-04 20:34:45 +00:00
Agetian
426c0ca4c8 - Formatting fix. 2019-02-03 08:20:13 +03:00
Chris H
98830dde13 Fix Jhoira Avatar crashing since it copies cards into no zone 2019-02-02 23:23:17 -05:00
Peter F. Patel-Schneider
30607291fc optimize redisplay of floating card areas 2019-01-31 19:53:05 -05:00
Agetian
8c020c7c8c - Generic check. 2019-01-30 18:54:15 +03:00
Agetian
ba25696ea7 - Fix Gurzigost. 2019-01-30 18:30:07 +03:00
Michael Kamensky
01742f06f6 Merge branch 'highlight' into 'master'
Darken non-selectable cards in Desktop GUI

See merge request core-developers/forge!1317
2019-01-28 17:55:36 +00:00
Peter F. Patel-Schneider
e2ddcdda4d stronger highlighting for selectable cards 2019-01-27 07:16:54 -05:00
Hanmac
96e6111400 Riot: Make Riot Enchantment look into the future 2019-01-24 07:27:22 +01: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
Rob Schnautz
f78bfce802 RNA looks at artifact casting cost only 2019-01-21 03:31:16 +00: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
Peter F. Patel-Schneider
595fbae34f Fix crash when selecting a player 2019-01-17 15:37:59 -05:00
Peter F. Patel-Schneider
11f9520c1e Highlight sa targets in Desktop GUI 2019-01-17 09:35:52 -05:00
Peter F. Patel-Schneider
c7d9646f7f adjust highlighting for new manipulation interface 2019-01-16 13:10:56 -05:00
Peter F. Patel-Schneider
d4b4dc5ba0 Remove debugging print 2019-01-16 12:09:13 -05:00
Peter F. Patel-Schneider
2cd86bfe1e put yellow border on selectable cards 2019-01-16 12:09:13 -05:00
Peter F. Patel-Schneider
2f9fb96d29 use Iterators instead of Lists where possible in manipulateCardList 2019-01-16 12:06:21 -05: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
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
Hans Mackowiak
0606a00942 DeckFormat: A deck can have any number of cards named CARDNAME. 2019-01-12 16:13:00 +00:00
Hanmac
17cff99c2b Adapt: add ReduceCost for Pteramander 2019-01-11 21:15:27 +01: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