Commit Graph

50395 Commits

Author SHA1 Message Date
Michael Kamensky
9e3f7a72e2 Merge branch 'master' into 'master'
Update some Default AI profile preferences

See merge request core-developers/forge!4043
2021-02-28 04:48:25 +00:00
Michael Kamensky
0701bb0097 - Update some Default AI profile preferences. 2021-02-28 07:47:38 +03:00
Michael Kamensky
08351c2e4b Merge branch 'master' into 'master'
Fix dev features "Remove...", "Exile..."

Closes #1746

See merge request core-developers/forge!4042
2021-02-28 04:41:39 +00:00
Michael Kamensky
50425bf68e - Rewrite Dev features to use getGui().many correctly.
- Revert the ListChooser thing for now.
2021-02-28 07:40:21 +03:00
Michael Kamensky
dc26f99309 - Fix ListChooser to accept -1 as a valid max choice number (used e.g. by Dev Mode) 2021-02-28 07:29:31 +03:00
Michael Kamensky
68bbfabc56 Merge branch 'fixMana' into 'master'
Fix mana restriction check for subabilities

Closes #1743

See merge request core-developers/forge!4041
2021-02-28 03:53:31 +00:00
tool4EvEr
4226cd21d2 Fix mana restriction check for subabilities 2021-02-27 21:00:36 +01:00
Michael Kamensky
08bd2df74f Merge branch 'master' into 'master'
Better way to simulate counters in Crawling Barrens logic

See merge request core-developers/forge!4040
2021-02-27 17:35:52 +00:00
Michael Kamensky
3c4f797234 - Better way to simulate counters in Crawling Barrens logic 2021-02-27 20:35:14 +03:00
Michael Kamensky
89547fc247 Merge branch 'master' into 'master'
Added AI logic for Crawling Barrens

See merge request core-developers/forge!4039
2021-02-27 17:22:41 +00:00
Michael Kamensky
cbb96e1878 - Tweak the logic a little. 2021-02-27 20:22:13 +03:00
Michael Kamensky
876457047e - Added logic for Crawling Barrens
- Minor fix in ChooseGenericEffectAi
2021-02-27 20:13:52 +03:00
Michael Kamensky
b50f30d27e Merge branch 'updateES' into 'master'
Update es-ES.properties and possesive translation

See merge request core-developers/forge!4038
2021-02-27 15:13:37 +00:00
klaxnek
eef0d6eac2 Removed done TODO from es-ES.properties 2021-02-27 16:08:10 +01:00
klaxnek
d287e81d5e Update es-ES.properties and possesive translation 2021-02-27 16:05:37 +01:00
Hans Mackowiak
aeb868d427 InputSelectTargets: fix use of isWithSameCardType for GUI 2021-02-27 15:31:35 +01:00
Michael Kamensky
85bd48ddfb Merge branch '1742-morph-not-checking-restriction-before-turning-face-up' into 'master'
Resolve "Morph not checking restriction before turning face up"

Closes #1742

See merge request core-developers/forge!4037
2021-02-27 10:57:20 +00:00
Hans Mackowiak
2280d02617 SpellAbilityRestriction: If the permanent wouldn’t have a morph cost if it were face up, it can’t be turned face up this way. 2021-02-27 11:53:35 +01:00
Hans Mackowiak
7e9ea10bb0 AbstractGuiGame: have many call choices when max is <= 1 2021-02-27 10:57:29 +01:00
Hans Mackowiak
3b1096410d fix trigger desc elder_gargaroth 2021-02-27 10:56:12 +01:00
Hans Mackowiak
d2f55c7d6f fix Trickster-God's Heist 2021-02-27 09:54:48 +01:00
Michael Kamensky
f10401c9b6 Merge branch 'master' into 'master'
Minor ChangeZoneAi tweak

See merge request core-developers/forge!4035
2021-02-27 07:22:41 +00:00
Michael Kamensky
2f72b3de0f - Unneeded code since we're already in the "own stuff" branch 2021-02-27 10:22:04 +03:00
Michael Kamensky
aa474a7e88 Merge branch 'master' into 'master'
Further tweak ChangeZoneAi

See merge request core-developers/forge!4034
2021-02-27 07:15:12 +00:00
Michael Kamensky
ffb7b6984d - Further tweak ChangeZoneAi 2021-02-27 10:14:37 +03:00
Michael Kamensky
f02e16e392 Merge branch 'master' into 'master'
Improve ChangeZoneAI for exiling any number of stuff from the battlefield

See merge request core-developers/forge!4033
2021-02-27 07:11:46 +00:00
Michael Kamensky
2081e9d23a - A little tweak to the ChangeZoneAi exile any number logic 2021-02-27 10:11:20 +03:00
Michael Kamensky
22139e2c25 - Further improve the ChangeZoneAi exile any number logic 2021-02-27 10:09:48 +03:00
Michael Kamensky
0c84a957b2 - Improve ChangeZoneAi for exiling any number of stuff from the battlefield 2021-02-27 10:05:56 +03:00
Michael Kamensky
e2d8247600 - Update ANNOUNCEMENTS.txt 2021-02-27 08:16:24 +03:00
Michael Kamensky
ce9e1417e6 Merge branch 'master' into 'master'
Fix the AI cheating with Propaganda effect payment

See merge request core-developers/forge!4032
2021-02-27 04:54:10 +00:00
Michael Kamensky
07772ec687 - Fix the AI cheating with Propaganda effect payment
- Update ANNOUNCEMENTS.txt
- Fix the Throne of Death cost description
2021-02-27 07:53:14 +03:00
Michael Kamensky
aeb8a8cd05 Merge branch 'update_oracle' into 'master'
Update oracle texts from scryfall bulk data

See merge request core-developers/forge!4023
2021-02-27 03:50:59 +00:00
Anthony Calosa
dcfb997196 Merge branch 'master' into 'master'
Try to fix Desktop card update.

Closes #1715 and #1740

See merge request core-developers/forge!4030
2021-02-27 03:36:36 +00:00
Anthony Calosa
2c8a658270 Try to fix Desktop card update.
Closes #1740
2021-02-27 09:34:05 +08:00
Hans Mackowiak
e02805e49d Merge branch 'clonecrash' into 'master'
CloneStates: fix crash when adding trigger with subs

See merge request core-developers/forge!4027
2021-02-26 20:00:46 +00:00
Michael Kamensky
96723983c9 Merge branch 'compressKW' into 'master'
Card text: only print reminder text once for some basic keywords

See merge request core-developers/forge!4024
2021-02-26 19:42:42 +00:00
Michael Kamensky
8737cb4af1 Merge branch 'twosat-master-patch-75444' into 'master'
Update de-DE.properties

See merge request core-developers/forge!4026
2021-02-26 19:42:39 +00:00
tool4EvEr
676a0b9b43 CloneStates: fix crash when adding trigger with subs 2021-02-26 20:07:37 +01:00
Andreas Bendel
0c747060bd Update de-DE.properties
added lblNetArchivePioneerDecks
2021-02-26 18:36:50 +00:00
Michael Kamensky
d95fad230c Merge branch 'border' into 'master'
Fix border color rendering

See merge request core-developers/forge!4025
2021-02-26 17:40:03 +00:00
Hans Mackowiak
87e6974f3f fix broken fix 2021-02-26 18:39:14 +01:00
Adam Pantel
06d651e077 Fix border color rendering 2021-02-26 12:33:36 -05:00
Lyu Zong-Hong
1db86edc90 Update oracle texts from scryfall bulk data 2021-02-27 02:23:01 +09:00
tool4EvEr
7bb267818a Card text: only print reminder text once for some basic keywords 2021-02-26 18:17:44 +01:00
Hans Mackowiak
a84af140f2 fix imports 2021-02-26 18:00:57 +01:00
Michael Kamensky
2dd14e7271 Merge branch 'master' into 'master'
Unbreak the advanced Flash logic

See merge request core-developers/forge!4021
2021-02-26 16:20:31 +00:00
Michael Kamensky
48042a1ce3 - Unbreak the advanced Flash logic 2021-02-26 19:19:35 +03:00
Michael Kamensky
473620495a Merge branch 'master' into 'master'
Unbreak the "hold out mana sources for Main 2" AI profile option

See merge request core-developers/forge!4020
2021-02-26 15:03:00 +00:00
Michael Kamensky
cebce36055 Merge branch 'svarsOriginalCardState' into 'master'
CardTraitBase: store the CardState where it was generated from

Closes #1738

See merge request core-developers/forge!4019
2021-02-26 15:02:19 +00:00