35904 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hanmac	ec87b64d0c	Blazing Torch: CantBlockBy example	2018-02-16 16:51:37 +01:00
Hanmac	27eee4c8fa	Card: show CantBlockBy on affected creature	2018-02-16 16:50:43 +01:00
Hanmac	af32152bcc	CantBlockBy: now done as static ability	2018-02-16 16:49:25 +01:00
Hanmac	e72edb95b5	Manifest: fixed check with worms of the earth	2018-02-16 14:02:34 +01:00
Hanmac	efed143a11	ReplaceMoved: fixed zonetype check	2018-02-16 14:01:07 +01:00
Sol	7ade1b9a52	Merge branch 'multiplayer' into 'master' ... Multiplayer See merge request core-developers/forge!207	2018-02-16 01:07:35 +00:00
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
Jamin W. Collins	84874601a9	Continue but log NullPointerException in getMana ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-02-15 17:08:01 -07:00
Jamin W. Collins	b47d528bf0	ensure that remote client has trackers defined ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-02-15 17:07:14 -07: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
Jamin W. Collins	45a0c54fb8	Define getter for TrackableObject props ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-02-13 18:44:28 -07:00
Jamin W. Collins	e8c9c8b90c	Define getter for ClientGameLobby ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-02-13 18:41:56 -07:00
Jamin W. Collins	367fcad53c	Define getter for GameView ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-02-13 18:38:58 -07:00
Jamin W. Collins	3a6c5b0cd5	Allow arbitrarily setting a Tracker ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-02-13 18:36:19 -07:00
Jamin W. Collins	375adab087	gracefully handle failure to connect to server ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-02-13 18:33:25 -07:00
Jamin W. Collins	fbf0f98c3a	Limit team editing to each player ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-02-13 18:30:58 -07:00
Jamin W. Collins	711342829b	Improve interruption messaging ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-02-13 18:28:47 -07:00
Jamin W. Collins	daf3be6346	Improve reported multiplayer host IP ... The existing IP selection logic was less than optimal on Linux hosts where it would frequently select and report 127.0.0.1 as the IP address to share. The new logic will create a datagram socket, use it to locate an interface with a default route, and further backtrack to the interface's IPv4 address. Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2018-02-13 18:16:10 -07: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