Commit Graph

54359 Commits

Author SHA1 Message Date
Bug Hunter
94f73d0812 Merge branch 'hx-master-patch-27087' into 'master'
fixed cost for Apprentice Sharpshooter and Dreadlight Monstrosity

See merge request core-developers/forge!5806
2021-11-12 12:42:07 +00:00
hx hyper
cff23a9f42 fixed cost for Apprentice Sharpshooter and Dreadlight Monstrosity 2021-11-12 12:42:07 +00:00
Michael Kamensky
d8bcee5f0b Merge branch 'TRT-master-patch-94392' into 'master'
Update forge-gui/res/cardsfolder/upcoming/millicent_restless_revenant.txt

See merge request core-developers/forge!5804
2021-11-12 08:59:18 +00:00
Bug Hunter
748a8f2c42 Update forge-gui/res/cardsfolder/upcoming/millicent_restless_revenant.txt 2021-11-12 08:54:58 +00:00
Michael Kamensky
01333ff67e Merge branch 'voc_11' into 'master'
VOC: 11 Nov

See merge request core-developers/forge!5802
2021-11-12 05:54:24 +00:00
Michael Kamensky
0840dc30a2 Merge branch 'fix' into 'master'
various minor fixes

See merge request core-developers/forge!5803
2021-11-12 05:51:14 +00:00
Northmoc
0bbaef9a32 honored_heirloom.txt add ManaCost 2021-11-11 22:49:47 -05:00
Northmoc
9b967f7092 courier_bat.txt fix Oracle 2021-11-11 22:49:33 -05:00
Michael Kamensky
7fbb6a5ff4 Merge branch 'vowdraft' into 'master'
set up VOW draft

See merge request core-developers/forge!5798
2021-11-12 03:46:29 +00:00
Michael Kamensky
4ac5dabbea Merge branch 'triggerzones' into 'master'
Fix bad TriggerZone param

See merge request core-developers/forge!5800
2021-11-12 03:46:08 +00:00
Northmoc
5e61f8029c timothar_baron_of_bats.txt and slight CostExile prompt tweak 2021-11-11 22:45:39 -05:00
Michael Kamensky
bf18ba2cd7 Merge branch 'cem_des' into 'master'
VOW: Cemetery Desecrator (tricky Charm templating)

See merge request core-developers/forge!5750
2021-11-12 03:45:30 +00:00
Northmoc
a28d5e373f umbris_fear_manifest.txt 2021-11-11 22:43:40 -05:00
Northmoc
3f1ff4b064 imperious_mindbreaker.txt add AI hint 2021-11-11 22:39:39 -05:00
Northmoc
4cca378710 priest_of_the_blessed_graf.txt 2021-11-11 22:39:24 -05:00
Northmoc
e1323d0336 imperious_mindbreaker.txt 2021-11-11 21:59:05 -05:00
tool4EvEr
9fb09c1d90 Fix bad TriggerZone param 2021-11-11 23:26:06 +01:00
Northmoc
83fcd6e6cd VOW rankings 2021-11-11 14:12:36 -05:00
Northmoc
ce5acd1845 set up VOW draft 2021-11-11 14:10:59 -05:00
Michael Kamensky
433d9482ba Merge branch 'Svaldan-master-patch-80692' into 'master'
Final VOW cards by Svaldan

See merge request core-developers/forge!5790
2021-11-11 18:20:59 +00:00
Job Spijker
badde0f297 Improved stack description of VOW:Wolf Strike 2021-11-11 18:05:21 +00:00
Michael Kamensky
d6b2711e0a Merge branch 'veil' into 'master'
veil_of_summer.txt tidy Desc and AI

See merge request core-developers/forge!5797
2021-11-11 17:27:41 +00:00
Bug Hunter
6bf24309ba Merge branch 'master' into 'master'
Tweak Dollhouse of Horrors implementation

See merge request core-developers/forge!5796
2021-11-11 16:52:14 +00:00
Michael Kamensky
87147c5c4b Tweak Dollhouse of Horrors implementation 2021-11-11 16:52:14 +00:00
Bug Hunter
50114fc6d0 Merge branch 'odric' into 'master'
VOW: Odric and support

See merge request core-developers/forge!5773
2021-11-11 16:50:39 +00:00
Northmoc
26814de95a veil_of_summer.txt tidy Desc and AI 2021-11-11 11:49:32 -05:00
Michael Kamensky
97683d52ef Merge branch 'deald' into 'master'
VOW: Some DealDamage red commons + support + cleanup

See merge request core-developers/forge!5784
2021-11-11 14:57:13 +00:00
Northmoc
58be4989a2 lacerate_flesh.txt newline 2021-11-11 08:20:20 -05:00
Northmoc
d303eba24e brutal_expulsion.txt picky 2021-11-11 08:12:53 -05:00
Job Spijker
e889a7b1e2 Added newline to g_3_1_boar.txt tokenscript 2021-11-11 07:56:58 +00:00
Job Spijker
2e1d519bc7 Update forge-gui/res/cardsfolder/upcoming/wolf_strike.txt 2021-11-11 07:52:25 +00:00
Job Spijker
e813cff9d7 Update forge-gui/res/cardsfolder/upcoming/rural_recruit.txt 2021-11-11 06:59:56 +00:00
Michael Kamensky
f1895bf33d Merge branch 'master' into 'master'
Improve AI prediction of rampage-like and similar dangerous triggers when reinforcing blockers

See merge request core-developers/forge!5795
2021-11-11 06:06:13 +00:00
Michael Kamensky
fde8691865 - Improve AI prediction of rampage-like and similar dangerous triggers when trying to reinforce blockers 2021-11-11 09:04:03 +03:00
Michael Kamensky
a336fa5774 Merge branch 'master' into 'master'
Try-catch in ItemManager to catch odd NPE flukes in mobile deck editor (as recommended by Kev)

See merge request core-developers/forge!5794
2021-11-11 05:13:27 +00:00
Michael Kamensky
e9b329523e - Try-catch in ItemManager to catch odd flukes in the form of unreproducible NPEs when removing stuff in deck editors (as recommended by Kev). 2021-11-11 08:11:16 +03:00
Michael Kamensky
3b9ab85b7d Merge branch 'master' into 'master'
Make Disturb cards show up in Flashback zone.

See merge request core-developers/forge!5793
2021-11-11 04:26:23 +00:00
Michael Kamensky
4f81eda60d - Make Disturb cards show up in Flashback zone. 2021-11-11 07:24:58 +03:00
Michael Kamensky
a5107664d0 Merge branch 'Svaldan-master-patch-80934' into 'master'
VOW: Nature's Embrace

See merge request core-developers/forge!5786
2021-11-11 04:08:12 +00:00
Michael Kamensky
3a37370531 Merge branch 'Svaldan-master-patch-47401' into 'master'
VOW: Pyre Spawn

See merge request core-developers/forge!5788
2021-11-11 04:07:45 +00:00
Michael Kamensky
fb2bba7d5c Merge branch 'vow_10' into 'master'
VOW: 10 Nov

See merge request core-developers/forge!5792
2021-11-11 04:07:15 +00:00
Michael Kamensky
c951734ee8 Merge branch 'Svaldan-master-patch-86566' into 'master'
VOW: Hookhand Mariner // Riphook Raider

See merge request core-developers/forge!5787
2021-11-11 04:05:38 +00:00
Michael Kamensky
a875040cc2 Merge branch 'master' into 'master'
Net Decks Archive Updates

See merge request core-developers/forge!5791
2021-11-11 04:04:38 +00:00
Michael Kamensky
b08f2187e8 Merge branch 'Svaldan-master-patch-49241' into 'master'
VOW: Voldaren Epicure

See merge request core-developers/forge!5789
2021-11-11 04:04:24 +00:00
Michael Kamensky
96560a9069 Merge branch 'master' into 'master'
Remove debug lines

See merge request core-developers/forge!5783
2021-11-11 04:03:31 +00:00
Michael Kamensky
04e00504e6 Merge branch 'svaldan_scripts' into 'master'
Some VOW scripts by Svaldan

See merge request core-developers/forge!5779
2021-11-11 04:02:59 +00:00
Michael Kamensky
1a19131552 Merge branch 'Svaldan-master-patch-28560' into 'master'
VOW - Lightning Wolf

See merge request core-developers/forge!5782
2021-11-11 04:02:20 +00:00
Northmoc
2e9f610e0f improve old DealDamage ReplaceDying cards 2021-11-10 22:36:31 -05:00
Northmoc
a064aca5b9 broaden Log readout for Planeswalker case 2021-11-10 20:04:13 -05:00
Northmoc
860983cc4c flame_blessed_bolt.txt 2021-11-10 20:04:13 -05:00