Commit Graph

9845 Commits

Author SHA1 Message Date
Sol
58ee5a12eb Merge branch 'xstream' into 'master'
XStream Security Settings

See merge request core-developers/forge!868
2018-09-06 03:04:26 +00:00
Jamin Collins
925ae63071 Merge branch 'token_phase_two' into 'master'
Add more support for migrating Editions to TokenScripts

See merge request core-developers/forge!885
2018-09-06 01:16:27 +00:00
austinio7116
d07c4d19e0 Updated GRN edition file 2018-09-05 12:21:45 +01:00
austinio7116
adf48de86b Completed Healer's Hawk 2018-09-05 12:18:32 +01:00
austinio7116
4188559b1a Manual fixes to forgeScribe scripts 2018-09-05 12:14:15 +01:00
austinio7116
10a68e9613 More ravnica cards as scripted by forgeScribe4.1 - unedited 2018-09-05 12:04:19 +01:00
austinio7116
89c4042042 Corrected Jump-Start and Surveil syntax 2018-09-05 09:01:13 +01:00
austinio7116
d3fb9f3782 Cleanup of forgeScribe scripts including replacing new keywords where required. 2018-09-05 09:00:05 +01:00
austinio7116
3fc1950a19 Initial GRN ForgeScribe scripts from first spoilers 2018-09-05 08:59:56 +01:00
austinio7116
d5d1320c6e Fixed ^M bad interpeter issue in bash script 2018-09-05 08:59:38 +01:00
Hanmac
b0e3ff7b45 add necrotic wound 2018-09-05 07:28:31 +02:00
Hanmac
f0c850aa78 update flaying tendrils 2018-09-05 07:25:29 +02:00
Sol
50a2ee70b6 Merge branch 'sentry' into 'master'
Implement Sentry

Closes #650

See merge request core-developers/forge!889
2018-09-05 00:59:46 +00:00
Hanmac
7dedaeb111 Keyword: Jump-start 2018-09-04 07:19:58 +02:00
tehdiplomat
8338f62603 More breadcrumbs 2018-09-03 11:45:59 -04:00
Jamin W. Collins
19be7f51ae configure XStream security for QuestDataIO
The printing of the exception caught in FControl is very helpful for any
future issues caused by the security settings as it indicates which
class was present in the stream, but not allowed.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-02 11:44:37 -06:00
Jamin W. Collins
efcee72780 configure XStream security for QuestPetStorage
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-02 11:44:37 -06:00
Jamin W. Collins
0e2f47dc8c configure XStream security for QuestBazaarManager
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-02 11:44:37 -06:00
Jamin W. Collins
9b6f76eb16 configure XStream security for TournamentIO
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-02 11:44:36 -06:00
Jamin W. Collins
cc044978fb configure XStream security for GauntletIO
Catching the ConversionException prevents Gauntlet saves from being
deleted in the event of improper or incomplete security settings on
XStream.  The null check in CSubmenuGauntletContests avoids an exception
should there be no Gauntlet saves.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-02 11:44:36 -06:00
Jamin W. Collins
b0e2450a0e initial Sentry integration
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-02 11:30:38 -06:00
Hanmac
4b1de970f9 cards: add mentor example 2018-09-02 18:14:41 +02:00
Michael Kamensky
b56b90ec1a Merge branch 'bbdforgescribe' into 'master'
Some BBD cards scripted by forgeScribe (with a bit of cleanup on a couple)

See merge request core-developers/forge!893
2018-09-02 15:43:39 +00:00
austinio7116
ab209d6db5 Some BBD cards scripted by forgeScribe (with a bit of cleanup on a couple) 2018-09-02 16:21:00 +01:00
Hanmac
724e4d5932 cards: update Prowl cards 2018-09-02 14:47:06 +02:00
austinio7116
f5add1bc8f Completed Tezzeret's Gatebreaker script (with a little help from forgeScribe) 2018-09-01 08:41:49 +01:00
austinio7116
952e08848c Added Randomized Standard Quest World with LDA archetype generated decks as duels and standard card pool 2018-09-01 06:32:52 +01:00
Michael Kamensky
83721cadbd Merge branch 'puzzle-engine' into 'master'
Added puzzle PS_M197.

See merge request core-developers/forge!888
2018-08-30 19:10:46 +00:00
Agetian
b22c1ece86 - Added puzzle PS_M197. 2018-08-30 22:10:10 +03:00
Michael Kamensky
b279ae0771 Merge branch 'import_deck' into 'master'
Enables `Import` `Open` `New deck` `Save As` buttons in all deck editors with finite catalog

See merge request core-developers/forge!884
2018-08-30 11:18:09 +00:00
Sol
0ded352f22 Xantcha is an "As" not a "When" 2018-08-29 18:50:38 +00:00
NikolayHD
66e52cbd6a Support Import, Open, New deck, Save As
in all deck editors with finite catalog
2018-08-29 01:15:27 +03:00
Jamin W. Collins
095bb4a154 make protocol definition match implementation
com.badlogic.gdx.utils.GdxRuntimeException: java.lang.InternalError: Protocol method getActivateDescription: illegal argument (0) of type forge.game.card.CardView, java.lang.String expected
	at com.badlogic.gdx.backends.lwjgl.LwjglApplication$1.run(LwjglApplication.java:127)
Caused by: java.lang.InternalError: Protocol method getActivateDescription: illegal argument (0) of type forge.game.card.CardView, java.lang.String expected
	at forge.net.ProtocolMethod.checkArgs(ProtocolMethod.java:158)
	at forge.net.GameProtocolSender.sendAndWait(GameProtocolSender.java:21)
	at forge.net.client.NetGameController.sendAndWait(NetGameController.java:28)
	at forge.net.client.NetGameController.getActivateDescription(NetGameController.java:93)
	at forge.screens.match.views.VCardDisplayArea.getActivateAction(VCardDisplayArea.java:186)
	at forge.card.CardZoom.onCardChanged(CardZoom.java:113)
	at forge.card.CardZoom.show(CardZoom.java:64)
	at forge.screens.match.views.VCardDisplayArea$CardAreaPanel.showZoom(VCardDisplayArea.java:406)
	at forge.screens.match.views.VCardDisplayArea$CardAreaPanel.longPress(VCardDisplayArea.java:396)
	at forge.Forge$MainInputProcessor.longPress(Forge.java:575)
	at forge.toolbox.FGestureAdapter$1.run(FGestureAdapter.java:43)
	at com.badlogic.gdx.backends.lwjgl.LwjglApplication.executeRunnables(LwjglApplication.java:246)
	at com.badlogic.gdx.backends.lwjgl.LwjglApplication.mainLoop(LwjglApplication.java:199)
	at com.badlogic.gdx.backends.lwjgl.LwjglApplication$1.run(LwjglApplication.java:120)

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-08-26 12:56:27 -06:00
Jamin W. Collins
97e6657bfc move everything to guava android for compatibility
There appear to be incompatibilities between guava 24.1-jre and
24.1-android with regard to serialization.  As long as networking
is dependent upon serialization desktop and android need to use
the exact same guava package.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-08-26 11:26:38 -06:00
Hanmac
9acb1dca93 Dredge use : 2018-08-26 15:20:20 +02:00
Michael Kamensky
3dda238f7a Merge branch 'updatedmoderndeckgenm19' into 'master'
Updated modern LDA deckgen data

See merge request core-developers/forge!880
2018-08-26 09:27:17 +00:00
austinio7116
017f84c056 Updated modern LDA deckgen data 2018-08-26 08:01:22 +01:00
Jamin W. Collins
f500f6837f catch and record benign network play exception
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-08-24 20:21:13 -06:00
Mitchell Matthews
65282bee6a Update EditionTracking.py to work with new formats directory structure 2018-08-23 12:22:17 -04:00
Michael Kamensky
f217b3da3a Merge branch 'new_cards' into 'master'
Adding Xantcha and Spellseeker

See merge request core-developers/forge!872
2018-08-22 16:20:20 +00:00
tehdiplomat
83254033fb Add description for Xantcha 2018-08-22 12:13:24 -04:00
tehdiplomat
746c8b7d8f Fix Xantcha activated ability 2018-08-22 11:00:59 -04:00
Hanmac
367875c15c CardFactoryUtil: Rampage use : 2018-08-22 12:37:59 +02:00
Agetian
85a386d58d - Added puzzle PS_M196. 2018-08-22 07:07:40 +03:00
tehdiplomat
afc3182aa0 Adding Xantcha and Spellseeker 2018-08-21 21:03:17 -04:00
Michael Kamensky
e968afbd87 Merge branch 'timestampStateFix' into 'master'
Timestamp state fix

Closes #594 and #647

See merge request core-developers/forge!860
2018-08-21 20:26:42 +00:00
Hanmac
2603d14b7e GameActionUtil: EquipInstantSpeed should affect the player 2018-08-21 17:43:17 +02:00
austinio7116
abb1ec890a Latest LDA data for Standard - more archetypes and more data 2018-08-19 06:39:03 +01:00
Hanmac
3aa5d191fa cards: add some LKI to some DealDamage effects 2018-08-18 08:46:38 +02:00
Hanmac
5f385f8a40 cards: update cards 2018-08-18 08:46:38 +02:00