35888 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sol	cc664d1280	Merge branch 'DefaultFiltersOption' into 'master' ... Default filters option See merge request core-developers/forge!175	2018-02-16 01:00:20 +00:00
Seravy	59612c45ea	Resolving conflicts	2018-02-15 10:03:54 +01:00
Seravy	e8be6f674e	Add quest mode option to make Foil and Personal Rating filters default on all editor screens.	2018-02-15 10:01:59 +01:00
Michael Kamensky	2dcf4b23b7	Merge branch 'AIDestroyAllInDanger' into 'master' ... AI will activate ~DestroyAll~ abilities during combat if it would lose the game,… See merge request core-developers/forge!206	2018-02-14 03:48:09 +00:00
Michael Kamensky	22b2f30ffb	Merge branch 'AICoffinQueen' into 'master' ... Will not untap Coffin Queen if already reanimating a creature See merge request core-developers/forge!204	2018-02-14 03:46:50 +00:00
Michael Kamensky	9a7215a2a2	Merge branch 'AINecrologia' into 'master' ... Ai necrologia See merge request core-developers/forge!205	2018-02-14 03:44:30 +00:00
Michael Kamensky	6d4cc6efcb	Merge branch 'bloodyCardTraits' into 'master' ... CardTaits: make cardtraits inside LKI has the same id's as the in the original See merge request core-developers/forge!197	2018-02-14 03:28:25 +00:00
Seravy	ead64864f4	Now it actually works and doesn't break the card. ... Marked card AI playable. Note : This also adds a new function to ComputerUtil,that checks if the AI is in danger of being killed, or if it has a same amount of life remaning - useful for future "pay life" AI decisions.	2018-02-13 18:07:51 +01:00
Seravy	8521387312	AI can play Necrologia	2018-02-13 17:40:03 +01:00
Seravy	03886905bd	Will not untap Coffin Queen if already reanimating a creature	2018-02-13 13:03:44 +01:00
Sol	f01282f12f	Merge branch 'patch-6' into 'master' ... Several updates to formats.txt See merge request core-developers/forge!203	2018-02-13 03:06:11 +00:00
Sol	5e5fca9722	Merge branch 'LifeTotalBonusOption' into 'master' ... Life total bonus option See merge request core-developers/forge!176	2018-02-13 02:57:25 +00:00
Rob Schnautz	fcb7f89001	typo (Trace Secrets > Trade Secrets)	2018-02-13 00:49:25 +00:00
Rob Schnautz	38cebf52c3	missed a couple	2018-02-13 00:48:05 +00:00
Rob Schnautz	04b347b968	we're not ready for block formats	2018-02-13 00:21:21 +00:00
Rob Schnautz	08a87ea112	Add conspiracy and ante cards to ban lists, update Standard, Modern, and Commander. Modern list is officially effective the 19th, all the rest is current. Add block formats. Reorder formats in the same order shown on the website. Move Extended to the end. To do: remove Extended.	2018-02-12 23:56:45 +00:00
Sol	dc11fad342	Merge branch 'QuestDraftRotation' into 'master' ... Quest draft rotation See merge request core-developers/forge!179	2018-02-12 03:06:40 +00:00
Hanmac	3e613a8b80	cards: remove triggerZones from Unequip trigger, it doesn't work with ChangeZoneAll effects	2018-02-11 21:04:49 +01:00
Sol	14fc75be44	Merge branch 'QuestDraftSetFix' into 'master' ... Quest draft set fix See merge request core-developers/forge!174	2018-02-11 15:18:12 +00:00
Sol	a489e0845b	Merge branch 'BonusForWinsOption' into 'master' ... Bonus for wins option See merge request core-developers/forge!173	2018-02-11 15:16:10 +00:00
Michael Kamensky	acf7a23965	Merge branch 'HornedKavuFix' into 'master' ... Fixes Horned Kavu being played incorrectly (returning another Horned Kavu or itself) See merge request core-developers/forge!201	2018-02-11 14:26:20 +00:00
Hanmac	a96a2fd825	Merge branch 'master' of git.cardforge.org:core-developers/forge	2018-02-11 14:53:58 +01:00
Hanmac	d455653f11	Debuff: with keyword changes, directly remove of keywords is not needed anymore, let changed keywords handle that	2018-02-11 14:53:27 +01:00
Seravy	8579ae99a0	Fixes Horned Kavu being played incorrectly (returning another Horned Kavu or itself)	2018-02-11 14:42:41 +01:00
Hanmac	da5cb3d905	check lands: use shorter code for etb replacement	2018-02-11 12:11:04 +01:00
Michael Kamensky	81315e3db4	Merge branch 'assorted-fixes' into 'master' ... - Simplify a target num check in AiController. See merge request core-developers/forge!200	2018-02-11 10:28:08 +00:00
Agetian	8a880a3f89	- Simplify a target num check in AiController.	2018-02-11 13:27:11 +03:00
Michael Kamensky	d5da9a80f6	Merge branch 'assorted-fixes' into 'master' ... - Fixed the AI targeting restrictions check, added an AI logic for The Scarab God. See merge request core-developers/forge!199	2018-02-11 05:09:39 +00:00
Agetian	670966be57	- Fixed the AI targeting restrictions check in AiController to account for the AILogics that can pre-target cards. ... - Added an AI logic for The Scarab God (can be generalized later).	2018-02-11 07:46:38 +03:00
Michael Kamensky	5879690fc0	Merge branch 'upcoming_rix2' into 'master' ... Refresh of Frontier Cube to include RIX See merge request core-developers/forge!194	2018-02-11 03:54:52 +00:00
Michael Kamensky	ebd0a8096c	Merge branch 'error-msg-fixes' into 'master' ... Disambiguate class name in error StorageReader errors See merge request core-developers/forge!196	2018-02-10 18:54:01 +00:00
Michael Kamensky	a1f2f8d944	Merge branch 'svn-to-git' into 'master' ... make development version reference GIT not SVN See merge request core-developers/forge!198	2018-02-10 18:53:39 +00:00
Jamin W. Collins	0a4dc6961d	make development version reference GIT not SVN ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-02-10 11:13:41 -07:00
Hanmac	2e196fc41b	CardTaits: make cardtraits inside LKI has the same id's as the in the original object\nReplaceMoved now works with Blood Moon and Blood Sun	2018-02-10 18:50:22 +01:00
Jamin W. Collins	844a7b5d76	Disambiguate class name in error StorageReader errors ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-02-10 10:28:39 -07:00
Michael Kamensky	ce343ffcdb	Merge branch 'mobile-release' into 'master' ... - Preparing Forge for Android publish v1.6.6.004 [incremental/bugfixes] See merge request core-developers/forge!195	2018-02-10 16:17:12 +00:00
Agetian	25972aaa29	- Preparing Forge for Android publish v1.6.6.004 [incremental/bugfixes]	2018-02-10 19:11:33 +03:00
Seravy	0fe8c1f121	AI will activate ~DestroyAll~ abilities during combat if it would lose the game, or it would take too much damage (Nevinnyrral's Disk, Pernicious Deed)	2018-02-10 13:30:22 +01:00
austinio7116	cb37cf0889	Refresh of Frontier Cube to include RIX	2018-02-10 09:36:49 +00:00
Michael Kamensky	b5721a7e36	Merge branch 'OkkFix' into 'master' ... Had wrong card name in Oracle text See merge request core-developers/forge!192	2018-02-10 03:35:54 +00:00
Michael Kamensky	93b40ad867	Merge branch 'descriptions' into 'master' ... Descriptions See merge request core-developers/forge!193	2018-02-10 03:35:40 +00:00
Rob Schnautz	a3e5e40385	description, premium Spearbreaker Behemoth	2018-02-10 01:17:19 +00:00
Rob Schnautz	e13ed6f46e	description, premium Paleoloth	2018-02-10 01:15:18 +00:00
Rob Schnautz	65dffbbe3a	description	2018-02-10 01:12:15 +00:00
Rob Schnautz	16dafc9c57	description ... (cherry picked from commit 909ee41e066207a9c3e4d943fd190e229765be66)	2018-02-10 01:06:35 +00:00
Rob Schnautz	bcd2f95e4d	description ... (cherry picked from commit f274dbe74e3fcda7e97c40df996b8b1533c04673)	2018-02-10 01:06:16 +00:00
Rob Schnautz	51ae7fee7e	description	2018-02-10 00:55:19 +00:00
Rob Schnautz	2eb276f995	description, premium Treasury Thrull	2018-02-10 00:51:03 +00:00
Rob Schnautz	6a98f9947a	description	2018-02-10 00:48:28 +00:00
Rob Schnautz	66cbd1a30e	description	2018-02-10 00:45:17 +00:00