Commit Graph

54372 Commits

Author SHA1 Message Date
Anthony Calosa
d5462db931 unused import 2021-11-09 13:42:14 +08:00
Michael Kamensky
24338e8aae Merge branch 'cleanup' into 'master'
Cleanup cards: use cost instead of remembering

See merge request core-developers/forge!5762
2021-11-09 03:55:53 +00:00
Michael Kamensky
ae5d241a52 Merge branch 'adventure' into 'master'
Fixed major thread bug in adventure matches

See merge request core-developers/forge!5763
2021-11-09 03:55:33 +00:00
Michael Kamensky
12bbc381a2 Merge branch 'spacing' into 'master'
add space for Presence/MayFlash

See merge request core-developers/forge!5764
2021-11-09 03:53:42 +00:00
Michael Kamensky
dafee0535f Merge branch 'daynight' into 'master'
Move daynight prompt where it should be

See merge request core-developers/forge!5765
2021-11-09 03:53:28 +00:00
Michael Kamensky
e288b84863 Merge branch 'prowler' into 'master'
VOW: Cemetery Prowler and support

See merge request core-developers/forge!5735
2021-11-09 03:53:04 +00:00
friarsol
bbbf7ec53c Move daynight prompt where it should be 2021-11-08 22:08:34 -05:00
Northmoc
6193445df1 winged_portent.txt 2021-11-08 22:02:29 -05:00
Northmoc
44d340ce5d cartographers_survey.txt 2021-11-08 22:02:20 -05:00
Northmoc
6188b215e4 fleeting_spirit.txt (Svaldan) 2021-11-08 20:36:14 -05:00
Northmoc
c1a42f30b9 katilda_dawnhart_martyr_katildas_rising_dawn.txt (Svaldan) 2021-11-08 20:36:00 -05:00
Northmoc
851fd355a3 restless_bloodseeker_bloodsoaked_reveler.txt (Svaldan) 2021-11-08 20:33:16 -05:00
Northmoc
681ecbd23f add space for Presence/MayFlash 2021-11-08 20:08:38 -05:00
Northmoc
00ee1781c2 ballista_watcher_ballista_wielder.txt (Svaldan) 2021-11-08 19:54:11 -05:00
Northmoc
68b04936d6 wash_away.txt 2021-11-08 19:52:37 -05:00
Northmoc
9ad5d7f233 oakshade_stalker_moonlit_ambusher.txt 2021-11-08 19:48:36 -05:00
Northmoc
43374a3bc2 lambholt_raconteur_lambholt_ravager.txt 2021-11-08 19:46:30 -05:00
Northmoc
7a1d2a2ce7 bloodcrazed_socialite.txt (Svaldan) 2021-11-08 19:45:42 -05:00
Northmoc
e203cca97e infestation_expert_infested_werewolf.txt 2021-11-08 19:44:59 -05:00
Grimm
bcb7bd9a98 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2021-11-09 00:50:42 +01:00
Grimm
eba6430713 Fixed major tread bug in adventure matches
Changed save file structure for adventure
Changed startup for the main adventure class to support more standard feature
fixed some configuration in the adventure files
2021-11-08 23:26:03 +01:00
Bug Hunter
d03743b8c5 Merge branch 'fix' into 'master'
welkin_hawk.txt various fixes

See merge request core-developers/forge!5761
2021-11-08 19:21:46 +00:00
Tim Mocny
79b1a5e831 welkin_hawk.txt various fixes 2021-11-08 19:21:45 +00:00
Michael Kamensky
b67942cbdf Merge branch 'hullbreaker' into 'master'
VOW: Hullbreaker Horror and keyword refactor

See merge request core-developers/forge!5743
2021-11-08 19:10:41 +00:00
Northmoc
7b2e0afdcb wretched_throng.txt remove unneeded 2021-11-08 14:10:00 -05:00
tool4EvEr
c19ef9d1a1 Cleanup cards: use cost instead of remembering 2021-11-08 19:22:45 +01:00
Michael Kamensky
c681f407b3 Merge branch 'curse_of_hos' into 'master'
VOW: Curse of Hospitality

See merge request core-developers/forge!5731
2021-11-08 17:57:16 +00:00
Northmoc
d656b39f06 CardProperty: implement generic "attacking DefinedGameEntity" 2021-11-08 12:42:06 -05:00
Northmoc
1329b52b3c curse_of_hospitality.txt 2021-11-08 12:42:04 -05:00
Michael Kamensky
76dc6e1f03 Merge branch 'kaalia' into 'master'
Fix attacking self with Kaalia trigger

See merge request core-developers/forge!5760
2021-11-08 17:31:16 +00:00
Northmoc
26364e5a1b AbilityUtils support "TypesSharedWith" 2021-11-08 12:17:29 -05:00
Northmoc
947b3b06a8 cemetery_prowler.txt 2021-11-08 12:17:28 -05:00
tool4EvEr
f652bd5f29 Fix attacking self with Kaalia trigger 2021-11-08 18:13:37 +01:00
Northmoc
654b7dd113 militia_rallier.txt 2021-11-08 12:13:24 -05:00
Northmoc
c068d60acb heron_of_hope.txt 2021-11-08 12:13:16 -05:00
Northmoc
62be0b004f wretched_throng.txt 2021-11-08 12:11:14 -05:00
Northmoc
284befd9f0 courier_bat.txt (Svaldan) 2021-11-08 10:53:51 -05:00
Northmoc
1adec9457c daybreak_combatants.txt 2021-11-08 10:48:00 -05:00
Northmoc
9faff7a7bd kessig_flamebreather.txt 2021-11-08 10:31:30 -05:00
Northmoc
81ef90055a hungry_ridgewolf.txt 2021-11-08 10:22:28 -05:00
Northmoc
a14616fad4 dawnhart_disciple.txt 2021-11-08 10:06:28 -05:00
Northmoc
7828a9318c flourishing_hunter.txt 2021-11-08 10:05:08 -05:00
Michael Kamensky
fa57889a89 Merge branch 'vow_7' into 'master'
VOW: 7 Nov

See merge request core-developers/forge!5749
2021-11-08 15:01:45 +00:00
Northmoc
916c466303 skulking_killer.txt All -> Random 2021-11-08 09:19:15 -05:00
Northmoc
845b777a89 Card.Other 2021-11-08 08:11:21 -05:00
Northmoc
843f395832 faithbound_judge_sinners_judgment.txt AI hint 2021-11-08 08:09:18 -05:00
Michael Kamensky
afff59e29f Merge branch 'editions' into 'master'
VOW, VOC & DBL edition updates

See merge request core-developers/forge!5758
2021-11-08 09:45:51 +00:00
paul_snoops
816bdf1398 VOW, VOC & DBL edition updates 2021-11-08 09:44:38 +00:00
Michael Kamensky
bd4577b859 Merge branch 'prosper' into 'master'
Fix Prosper

See merge request core-developers/forge!5757
2021-11-08 09:42:08 +00:00
Michael Kamensky
a58eacb072 Merge branch 'pay' into 'master'
Fix exileFromMiscZone paying with less than needed

See merge request core-developers/forge!5756
2021-11-08 09:41:27 +00:00