Commit Graph

34929 Commits

Author SHA1 Message Date
Mitchell Matthews
ff3f60cc68 Merge branch 'patch-1' into 'master'
Detail the new Collector Number sort column in CHANGES.TXT

See merge request core-developers/forge!7
2017-12-30 08:26:46 +00:00
Rob Schnautz
89aa4bfab3 Detail the new Collector Number sort column in CHANGES.TXT 2017-12-30 06:34:09 +00:00
Hans Mackowiak
746e60b517 Merge branch 'master' into 'master'
Master

See merge request core-developers/forge!4
2017-12-30 06:09:21 +00:00
Michael Kamensky
8634cc561f Merge branch 'draft_import_deck' into 'master'
deck import in drafted deck editor

See merge request core-developers/forge!6
2017-12-30 05:58:25 +00:00
Michael Kamensky
d384f0896a Merge branch 'flabel_bicubic' into 'master'
Bicubic interpolation in FLabel

See merge request core-developers/forge!5
2017-12-30 05:51:48 +00:00
Nikolay Hidalgo Diaz
9f5cc344ad copy all sections from imported deck in constructed deck edtior 2017-12-30 08:11:20 +03:00
Nikolay Hidalgo Diaz
45bebdff0c deck import in drafted deck editor 2017-12-30 07:46:10 +03:00
Nikolay Hidalgo Diaz
59ef9e132a Bicubic interpolation in FLabel to keep player state icons smooth when resizing player panel 2017-12-30 06:54:53 +03:00
Rob Schnautz
af8e9c2466 Update SColumnUtil.java 2017-12-29 18:47:01 +00:00
schnautzr
e11163f483 Add ColumnDef COLLECTOR_ORDER to SColumnUtil 2017-12-29 12:44:14 -06:00
Sol
d3ff20484d Merge branch 'line-endings' into 'master'
Normalize line endings

See merge request core-developers/forge!2
2017-12-29 13:22:52 +00:00
Mitchell Matthews
76cbbb2bfe Merge branch 'test-git' into 'master'
- Updating CHANGES.txt and testing Git commit in the process.

See merge request core-developers/forge!3
2017-12-29 06:48:19 +00:00
Agetian
c51ad4aaa6 - Updating CHANGES.txt and testing Git commit in the process. 2017-12-29 09:34:11 +03:00
KrazyTheFox
6d5e56f6bf Normalize line endings 2017-12-28 23:40:29 -05:00
Agetian
251569e81c - Added two tutorial puzzles by Ikeda. 2017-12-27 06:52:02 +00:00
Hanmac
be2759c354 ColumnDef: updates for SortingName and Sorting CollectionOrder 2017-12-26 15:54:31 +00:00
Hanmac
69ee8f3630 update pom.xml with my info 2017-12-24 10:30:12 +00:00
Hanmac
610991a222 ManaCost: add Shard#isHybrid 2017-12-23 21:45:51 +00:00
Agetian
f08a0eaffd - Added a new Puzzle Mode game state flag, "NoETBTrigs", which allows you to ignore the ETB triggers and replacement effects for a card when necessary.
- Fixed a bug that made it tricky to add several precast flags to a puzzle due to absence of whitespace trimming.
- Added puzzles PC_012616 and PC_020216 by Xitax.
- Updated the puzzle PC_122915 to set itself up automatically without being obnoxious.
2017-12-21 06:11:21 +00:00
Agetian
a0baa659ec - Removed accidentally committed PC_012616 (will recommit later once an issue with it is addressed). 2017-12-20 04:27:24 +00:00
Agetian
536a19b373 - Added puzzles PC_022416, PC_021616, PC_021816 by Xitax. 2017-12-20 04:26:14 +00:00
Sol
27a2d7f642 Experimental fix for Attacking/Passing race condition 2017-12-19 03:03:35 +00:00
Agetian
fc29cec8c8 - Puzzle PS_HOU3: added some more Mountains to the human library to make it solvable using the Reddit solution. 2017-12-11 14:59:08 +00:00
Indigo Dragon
5fe19d75a6 Changed Blood Speaker from an awkward TrigSacrifice to a TrigSearch that uses Cost$ Sac.
Territorial Gorger; You get energy, not gain energy.
2017-12-11 10:24:38 +00:00
Sol
3252489971 Contains keyword should be checking for Contains, not startswith 2017-12-11 04:31:25 +00:00
Sol
f90af4784e Fix Signets being exploitable by not actually paying for activation 2017-12-10 20:30:48 +00:00
Hanmac
a2f11fb829 RE: do CARDNAME after text changing effects 2017-12-09 15:47:13 +00:00
Indigo Dragon
b6e6d308a9 Fixed some — issues (Non UTF-8). 2017-12-09 14:43:17 +00:00
Sol
dd04888106 RarityFilter from Luke 2017-12-09 02:38:50 +00:00
Agetian
0c397a414e - A better place for replacement effect CARDNAME conversion. 2017-12-08 10:35:54 +00:00
Agetian
2a62001048 - Fixed a NPE on mobile Forge when looking up certain cards with replacement effects (e.g. Kess, Dissident Mage). 2017-12-08 10:31:27 +00:00
Indigo Dragon
3132e5dd5b Removed reminder text from Mark of the Vampire.
Fixed Dread Summons cleanup.
2017-12-08 06:22:17 +00:00
Indigo Dragon
8843a12333 Added the Modern Event Deck, March of the Multitudes. 2017-12-07 12:52:00 +00:00
Indigo Dragon
b2e97ac73b Changes to rankings.txt
1. Removed Basic Lands
2. Changed AEther to Aether (and one Aerathi)
3. Fixed 5DN by proper capitalisation.
4. Added Ugin's Fate rankings. Rank is based upon original KTK/FRF rank.
5. Fixed Horizon Canopy (EXP), Death Pits of Rath, Seance, Noggle Hedge Mage, Scragnoth, Transguild Courier, Flame Kin Zealot, Evil Eye of Orms By Gore, Brush with Death, Will o' the Wisp, The Tabernacle at Pendrell Vale, Torsten Von Ursus, Abu Ja'far, Brutal Nightstalker.

Bug: Ironclaw Orcs is missing in 2ED, LEB, and LEA ranks. Another run through of those sets should be sufficient.
Bug Progress: Borrowing 100,000 Arrows and Guan Yu's 1,000-Li March. I discovered through these fixes that rankings.txt is case sensitive. That means the only two cards that begin with a number (" 1") must scare it somehow, meaning that these two cards cannot be assinged a ranking.
2017-12-07 12:48:19 +00:00
Indigo Dragon
11c440209a Updated Draft Rankings, including Planechase, Archenemy, Planechase 2, Planechase Anthology (A copy of Planechase 2), Archenemy: Nicol Bolas, Explorers of Ixalan.
Also fixed a few AE issues.
2017-12-07 06:40:36 +00:00
Indigo Dragon
400adeed1c Added Commander Draft Rankings. The ranking is based upon EDHREC Rank from Scryfall.
These are COM, C13, C14, C15, C16, CMA, C17.

As such, some low power cards undeservingly get high rankings eg Evolving Wilds, Diabolic Tutor, Herald's Horn.

To Do: Add Rankings to similar large supplementary sets eg Planechase, Archenemy

Bug: Borrowing 100,000 Arrows is not recognised in rankings.txt. As such, it always has a rank of 500.0.
2017-12-06 15:46:58 +00:00
Indigo Dragon
abcdc7253e 1. DeckHints Synergy between Trials and Cartouches.
2. Some Play Before Combats.
3. General Deck Hints.
2017-12-05 09:13:05 +00:00
Agetian
b6b8b9440f - Removed a useless line from the previous commit. 2017-12-05 08:57:13 +00:00
Agetian
c9a64b8e96 - Attempting to fix a bug with the replacement handler not converting CARDNAME. 2017-12-05 04:59:58 +00:00
Indigo Dragon
327795855a Reapplying 36129, except this time it works.
Turns out I accidentally changed the Name of liberating_combustion.txt, wrecking everything.
2017-12-04 07:58:52 +00:00
Agetian
b3c5494e74 - Reverted r36129 as requested. 2017-12-04 07:29:52 +00:00
Indigo Dragon
9fc4a247aa EDIT: WHOOPS THIS BORKED EVERYTHING PLS REVERT
Added plenty of DeckHints:Name$, some DeckHints:Color, many DeckNeeds:Name$
Most notably the Planeswalker Deck Into pack exclusive cards eg. [[Chandra, Pyrogenius]] and [[Liberating Combustion]]. New Policy: If a card would refer to another card, each get DeckHints:Name$ of the other.
2017-12-04 07:12:25 +00:00
Agetian
013cd0a9a8 - Added puzzle PC_122915 by Xitax (has some start-of-the-game quirks, documented in the description for now, may be addressed later). 2017-12-04 05:30:59 +00:00
Hanmac
05a9da4eb8 CardFactoryUtil: removed extra line for Suspend 2017-12-03 17:00:27 +00:00
Agetian
81d853ac04 - Preparing Forge for Mobile publish 1.6.5.001 [incremental]. 2017-12-03 15:36:57 +00:00
Blacksmith
af8dfa685a Clear out release files in preparation for next release 2017-12-03 15:27:30 +00:00
Blacksmith
946a360652 [maven-release-plugin] prepare for next development iteration 2017-12-03 15:21:13 +00:00
Blacksmith
071fe9a910 [maven-release-plugin] prepare release forge-1.6.5 forge-1.6.5 2017-12-03 15:21:05 +00:00
Blacksmith
ccb4e87002 Update README.txt for release 2017-12-03 15:19:10 +00:00
austinio7116
cd9adb166a Updated frontier cube from cubetutor to include newer sets 2017-12-01 22:52:09 +00:00