50085 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
swordshine	0493104beb	Merge branch 'master' into 'master' ... update translations See merge request core-developers/forge!4591	2021-04-24 03:02:56 +00:00
CCTV-1	9786d9f927	update cmc translation,add missing translation.	2021-04-24 10:39:37 +08:00
CCTV-1	73e5254e2b	add missing string	2021-04-24 10:38:51 +08:00
tool4EvEr	7c934d29ac	always remove counter	2021-04-23 23:41:24 +02:00
tool4EvEr	bccbf3e55e	Add more logic	2021-04-23 23:04:05 +02:00
tool4EvEr	8196ee531a	AI: basic support playing MDFC lands	2021-04-23 22:43:14 +02:00
tool4EvEr	39729cb3da	placer is target	2021-04-23 22:00:40 +02:00
tool4EvEr	cdc1f6014e	also filter simultaneousStackEntryList	2021-04-23 21:25:58 +02:00
Michael Kamensky	aadfdac4c5	Merge branch 'Williams-master-patch-36117' into 'master' ... SLD Dr Lair Secretorium Super Drop See merge request core-developers/forge!4583	2021-04-23 19:17:23 +00:00
John	2e358116c2	Update Secret Lair Drop Series.txt	2021-04-23 14:50:59 +00:00
swordshine	71d88523b2	Merge branch 'update_japanese_localization_mana_value' into 'master' ... Update Mana Value in Japanese Localization See merge request core-developers/forge!4582	2021-04-23 10:12:14 +00:00
swordshine	65e702aed7	Merge branch 'patch' into 'master' ... More cleanup See merge request core-developers/forge!4585	2021-04-23 10:07:58 +00:00
sowrdshine	99bb45d96a	More cleanup	2021-04-23 18:07:04 +08:00
swordshine	4f41be641a	Merge branch 'patch' into 'master' ... Fixed Leyline Invocation See merge request core-developers/forge!4584	2021-04-23 09:18:45 +00:00
sowrdshine	5ab030242b	Fixed Leyline Invocation	2021-04-23 17:17:34 +08:00
John	736d9bbd98	Update Secret Lair Drop Series.txt	2021-04-23 08:23:48 +00:00
Lyu Zong-Hong	6295ebdb09	Update Mana Value in Japanese Localization	2021-04-23 13:35:44 +09:00
Michael Kamensky	380a27b83d	Merge branch 'update_in_game_text' into 'master' ... Update in-game text and also English and Japanese localization (CMC -> mana value and etc.) See merge request core-developers/forge!4581	2021-04-23 04:30:06 +00:00
Michael Kamensky	691af037a4	Merge branch 'phoenix' into 'master' ... Retriever Phoenix: Fix check See merge request core-developers/forge!4577	2021-04-23 04:29:03 +00:00
Michael Kamensky	70cb78a67d	Merge branch 'scrollmenu' into 'master' ... Support scrolling when abilities Popup has too many entries See merge request core-developers/forge!4567	2021-04-23 04:28:50 +00:00
Michael Kamensky	4bd5fe0178	Merge branch 'changetargetsai' into 'master' ... ChangeTargetsAI: Improve decision making See merge request core-developers/forge!4569	2021-04-23 04:27:57 +00:00
Michael Kamensky	babd80edd9	Merge branch 'update_oracle_stx' into 'master' ... Update Oracle after STX release See merge request core-developers/forge!4564	2021-04-23 04:27:30 +00:00
Alumi	74e4efba52	Update Oracle after STX release	2021-04-23 04:27:27 +00:00
Lyu Zong-Hong	2d7e88a8c2	Update in-game text and also English and Japanese localization	2021-04-23 11:01:34 +09:00
Anthony Calosa	d82c8d466a	Merge branch 'master' into 'master' ... update check See merge request core-developers/forge!4580	2021-04-23 01:15:12 +00:00
Sol	9edbbf399f	Merge branch 'esix' into 'master' ... Esix: Script typo See merge request core-developers/forge!4575	2021-04-23 01:13:11 +00:00
Anthony Calosa	345316b9b0	update check	2021-04-23 09:12:02 +08:00
Anthony Calosa	0bb6636613	Merge branch 'master' into 'master' ... [Android] add option to use obb directory as assets directory for Forge See merge request core-developers/forge!4579	2021-04-22 23:14:25 +00:00
Anthony Calosa	1929b75e34	[Android] add option to use obb directory as assets directory for Forge	2021-04-23 06:45:35 +08:00
tool4EvEr	245827825e	Fix check	2021-04-22 20:41:36 +02:00
Bug Hunter	fc9f81c5c9	Merge branch 'fixplaymain1' into 'master' ... Fix PlayMain1 scripts See merge request core-developers/forge!4576	2021-04-22 18:15:13 +00:00
tool4EvEr	987dce2643	Fix PlayMain1 scripts	2021-04-22 20:14:31 +02:00
tool4EvEr	4f2abad39d	Script typo	2021-04-22 20:03:19 +02:00
tool4EvEr	354000082b	Clean up	2021-04-22 18:50:06 +02:00
Michael Kamensky	b8e87604c2	Merge branch 'master' into 'master' ... Achievements for STX and C21 by Marek. See merge request core-developers/forge!4574	2021-04-22 16:36:16 +00:00
Michael Kamensky	49f7ad1281	- Achievements for STX and C21 by Marek.	2021-04-22 19:35:37 +03:00
Michael Kamensky	6731cdcc9d	Merge branch 'twosat-master-patch-53531' into 'master' ... Update de-DE.properties See merge request core-developers/forge!4571	2021-04-22 16:25:21 +00:00
Michael Kamensky	5306510ec1	Merge branch 'nacatl' into 'master' ... Nacatl War-Pride and support See merge request core-developers/forge!4572	2021-04-22 16:25:15 +00:00
Northmoc	e8c0655186	allow precon cards in Planar Conquest	2021-04-22 12:18:42 -04:00
Northmoc	18d0bf1c7b	Add support for keyword: CARDNAME must be blocked by exactly one creature if able.	2021-04-22 12:00:18 -04:00
Northmoc	0b9755405e	nacatl_war_pride.txt	2021-04-22 11:58:36 -04:00
Andreas Bendel	8b7a183e63	Update de-DE.properties ... CMC is now Mana Value	2021-04-22 15:20:52 +00:00
Tim Mocny	7a094478f3	Merge branch 'typo' into 'master' ... teachings_of_the_archaics.txt only 3 cards See merge request core-developers/forge!4570	2021-04-22 14:07:47 +00:00
Michael Kamensky	bd063c71f8	Merge branch 'fixNPE' into 'master' ... Rework ceaseToExist See merge request core-developers/forge!4559	2021-04-22 11:25:36 +00:00
Michael Kamensky	693ef6c4d3	Merge branch 'countersMove' into 'master' ... CountersMoveAI: Improve logic for Ozolith See merge request core-developers/forge!4568	2021-04-22 05:03:54 +00:00
tool4EvEr	60a02cd2a5	Improve decision making for multiplayer	2021-04-22 00:08:19 +02:00
tool4EvEr	e25c7dac4a	Improve logic for Ozolith	2021-04-21 22:32:37 +02:00
tool4EvEr	d918cade67	Hold triggers until all cards are processed	2021-04-21 21:07:47 +02:00
tool4EvEr	982400b74d	Clean up	2021-04-21 20:50:13 +02:00
tool4EvEr	c00a384591	Add MouseWheel support	2021-04-21 19:55:14 +02:00