Commit Graph

54905 Commits

Author SHA1 Message Date
tool4EvEr
35162c0c55 RestartGameEffect: fix Mindslaver activation carrying over 2021-12-06 20:46:35 +01:00
Northmoc
ff10e33d3e patient_zero.txt and support 2021-12-06 13:11:35 -05:00
Michael Kamensky
12df06eac1 Merge branch 'twosat-master-patch-90873' into 'master'
Update de-DE.properties

See merge request core-developers/forge!5911
2021-12-06 13:50:00 +00:00
Andreas Bendel
e20c457c96 Update de-DE.properties
corrected btnNextGame
2021-12-06 08:30:43 +00:00
Michael Kamensky
f9289ab566 Merge branch 'ActivationFirstCombat$_True' into 'master'
ActivationFirstCombat$

See merge request core-developers/forge!5910
2021-12-06 04:22:01 +00:00
tool4EvEr
9878cc91bf Clean up 2021-12-05 22:17:23 +01:00
tool4EvEr
21ea36de4e Improve discard check 2021-12-05 21:50:01 +01:00
tool4EvEr
59c6134586 Improve StackDescription 2021-12-05 20:54:29 +01:00
tool4EvEr
9aea6eb6f1 Update cards 2021-12-05 20:44:27 +01:00
tool4EvEr
acf57d1032 ActivationFirstCombat 2021-12-05 20:32:46 +01:00
tool4EvEr
26edab4373 Fix crash with Master Warcraft 2021-12-05 20:02:11 +01:00
Hans Mackowiak
1c9d4a5614 Merge branch 'zones' into 'master'
LoseMana: fix zones

See merge request core-developers/forge!5909
2021-12-05 12:05:13 +00:00
tool4EvEr
b441d1502f LoseMana: fix zones 2021-12-05 12:29:21 +01:00
Michael Kamensky
afc2ed7b9e Merge branch 'allCreatureTypes' into 'master'
CardType: All Creature Types except something

Closes #2026

See merge request core-developers/forge!5907
2021-12-05 03:44:16 +00:00
Hans Mackowiak
a2cfe96a10 CardType: All Creature Types except something 2021-12-05 03:44:14 +00:00
Bug Hunter
02f74675e9 Merge branch 'teferi' into 'master'
Fix Teferi's Protection

See merge request core-developers/forge!5908
2021-12-04 22:40:20 +00:00
tool4EvEr
3e0a9438ae Fix Teferi's Protection 2021-12-04 23:39:11 +01:00
Michael Kamensky
6439cdebc8 Merge branch 'hidden' into 'master'
Fix some hidden information leak

See merge request core-developers/forge!5906
2021-12-04 17:31:38 +00:00
tool4EvEr
544747cda2 Fix predictThreatenedObjects (using Regenerate against Curse) 2021-12-04 15:30:36 +01:00
tool4EvEr
d8afbca7fe Improve for Foretell 2021-12-04 15:02:13 +01:00
tool4EvEr
96e42c0f1b Fix some hidden information leak 2021-12-04 13:16:30 +01:00
Anthony Calosa
fe0f7368b5 Merge branch 'master' into 'master'
[Mobile] Fix crash

See merge request core-developers/forge!5905
2021-12-02 16:06:47 +00:00
Anthony Calosa
de12d3abd4 [Mobile] Fix crash 2021-12-03 00:04:21 +08:00
Michael Kamensky
bdb5eab0c8 Merge branch 'duel' into 'master'
Duelist's Heritage: fix AI not confirming trigger

See merge request core-developers/forge!5904
2021-12-02 04:15:09 +00:00
tool4EvEr
e005a8c82e Duelist's Heritage: fix AI not confirming trigger 2021-12-01 22:42:10 +01:00
tool4EvEr
0f7d0148e9 Clean up 2021-12-01 22:22:46 +01:00
Michael Kamensky
1711517530 Merge branch 'simai' into 'master'
SimAI: add basic mana X support

See merge request core-developers/forge!5903
2021-12-01 03:01:21 +00:00
TRT
d857694d7c Fix infinite looping with two Basalt Monolith 2021-11-30 17:41:37 +01:00
TRT
0055ba1c38 Remove obsolete param 2021-11-30 15:52:51 +01:00
TRT
32be6ce9a8 Clean up 2021-11-30 15:33:48 +01:00
TRT
f2776fc9fd SimAI: add basic mana X support 2021-11-30 14:23:53 +01:00
Michael Kamensky
8b8ad801a8 Merge branch 'austeregrim-master-patch-59096' into 'master'
Update forge-gui/res/quest/booster-prices.txt

See merge request core-developers/forge!5898
2021-11-30 12:55:03 +00:00
Michael Kamensky
ffffd6f585 Merge branch 'train' into 'master'
Training doesn't check condition on resolve

See merge request core-developers/forge!5900
2021-11-30 10:49:18 +00:00
Michael Kamensky
ecb5d737d4 Merge branch 'unf_artists' into 'master'
UNF edition artists

See merge request core-developers/forge!5902
2021-11-30 10:48:44 +00:00
Michael Kamensky
4b78274c18 Merge branch 'activateForCost' into 'master'
Improve activateForCost

See merge request core-developers/forge!5901
2021-11-30 10:48:04 +00:00
paul_snoops
0f8ad00728 UNF edition artists 2021-11-30 09:39:41 +00:00
TRT
95e62035aa Improve activateForCost 2021-11-30 10:35:44 +01:00
TRT
e985faec1c Training doesn't check condition on resolve 2021-11-30 10:11:56 +01:00
Michael Kamensky
e54355a151 Merge branch 'master' into 'master'
Fix AI activating ChangeZone with ChangeType when the change list is empty

See merge request core-developers/forge!5899
2021-11-30 06:39:29 +00:00
Michael Kamensky
d251100f63 - Fix AI activating ChangeZoneAi when the list for ChangeType is empty. 2021-11-30 09:37:12 +03:00
Michael Kamensky
325aaa40c2 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-11-30 09:30:54 +03:00
Michael Kamensky
74b503043c Merge branch 'johnwilliams7-master-patch-81403' into 'master'
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!5896
2021-11-30 04:50:21 +00:00
Michael Kamensky
dd1e7196a8 Merge branch 'plist_unf' into 'master'
PLIST update and UNF edition file

See merge request core-developers/forge!5897
2021-11-30 04:49:47 +00:00
Austere Grim
5790991543 Update forge-gui/res/quest/booster-prices.txt 2021-11-30 04:15:00 +00:00
Austere Grim
ac84d8732e Update forge-gui/res/quest/booster-prices.txt 2021-11-30 04:04:39 +00:00
Austere Grim
319ace8d63 Update forge-gui/res/quest/booster-prices.txt 2021-11-30 02:00:57 +00:00
Austere Grim
3c56d98fa3 Update forge-gui/res/quest/booster-prices.txt 2021-11-30 01:57:53 +00:00
paul_snoops
3ce6d1a8fd PLIST update and UNF edition file 2021-11-29 18:14:37 +00:00
John Williams
02263cdf91 Update Secret Lair Drop Series.txt 2021-11-29 14:06:34 +00:00
Michael Kamensky
de07e00045 Merge branch 'recon' into 'master'
Support Reconnaissance in SimMode

See merge request core-developers/forge!5895
2021-11-29 12:48:39 +00:00