54905 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
TRT	4056aef00e	Improve targeting	2021-11-29 11:19:54 +01:00
TRT	7cd56250cd	Support Reconnaissance in SimMode	2021-11-29 10:13:16 +01:00
Michael Kamensky	465cf5edcb	Merge branch 'simulation' into 'master' ... Simulation fixes! See merge request core-developers/forge!5890	2021-11-29 03:56:52 +00:00
Michael Kamensky	88f70d77f9	Merge branch 'cantGainLifeStatic' into 'master' ... Player: Static for CantGainLife See merge request core-developers/forge!5893	2021-11-29 03:55:13 +00:00
Michael Kamensky	2bf1059e0e	Merge branch 'manaPoolStatic' into 'master' ... Manapool: remove use of player keywords, use static and replacement effect See merge request core-developers/forge!5894	2021-11-29 03:54:59 +00:00
Michael Kamensky	ee62efff29	Merge branch 'master' into 'master' ... update simplified chinese translation See merge request core-developers/forge!5892	2021-11-29 03:54:08 +00:00
Michael Kamensky	01a386d403	Merge branch 'ramp' into 'master' ... ManaEffectAi: Allow ramping with stuff like Upwelling See merge request core-developers/forge!5891	2021-11-29 03:54:04 +00:00
tool4EvEr	abdcd23025	Small changes to evaluation order for performance	2021-11-28 22:17:45 +01:00
tool4EvEr	4722621b53	Exert improvement	2021-11-28 21:07:14 +01:00
Hans Mackowiak	a62491adf2	Manapool: remove use of player keywords, use static and replacement effect	2021-11-28 20:25:46 +01:00
Hans Mackowiak	f1201a7e68	Player: Static for CantGainLife	2021-11-28 20:20:50 +01:00
tool4EvEr	a58794631b	Simulation AI considerations	2021-11-28 19:16:15 +01:00
tool4EvEr	fe22177137	Fix NPE	2021-11-28 17:00:05 +01:00
tool4EvEr	ee0024e636	fix another bad diff	2021-11-28 16:06:33 +01:00
tool4EvEr	7ba49a44de	Fix Echo	2021-11-28 12:40:38 +01:00
CCTV-1	616297c14c	translate new setting.	2021-11-28 19:18:48 +08:00
tool4EvEr	2d910bb135	Allow ramping with stuff like Upwelling	2021-11-28 12:05:16 +01:00
tool4EvEr	9a3429e5cd	Keyword fix	2021-11-28 12:03:40 +01:00
tool4EvEr	e0af8a4d7d	Clean up	2021-11-28 10:21:33 +01:00
tool4EvEr	2a00a4aa6a	Fix adventure remembering SA	2021-11-27 22:30:53 +01:00
tool4EvEr	29a8f9374a	Simulation AI needs to be predictable	2021-11-27 22:29:22 +01:00
tool4EvEr	595cd10451	Fix crash from combat triggers when planning ahead of current phase	2021-11-27 22:28:39 +01:00
Michael Kamensky	1b59d25046	Merge branch 'master' into 'master' ... Net Decks Archive Updates See merge request core-developers/forge!5888	2021-11-27 10:08:41 +00:00
Michael Kamensky	b322b338e0	Merge branch 'TRT-master-patch-77524' into 'master' ... Update forge-gui/res/cardsfolder/g/gallia_of_the_endless_dance.txt See merge request core-developers/forge!5889	2021-11-27 10:08:28 +00:00
Bug Hunter	c5a1e230f2	Update forge-gui/res/cardsfolder/g/gallia_of_the_endless_dance.txt	2021-11-27 08:24:39 +00:00
Churrufli	753fd27ff6	Net Decks Archive Updates	2021-11-27 08:45:47 +01:00
Anthony Calosa	60d7c364ac	Merge branch 'master' into 'master' ... [Mobile] Fix portrait layout for variant selection See merge request core-developers/forge!5887	2021-11-27 04:12:19 +00:00
Anthony Calosa	85393862e1	[Mobile] Fix portrait layout for variant selection	2021-11-27 12:10:54 +08:00
Michael Kamensky	0c9737ed23	Merge branch 'master' into 'master' ... [Mobile] Add "Match: Number" Selection See merge request core-developers/forge!5886	2021-11-27 03:58:19 +00:00
Anthony Calosa	0145bb9470	[Mobile] Add "Match: Number" Selection	2021-11-27 11:20:20 +08:00
Michael Kamensky	c247d607a6	Merge branch 'charming' into 'master' ... CharmEffect - fix choosing illegal mode See merge request core-developers/forge!5885	2021-11-26 19:40:40 +00:00
TRT	2d871db8ea	Fix Orcus	2021-11-26 17:44:18 +01:00
TRT	82ce5daf05	CharmEffect: fix choosing illegal mode	2021-11-26 16:52:00 +01:00
Michael Kamensky	259b09055a	Merge branch 'twosat-master-patch-82343' into 'master' ... Update de-DE.properties See merge request core-developers/forge!5883	2021-11-26 13:40:43 +00:00
Bug Hunter	f415491a00	Merge branch 'TRT-master-patch-10053' into 'master' ... Update forge-gui/res/cardsfolder/d/dreamshackle_geist.txt See merge request core-developers/forge!5884	2021-11-26 09:01:07 +00:00
Bug Hunter	a3dfca7775	Update forge-gui/res/cardsfolder/d/dreamshackle_geist.txt	2021-11-26 09:00:16 +00:00
Andreas Bendel	90d6b6e9a6	Update de-DE.properties ... translated lblGamesInMatch	2021-11-26 07:32:08 +00:00
Michael Kamensky	8488992e23	Merge remote-tracking branch 'origin/master' into agetian-master	2021-11-26 07:41:49 +03:00
Michael Kamensky	e8ad048377	Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master	2021-11-26 07:41:37 +03:00
Michael Kamensky	92bc343370	Merge branch 'CantBeActivated' into 'master' ... Refactor CantBeActivated See merge request core-developers/forge!5879	2021-11-26 04:14:23 +00:00
Michael Kamensky	98ee832672	Merge branch 'aifix' into 'master' ... AI: Fix Goblin Artisans See merge request core-developers/forge!5882	2021-11-26 04:14:14 +00:00
tool4EvEr	4de65435c7	AI: Fix Goblin Artisans	2021-11-25 23:05:17 +01:00
Michael Kamensky	67072c96cd	Merge branch 'bo1' into 'master' ... Add "best of 1 (or 5)" option to Constructed See merge request core-developers/forge!5871	2021-11-25 18:18:48 +00:00
Michael Kamensky	9c2cf62312	Merge branch 'TRT-master-patch-92757' into 'master' ... Update forge-gui/res/cardsfolder/s/spinal_parasite.txt See merge request core-developers/forge!5880	2021-11-25 18:18:25 +00:00
Bug Hunter	8a54ffca2e	Merge branch 'imports' into 'master' ... Fix imports See merge request core-developers/forge!5881	2021-11-25 16:01:31 +00:00
TRT	e6e97f5c44	Fix imports	2021-11-25 16:59:59 +01:00
Bug Hunter	a3bbb506d8	Update forge-gui/res/cardsfolder/s/spinal_parasite.txt	2021-11-25 15:43:19 +00:00
TRT	8c755e71c1	Refactor CantBeActivated	2021-11-25 16:23:33 +01:00
Michael Kamensky	814ea061ee	Merge branch 'moraug' into 'master' ... Moraug: improve AI See merge request core-developers/forge!5878	2021-11-25 12:14:25 +00:00
TRT	4411d0775d	Clean up	2021-11-25 12:49:15 +01:00