50488 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Michael Kamensky	b0e1630fc5	Merge branch 'tokens' into 'master' ... update some token lists See merge request core-developers/forge!4566	2021-04-21 17:52:24 +00:00
tool4EvEr	50ffd7b4a9	Support scrolling when Popup has too many entries	2021-04-21 19:37:05 +02:00
Northmoc	e4e75a5f73	update some token lists	2021-04-21 13:18:27 -04:00
Northmoc	7da4381d38	update some token lists	2021-04-21 13:18:27 -04:00
Hans Mackowiak	ef8076b626	GameEntityCounterTable: fix NPE and filterToRemove	2021-04-21 17:35:41 +02:00
Bug Hunter	ab5f5c1ce9	Merge branch 'yarok' into 'master' ... Yarok: Fix staticability check See merge request core-developers/forge!4565	2021-04-21 15:26:05 +00:00
tool4EvEr	6d442b12a0	Yarok: Fix staticability check	2021-04-21 17:25:42 +02:00
Sol	0019f83e33	Merge branch 'breena' into 'master' ... Fix Breena Trigger See merge request core-developers/forge!4560	2021-04-21 14:13:20 +00:00
Hans Mackowiak	f3011b1790	Merge branch 'fixMana' into 'master' ... Fix mana conversion checking wrong card from hand See merge request core-developers/forge!4561	2021-04-21 04:36:17 +00:00
Hans Mackowiak	ea79f84b71	Merge branch 'fixyarok' into 'master' ... Fix Yarok See merge request core-developers/forge!4562	2021-04-21 04:35:53 +00:00
tool4EvEr	040d6929dc	Fix Yarok	2021-04-20 23:15:32 +02:00
tool4EvEr	2fe9c38fff	Fix mana conversion checking wrong card from hand	2021-04-20 20:21:39 +02:00
tool4EvEr	256b54b6b5	Fix Breena Trigger	2021-04-20 19:01:57 +02:00
Michael Kamensky	062ad5d92f	Merge branch 'esix_fractal_bloom' into 'master' ... Add Esix, Fractal Bloom and necessary supports See merge request core-developers/forge!4557	2021-04-20 16:44:22 +00:00
Michael Kamensky	5806ef248f	Merge branch 'ee' into 'master' ... Last STX card! elemental_expressionist.txt See merge request core-developers/forge!4554	2021-04-20 16:44:04 +00:00
Michael Kamensky	257fcf1b3d	Merge branch 'elspeth' into 'master' ... AI: Fix Elspeth Conquers Death See merge request core-developers/forge!4552	2021-04-20 16:43:47 +00:00
tool4EvEr	284db016a0	Rework ceaseToExist	2021-04-20 18:28:01 +02:00
tool4EvEr	5e2898f0ae	Improve Counter check	2021-04-20 17:29:20 +02:00
Northmoc	207408ae20	elemental_expressionist.txt	2021-04-20 08:59:54 -04:00
Bug Hunter	2843ca9b49	Merge branch 'TRT-master-patch-20042' into 'master' ... Update forge-gui/res/cardsfolder/upcoming/detention_vortex.txt See merge request core-developers/forge!4558	2021-04-20 12:05:08 +00:00
Bug Hunter	efc09d8a3f	Update forge-gui/res/cardsfolder/upcoming/detention_vortex.txt	2021-04-20 12:03:43 +00:00