Michael Kamensky
d54ca72994
Merge branch 'deck-editor-filtering-tweaks' into 'master'
...
Fix deck editor Set/Format edit problems.
Closes #863 and #855
See merge request core-developers/forge!1420
2019-02-27 12:21:29 +00:00
Michael Kamensky
79ce24b682
Merge branch 'patch' into 'master'
...
Update Lavinia, Azorius Renegade for multiplayer
See merge request core-developers/forge!1422
2019-02-27 12:21:17 +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
Sol
e7f7e62cbf
Remove unnecessary RNA token image URLs
2019-02-27 02:48:05 +00:00
KrazyTheFox
17c280f052
Merge branch 'master' of git.cardforge.org:core-developers/forge into custom-pool-options
2019-02-26 21:17:10 -05:00
swordshine
8d3fe2088a
Merge branch 'gk2' into 'master'
...
GK2 edition
See merge request core-developers/forge!1424
2019-02-27 01:21:20 +00:00
swordshine
a87adfaf16
Merge branch 'type-grouping-patch' into 'master'
...
Sort Sorcery // Instant as an instant in Type sort.
See merge request core-developers/forge!1426
2019-02-27 01:20:45 +00:00
swordshine
ed895a5248
Merge branch 'oracle-nonfunctional' into 'master'
...
Oracle nonfunctional
See merge request core-developers/forge!1425
2019-02-27 01:19:51 +00:00
Rob Schnautz
143a254189
Sort Sorcery // Instant as an instant in Type sort.
2019-02-27 00:31:05 +00:00
Rob Schnautz
25a3367d74
Let's do the Wurm Warp
2019-02-27 00:01:12 +00:00
Rob Schnautz
400c7d366b
any time
2019-02-26 23:58:20 +00:00
Rob Schnautz
43cdbbdbee
Trample reminder text.
2019-02-26 23:48:51 +00:00
Rob Schnautz
bddba4c6dc
Update trample reminder text
2019-02-26 23:43:14 +00:00
Rob Schnautz
4ab79ce75d
fix date
2019-02-26 22:57:38 +00:00
Rob Schnautz
42eba01a76
GK2 edition
2019-02-26 22:45:23 +00:00
tehdiplomat
f0efc2089c
Ad LRU to ImageCache to get a handle on memory bloat
2019-02-26 15:40:36 -05:00
tehdiplomat
3095c25f6d
Merge branch 'master' of https://git.cardforge.org/friarsol/forge
2019-02-26 15:40:16 -05:00
swordshine
f38ec8d4a0
- Update Lavinia, Azorius Renegade for multiplayer
2019-02-26 16:59:25 +08:00
churrufli
56b3f04120
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2019-02-25 11:36:50 +01:00
Michael Kamensky
e35978594a
Merge branch 'mobile-gui-zoom-update' into 'master'
...
Mobile gui zoom update
Closes #845
See merge request core-developers/forge!1418
2019-02-25 10:25:57 +00:00
Tim Scott
99aab2e716
Correct typo.
...
Add SNAPSHOT build info for Eclipse.
2019-02-24 22:31:59 -06: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
churrufli
405e07a78e
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2019-02-25 00:02:01 +01:00
Tim Scott
b090cdfa41
Fix deck editor Set/Format edit problems.
...
Add code to respect the "allow reprints" option on the Formats dialog. Default it to 'true'. Also add code to be able to initialize the sate of that same checkbox.
Change format and set edits to refresh the item manager list so edits are realized.
Change wording of set "allow reprints" checkbox to remove confusion / conflict with the format "allow reprints" checkbox.
Add constructor so a whole format list can simply be added at once rather than iterating and creating multiple filter objects for each format. (Net result is the same in either case.)
Change text of filter drop down to indicate things are being added or edited vs just added.
2019-02-24 12:33:58 -06:00
Michael Kamensky
8c810a120e
Merge branch 'fixTriggerStatic' into 'master'
...
Fix trigger static
See merge request core-developers/forge!1417
2019-02-24 15:11:05 +00:00
Hanmac
fe4ce14a4b
TriggerChangesZone: this check only for nonStatic Trigger
2019-02-24 15:59:36 +01:00
Tim Scott
ae8271de01
Add missing Eclipse steps to README for building for Android target.
2019-02-23 16:42:27 -06:00
Tim Scott
22aa98bf92
Add logic to prevent overzoom of rotated split cards for forge-gui-mobile.
2019-02-23 16:31:08 -06:00
Sol
f5f164af93
Merge branch 'unmappable-characters' into 'master'
...
Replace unmappable characters.
See merge request core-developers/forge!1416
2019-02-23 21:04:11 +00:00
churrufli
48216f95e1
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2019-02-23 20:25:57 +01:00
churrufli
6ef9f4bc7b
undo translation in AddBasicLandsDialog.java
2019-02-23 19:47:52 +01:00
schnautzr
4ddf811118
Replace unmappable characters.
2019-02-23 11:37:28 -06:00
Michael Kamensky
3cf8b956e4
Merge branch '846-transform-with-die-trigger' into 'master'
...
Resolve "Transform with die trigger"
Closes #846
See merge request core-developers/forge!1408
2019-02-23 15:14:43 +00:00
Hanmac
9bf908ccb4
GameAction: fix die trigger for non-Original
...
TriggerChangesZone: fix leave battlefield on hidden
2019-02-23 14:50:08 +01:00
Michael Kamensky
38d3f76bb5
Merge branch 'fixTokenScriptAgain' into 'master'
...
TokenInfo: fix if script is null
See merge request core-developers/forge!1415
2019-02-23 13:44:07 +00:00
Hanmac
0c2cfdce34
TokenInfo: fix if script is null
2019-02-23 13:47:40 +01:00
Michael Kamensky
ea2b61cf5b
Merge branch 'fix-ai-attack-token-round2' into 'master'
...
Fix ai attack token round2
See merge request core-developers/forge!1414
2019-02-23 05:07:11 +00:00
Chris H
ffda74101f
Actually fix the crash in TokenAI.spawnToken for Attacking tokens
2019-02-22 21:50:35 -05:00
Chris H
08f47d58a1
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2019-02-22 19:55:26 -05:00
churrufli
f87f6bdebe
undo translation in AddBasicLandsDialog.java
2019-02-22 17:35:37 +01:00
churrufli
2e70ab329e
undo translation in AddBasicLandsDialog.java
2019-02-22 17:26:44 +01:00
churrufli
73749f28da
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2019-02-22 17:23:31 +01:00
churrufli
f7134f0a54
Translating hard-coded text to res en-US.properties
2019-02-22 16:53:57 +01:00
churrufli
231b2da573
Translating hard-coded text to res en-US.properties
2019-02-22 15:28:02 +01:00
churrufli
bf5c319bfe
Merge remote-tracking branch 'origin/master'
2019-02-22 15:11:44 +01:00
churrufli
d781b6ba61
Translating hard-coded text to res en-US.properties
2019-02-22 15:10:54 +01:00
Michael Kamensky
98282acc60
Merge branch 'forums-bug-fix-attach-ai' into 'master'
...
Fix the thing Sol told me to
See merge request core-developers/forge!1412
2019-02-22 13:06:33 +00:00
Sol
d2917f0e43
Merge branch '850-untilyournextturn-incorrectly-ends-during-your-next-cleanup-phase' into 'master'
...
Resolve "UntilYourNextTurn incorrectly ends during your next cleanup phase"
Closes #850
See merge request core-developers/forge!1409
2019-02-22 12:58:14 +00:00
swordshine
919aecd9a1
Merge branch 'timmermac-sting-easy' into 'master'
...
Add Sting deck by timmermac
See merge request core-developers/forge!1345
2019-02-22 12:39:32 +00:00
swordshine
3c17b22a95
Merge branch 'cherry-pick-7d6a2618' into 'master'
...
Make sure Token AI loads TokenScript params before doing things with hte token
See merge request core-developers/forge!1411
2019-02-22 12:38:20 +00:00
