austinio7116
7ebd5ef70e
Added randomly generated quest challenges to the random standard quest world
2018-09-07 14:38:36 +01:00
Blacksmith
e59015357c
Merge branch 'master' of git.cardforge.org:core-developers/forge
2018-09-07 09:12:14 +00:00
Michael Kamensky
31e2d434cd
Merge branch 'puzzle-engine' into 'master'
...
Added puzzle PS_M198.
See merge request core-developers/forge!901
2018-09-07 09:04:47 +00:00
Agetian
950fd116e7
- Added puzzle PS_M198.
2018-09-07 12:04:13 +03:00
Blacksmith
8818711c0f
Merge branch 'master' of git.cardforge.org:core-developers/forge
2018-09-06 03:10:16 +00:00
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
Blacksmith
51d49735c2
Merge branch 'master' of git.cardforge.org:core-developers/forge
2018-09-06 01:25:17 +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
maustin
01c34d498a
Merge remote-tracking branch 'Austin/guildofravnica' into guildofravnica
...
# Conflicts:
# forge-gui/res/cardsfolder/upcoming/necrotic_wound.txt
# forge-gui/res/cardsfolder/upcoming/quasiduplicate.txt
2018-09-05 12:15:31 +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
Blacksmith
5ffcfe52d8
Merge branch 'master' of git.cardforge.org:core-developers/forge
2018-09-05 06:01:09 +00:00
Michael Kamensky
8a1989ef02
Merge branch 'replaceDying' into 'master'
...
Replace dying
See merge request core-developers/forge!900
2018-09-05 05:51:49 +00: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
Hanmac
af76c37cbb
ReplaceDying moved to SpellAbilityEffect
2018-09-05 07:24:55 +02:00
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
