Commit Graph

39300 Commits

Author SHA1 Message Date
Sol
245c22e508 Merge branch 'patch-13' into 'master'
Probably fixes Honor the Fallen

See merge request core-developers/forge!967
2018-10-01 13:02:09 +00:00
Michael Kuenzli
9a81a53fe3 Fix typo (exile -> surveil) 2018-10-01 09:01:02 +02:00
Meerkov
8fb18d278e Probably fixes Oni Possession. 2018-10-01 05:21:04 +00:00
Meerkov
2e46ff5667 I'm guessing this card is broken, and that this fixes it. 2018-10-01 05:17:31 +00:00
Michael Kamensky
304487bc50 Merge branch 'mayPlayLand' into 'master'
Player: canPlayLand use the mayPlay of the Land Ability

See merge request core-developers/forge!965
2018-09-30 17:36:21 +00:00
Jamin W. Collins
2b6aae8a09 Preparing Forge for Android publish 1.6.16.001
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-30 11:29:08 -06:00
Michael Kamensky
97a6dd95f1 Merge branch 'guilds_fxes' into 'master'
Fix reported GRN issues

See merge request core-developers/forge!966
2018-09-30 16:57:01 +00:00
tehdiplomat
ab9df124d7 Fix reported GRN issues 2018-09-30 12:32:08 -04:00
Hanmac
45ee00f10b Player: canPlayLand use the mayPlay of the Land Ability 2018-09-30 16:41:22 +02:00
Hanmac
12eabc6ce4 cards: updated cards with tokenscripts 2018-09-30 15:10:26 +02:00
Hanmac
a298dcf3bc TokenScript: make CardTextChange working again
SpellAbility: changeTextIntrinsic to sub abilities
2018-09-30 15:10:12 +02:00
Sol
5371cbe9c8 Merge branch 'fix-prerequisites-warning' into 'master'
Fix up pom files

See merge request core-developers/forge!964
2018-09-29 23:55:49 +00:00
KrazyTheFox
f0c2cf8577 Fix up pom files 2018-09-29 16:41:06 -04:00
Blacksmith
1e46f88ef5 [maven-release-plugin] prepare for next development iteration 2018-09-29 19:53:15 +00:00
Blacksmith
5192fc3f59 [maven-release-plugin] prepare release forge-1.6.16 forge-1.6.16 2018-09-29 19:53:10 +00:00
Blacksmith
efca55083c Update README.txt for release 2018-09-29 19:51:13 +00:00
Sol
735a7997d6 Merge branch 'grn-changes' into 'master'
Add GRN and token changes to CHANGES.txt

See merge request core-developers/forge!963
2018-09-29 18:35:56 +00:00
Krazy
3e5636ea21 Merge branch 'migrate_upcoming' into 'master'
Migrate upcoming

See merge request core-developers/forge!962
2018-09-29 18:19:09 +00:00
tehdiplomat
5f5bcc35ad Fix migrateupcoming script and remove scripted reprints 2018-09-29 14:06:29 -04:00
KrazyTheFox
be5c3a0401 Add GRN and token changes to CHANGES.txt 2018-09-29 14:03:44 -04:00
tehdiplomat
17062eecdb Not sure why these reprints got deleted by migrate script? 2018-09-29 14:03:22 -04:00
tehdiplomat
e036465ce3 Migrate GRN to their letter folders 2018-09-29 13:57:51 -04:00
Sol
c52f8efa11 Merge branch 'grnreleasetest' into 'master'
Update to GRN standard deck generation ready for release plus changes.txt update

See merge request core-developers/forge!960
2018-09-29 17:31:22 +00:00
austinio7116
183a671227 Updated Changes.txt to include mention of new random standard quest world
(cherry picked from commit 958671d)
2018-09-29 07:09:42 +01:00
austinio7116
7cc247c6c7 Crackling Drake
(cherry picked from commit 4292012)
2018-09-29 07:09:29 +01:00
austinio7116
a8a69d2a66 Rerun deck generation with just committed GRN cards
(cherry picked from commit 827bd24)
2018-09-29 06:59:53 +01:00
austinio7116
63822c16c1 Updated pre-prerelease Standard LDA deck archetype data for deck generation - assumes new standard format is live
(cherry picked from commit 913cce4)

(cherry picked from commit 0bffd34)
2018-09-29 06:45:17 +01:00
Michael Kamensky
f577523dee Merge branch 'no-quest-npe-fix' into 'master'
Fix a crash that occurred when no quests were available to load

See merge request core-developers/forge!959
2018-09-29 04:24:13 +00:00
Krazy
dca93282f3 Merge branch 'guilds_fxes' into 'master'
Update formats

See merge request core-developers/forge!958
2018-09-29 04:19:20 +00:00
KrazyTheFox
0e9bf4fe4b Fix a crash that occurred when no quests were available to load 2018-09-29 00:07:05 -04:00
tehdiplomat
7cdf7538e9 Update formats 2018-09-28 21:25:25 -04:00
Michael Kamensky
2ab59849a8 Merge branch 'guilds_fxes' into 'master'
Experimental Frenzy

See merge request core-developers/forge!954
2018-09-28 09:27:23 +00:00
Hans Mackowiak
60f1b13110 Merge branch 'patch-13' into 'master'
Changes Tetsuo Umezawa to use the same script as Bartel Runeaxe, instead of a keyworded ability

See merge request core-developers/forge!956
2018-09-28 08:33:05 +00:00
austinio7116
429201226a Crackling Drake 2018-09-28 08:54:58 +01:00
austinio7116
fce605868d Remaining GRN cards - all either incomplete or with issues to fix 2018-09-28 06:50:16 +01:00
Meerkov
de5d7c4349 Changes Tetsuo Umezawa to use the same script as Bartel Runeaxe, instead of a keyworded ability 2018-09-27 16:48:27 +00:00
tehdiplomat
2f30b14c53 Fix AI passing in null to canPlayLand 2018-09-27 10:57:04 -04:00
tehdiplomat
c1df1da195 Apparently unused imports is a compile error? 2018-09-27 08:21:48 -04:00
austinio7116
958671d7e8 Updated Changes.txt to include mention of new random standard quest world 2018-09-27 11:17:28 +01:00
austinio7116
0bffd3463b Updated pre-prerelease Standard LDA deck archetype data for deck generation - assumes new standard format is live
(cherry picked from commit 913cce4)
2018-09-27 11:13:15 +01:00
Michael Kamensky
9bbd1da0ba Merge branch 'bug-fixes' into 'master'
fix NPE when there is nothing to choose from

See merge request core-developers/forge!952
2018-09-27 04:37:43 +00:00
Michael Kamensky
fc8142db8b Merge branch 'themes' into 'master'
theme related fixes

See merge request core-developers/forge!953
2018-09-27 04:35:18 +00:00
Jamin W. Collins
848df654fa set relative font sizes in Card Detail Panel
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-26 17:28:08 -06:00
Jamin W. Collins
9ab50c4d9d create and use getRelativeFontSize() method
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-26 17:27:15 -06:00
Jamin W. Collins
32ab0aadb0 fix NPE when there is nothing to choose from
With the existing code, if a player cast Surgical Extraction targetting
a card that only existed in the target player's graveyard (no copies in
the players hand or library), an NPE would be thrown.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-26 17:26:03 -06:00
Michael Kamensky
c8ab4ff0c4 Merge branch 'master' into 'master'
Removing SVar:Rarity

See merge request core-developers/forge!951
2018-09-26 10:25:56 +00:00
Michael Kamensky
b125dd9e2d Merge branch 'svarupdate' into 'master'
Update Svar->SVar.

See merge request core-developers/forge!950
2018-09-26 10:24:56 +00:00
Agetian
0e398d2589 - Removing SVar:Rarity:Rare 2018-09-26 13:21:46 +03:00
Agetian
08e3f1ebd5 - Removing SVar:Rarity 2018-09-26 10:59:54 +03:00
Agetian
d273a35305 - Update Svar->SVar. 2018-09-26 09:16:34 +03:00