Commit Graph

38761 Commits

Author SHA1 Message Date
austinio7116
35c52e0e61 Cleanup of forgeScribe scripts including replacing new keywords where required. 2018-09-03 08:54:58 +01:00
austinio7116
a664b7dad9 Initial GRN ForgeScribe scripts from first spoilers 2018-09-03 08:43:47 +01:00
austinio7116
6d7c6f2153 Fixed ^M bad interpeter issue in bash script 2018-09-03 08:40:02 +01:00
Blacksmith
1c517356cf Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-09-03 03:54:33 +00:00
Michael Kamensky
0baf5ca772 Merge branch 'mentor' into 'master'
Mentor

See merge request core-developers/forge!894
2018-09-03 03:48:38 +00:00
Blacksmith
1a58970c73 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-09-03 03:39:34 +00:00
Michael Kamensky
b370882b86 Merge branch 'fixups' into 'master'
add TD1 to special rounding case

See merge request core-developers/forge!895
2018-09-03 03:37:35 +00: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
05aac0e1cb update mobile for Sentry
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-02 11:30:38 -06:00
Jamin W. Collins
881bd7adf2 add more information to Sentry reports
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-02 11:30:38 -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
Jamin W. Collins
6c99a911f2 add TD1 to special rounding case
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-02 11:27:15 -06:00
Hanmac
4b1de970f9 cards: add mentor example 2018-09-02 18:14:41 +02:00
Hanmac
e98431e525 CardFactoryUtil: add Mentor Keyword 2018-09-02 18:14:05 +02:00
Blacksmith
7d6e8e95d3 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-09-02 15:54:34 +00: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
Michael Kamensky
5a81be04a6 Merge branch 'prowlFix' into 'master'
Prowl fix

See merge request core-developers/forge!892
2018-09-02 15:39:52 +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
Hanmac
6ec0dd49d7 Prowl is a Keyword now 2018-09-02 14:45:56 +02:00
Blacksmith
c67b10dee6 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-09-01 14:09:34 +00:00
Michael Kamensky
a1ebb1f3df Merge branch 'm19recentfixes' into 'master'
Completed Tezzeret's Gatebreaker script (with a little help from forgeScribe)

See merge request core-developers/forge!891
2018-09-01 13:55:06 +00:00
austinio7116
f5add1bc8f Completed Tezzeret's Gatebreaker script (with a little help from forgeScribe) 2018-09-01 08:41:49 +01:00
Blacksmith
43338bd0a3 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-30 20:44:18 +00:00
Michael Kamensky
2476bcfa31 Merge branch 'surgedFix' into 'master'
Surge: don't use OptionalCost there

See merge request core-developers/forge!887
2018-08-30 19:29:15 +00:00
Hanmac
f967d9885a CardProperty: fixed surged 2018-08-30 21:18:08 +02: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
Hanmac
73b94a63a5 Surge: don't use OptionalCost there 2018-08-30 20:25:30 +02:00
Blacksmith
2bcd57910e Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-30 11:20:42 +00: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
Blacksmith
51735b9ff7 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-30 05:50:42 +00:00
Michael Kamensky
2f1527d89f Merge branch 'fix-xantcha' into 'master'
Xantcha is an "As" not a "When"

See merge request core-developers/forge!886
2018-08-30 05:45:21 +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
Blacksmith
aec894a569 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-27 16:50:42 +00:00
Michael Kamensky
db7ab85f26 Merge branch 'multi-select' into 'master'
properly message and limit human multi-select

See merge request core-developers/forge!882
2018-08-27 16:39:44 +00:00
Jamin W. Collins
5f6ea460dd properly message and limit human multi-select
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-08-27 08:18:40 -06:00
Blacksmith
97f93418bf Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-27 03:20:42 +00:00
Sol
42acde1ba0 Merge branch 'android-network-play' into 'master'
Android network play

See merge request core-developers/forge!836
2018-08-27 03:07:21 +00: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
Blacksmith
e70f6da283 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-08-26 17:35:42 +00: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
Jamin W. Collins
071c45839d add Dev Mode indication
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-08-26 11:26:38 -06:00
Jamin W. Collins
39c002e903 only the specific player can adjust their team
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-08-26 11:26:38 -06:00
Jamin W. Collins
57d5013750 only network host can adjust number of players
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-08-26 11:26:38 -06:00