Blacksmith
be32b44feb
Merge branch 'master' of git.cardforge.org:core-developers/forge
2018-09-05 05:01:08 +00:00
Michael Kamensky
e3b3db7471
Merge branch 'jumpstart2' into 'master'
...
Jump-start: it is more an additional cost like retrace
See merge request core-developers/forge!899
2018-09-05 04:47:48 +00:00
Blacksmith
dc8e811352
Merge branch 'master' of git.cardforge.org:core-developers/forge
2018-09-05 01:01:09 +00: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
3802b88487
Jump-start: it is more an additional cost like retrace
2018-09-04 21:53:18 +02:00
Blacksmith
351d15701f
Merge branch 'master' of git.cardforge.org:core-developers/forge
2018-09-04 07:16:09 +00:00
Michael Kamensky
64b5b143bf
Merge branch 'jumpstart' into 'master'
...
Keyword: Jump-start
See merge request core-developers/forge!898
2018-09-04 07:04:13 +00:00
Agetian
36132359a7
- Fixed Jump-start description.
2018-09-04 10:01:31 +03: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
tehdiplomat
e4e33ebac0
Fix conflicts that got missed previously
2018-09-03 11:45:23 -04:00
tehdiplomat
e601a6deae
Some breadcrumbs for future Token Script development
2018-09-03 11:38:13 -04:00
tehdiplomat
d220f5fb78
Fetch token script images even if they aren't in the token image file
2018-09-03 11:37:44 -04:00
tehdiplomat
67edb87ccd
Allow Edition files to accept token names
2018-09-03 11:37:12 -04:00
tehdiplomat
780902ac31
Allow TokenAI to handle TokenScripts
2018-09-03 11:36:41 -04:00
austinio7116
1f001dd354
Corrected Jump-Start and Surveil syntax
2018-09-03 09:37:34 +01:00
maustin
d0cea5151e
Merge remote-tracking branch 'Austin/guildofravnica' into guildofravnica
...
# Conflicts:
# forge-gui/res/cardsfolder/upcoming/legion_warboss.txt
2018-09-03 09:06:45 +01:00
austinio7116
6540153a53
Cleanup of forgeScribe scripts including replacing new keywords where required.
2018-09-03 09:05:02 +01:00
austinio7116
637ef1e03a
Initial GRN ForgeScribe scripts from first spoilers
2018-09-03 09:04:35 +01:00
austinio7116
96459652a1
Fixed ^M bad interpeter issue in bash script
2018-09-03 09:04:14 +01:00
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
maustin
67aaf75973
Merge remote-tracking branch 'Austin/standardQuestMode' into standardQuestMode
2018-09-01 06:33:15 +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
austinio7116
2ab982463e
Added Randomized Standard Quest World with LDA archetype generated decks as duels and standard card pool
2018-08-31 23:00:59 +01:00
