Commit Graph

55094 Commits

Author SHA1 Message Date
Northmoc
49391b16f9 edgar_charmed_groom_edgar_markovs_coffin.txt and token and counter 2021-11-09 15:46:21 -05:00
Northmoc
c4d598168b brides_gown.txt (Svaldan) 2021-11-09 15:42:00 -05:00
Northmoc
ced9459148 gryffwing_cavalry.txt (Svaldan) 2021-11-09 15:16:36 -05:00
Northmoc
88f4c6f0b7 cemetery_illuminator.txt 2021-11-09 14:52:24 -05:00
Northmoc
bd883a2af5 jacob_hauken_inspector_haukens_insight.txt 2021-11-09 14:07:03 -05:00
Northmoc
77eaa9a00b cemetery_gatekeeper.txt 2021-11-09 14:00:50 -05:00
Northmoc
8103811711 olivias_attendants.txt 2021-11-09 13:43:59 -05:00
Northmoc
0afe08c368 crawling_infestation.txt 2021-11-09 13:35:58 -05:00
Northmoc
1d44e56ad9 avabruck_caretaker_hollowhenge_huntmaster.txt (Suthro) 2021-11-09 11:55:36 -05:00
Northmoc
2c10ff875d catapult_fodder_catapult_captain.txt (Svaldan) 2021-11-09 11:52:56 -05:00
Northmoc
14b0e68586 creepy_puppeteer.txt 2021-11-09 10:55:55 -05:00
Northmoc
0e60087f27 cobbled_lancer.txt 2021-11-09 10:53:57 -05:00
Michael Kamensky
7320bc88d0 Merge branch 'vow_8' into 'master'
VOW: 8 Nov

See merge request core-developers/forge!5759
2021-11-09 15:25:56 +00:00
Michael Kamensky
326ca7026f Merge branch 'thirst' into 'master'
VOW: Thirst for Discovery and support

See merge request core-developers/forge!5746
2021-11-09 15:25:30 +00:00
Michael Kamensky
68219dbeae Merge branch 'sac' into 'master'
VOW: Stensia Uprising and some streamlining of SacrificeEffect

See merge request core-developers/forge!5744
2021-11-09 15:22:56 +00:00
Northmoc
570c66306e replace curly apost with ' 2021-11-09 09:56:21 -05:00
Northmoc
a96d7c81d3 dawnhart_disciple.txt add BuffedBy 2021-11-09 09:07:21 -05:00
Anthony Calosa
6454fd579d Add "Deck: " string for deck export
- fixes exporting a deck and re importing
2021-11-09 22:04:58 +08:00
Anthony Calosa
40d7b89823 Update minimum Java version for Forge Desktop executable
- forge.exe and forge-adventure.exe needs at least Java 11.0.1
- for Java 8, user should use forge-old.exe for Forge Desktop, and forge-adventure-old.exe for Forge Adventure
2021-11-09 21:46:42 +08:00
Michael Kamensky
4d1ff75c10 Merge branch 'voc' into 'master'
VOC edition update

See merge request core-developers/forge!5768
2021-11-09 12:44:51 +00:00
paul_snoops
d593660d81 VOC edition update 2021-11-09 10:46:30 +00:00
Anthony Calosa
1cea6c7fd2 Merge branch 'master' into 'master'
unused import

See merge request core-developers/forge!5766
2021-11-09 05:43:13 +00:00
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