Commit Graph

48875 Commits

Author SHA1 Message Date
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
Hans Mackowiak
2adffd0002 CardTraitBase: store the CardState where it was generated from 2021-02-26 15:02:19 +00:00
Michael Kamensky
3ec5ee01fd Merge branch 'fixwalls' into 'master'
Fix sacrifice cost with blockedBy target

See merge request core-developers/forge!4014
2021-02-26 15:01:47 +00:00
Bug Hunter
ad218ee1f0 Fix sacrifice cost with blockedBy target 2021-02-26 15:01:46 +00:00
Michael Kamensky
27e1eaa3a1 - Unbreak the "hold out mana sources for Main 2" AI profile option 2021-02-26 18:01:08 +03:00
Hans Mackowiak
d6badf3b1e CardEdition: fix BorderColor 2021-02-26 14:10:35 +01:00
Michael Kamensky
09aed2fed4 Merge branch 'master' into 'master'
Improve the AI determining if to play a permanent in Main 1 if it's played from face down

See merge request core-developers/forge!4018
2021-02-26 11:19:11 +00:00
Michael Kamensky
a64302282a - Improve the AI determining if to play a permanent in Main 1 if it's played from face down 2021-02-26 14:16:57 +03:00
Michael Kamensky
1509d7c888 Merge branch 'netdecksarchive' into 'master'
Net Deck Archive Pioneer (Desktop implementation)

See merge request core-developers/forge!4015
2021-02-26 04:10:54 +00:00
Michael Kamensky
470808bc83 Merge branch 'fixcrash' into 'master'
Fix crash for simultaneous trigger with no description

See merge request core-developers/forge!4013
2021-02-26 04:10:09 +00:00
Michael Kamensky
3d9ae57005 Merge branch 'Williams-master-patch-07567' into 'master'
Stoic Farmer fix

See merge request core-developers/forge!4012
2021-02-26 04:07:26 +00:00
Michael Kamensky
6014e35c19 Merge branch 'border' into 'master'
Unset: border color matters

See merge request core-developers/forge!4016
2021-02-26 04:06:58 +00:00
Sol
2c0e6572f5 Merge branch 'fix-ante-lost' into 'master'
Fix ante

See merge request core-developers/forge!4017
2021-02-26 01:39:27 +00:00
friarsol
0cf4b5a261 Fix ante 2021-02-25 20:38:27 -05:00
Adam Pantel
137e31b724 Unset: border color matters 2021-02-25 17:45:11 -05:00
Churrufli
1014871f46 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2021-02-25 23:34:21 +01:00
Churrufli
97367ed7e6 Net Deck Archive Pioneer (Desktop implementation) 2021-02-25 23:32:57 +01:00
tool4EvEr
c59cd875b8 Fix crash for triggers with no description 2021-02-25 22:12:23 +01:00
John
d82b1f4f61 Update stoic_farmer.txt 2021-02-25 20:58:45 +00:00
Michael Kamensky
28bfe72986 Merge branch 'master' into 'master'
AI getSpellAbilityToPlay: exclude land abilities (land drops) since they are processed elsewhere

See merge request core-developers/forge!4011
2021-02-25 18:29:25 +00:00
Michael Kamensky
7d6d4cd6ba - AI getSpellAbilityToPlay: exclude land abilities (land drops) since they are processed separately. 2021-02-25 21:23:50 +03:00