56126 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
paul_snoops	9ed23d9c49	HTR edition updates	2022-02-13 12:08:52 +00:00
Michael Kamensky	cfc36cdf96	Merge branch 'neo_12' into 'master' ... NEO – 12 Feb See merge request core-developers/forge!6219	2022-02-13 04:52:48 +00:00
Tim Mocny	e3b1e9e72d	NEO – 12 Feb	2022-02-13 04:52:48 +00:00
Michael Kamensky	3ac297cf23	Merge branch 'master' into 'master' ... updated simplified chinese translation See merge request core-developers/forge!6220	2022-02-13 04:52:10 +00:00
CCTV-1	f1005be642	translate new setting.	2022-02-13 11:11:43 +08:00
Michael Kamensky	7c12099bfd	Merge branch 'xstreams' into 'master' ... xStreams: fix serialize new field unplayableAI See merge request core-developers/forge!6217	2022-02-12 09:24:23 +00:00
Anthony Calosa	fa23628a43	Merge branch 'master' into 'master' ... [Mobile] Update Splashscreen transitions See merge request core-developers/forge!6218	2022-02-12 08:09:24 +00:00
Anthony Calosa	12609741db	[Mobile] Update Splashscreen transitions	2022-02-12 08:09:24 +00:00
Anthony Calosa	a382088876	Merge remote-tracking branch 'core/master'	2022-02-12 16:03:33 +08:00
Anthony Calosa	e268d18e26	[Mobile] Update SplashScreen transitions	2022-02-12 15:50:06 +08:00
tool4EvEr	c4fd7cf00e	xStreams: fix serialize new field unplayableAI	2022-02-12 08:04:53 +01:00
Michael Kamensky	20d2bea385	Merge branch 'Achievement' into 'master' ... Add multiplayer achievement See merge request core-developers/forge!6215	2022-02-12 06:35:42 +00:00
Bug Hunter	4e72e9049d	Add multiplayer achievement	2022-02-12 06:35:41 +00:00
Anthony Calosa	1a4fa6b3c1	Merge branch 'master' into 'master' ... Update GauntletIO See merge request core-developers/forge!6216	2022-02-12 05:04:50 +00:00
Anthony Calosa	f72f800b70	Update GauntletIO ... - allow PaperCard.class (xstream)	2022-02-12 13:03:39 +08:00
Michael Kamensky	7e85a10089	Merge branch 'DraftEnhancement' into 'master' ... Card Draft Rankings on ImageView See merge request core-developers/forge!6212	2022-02-11 13:48:10 +00:00
Michael Kamensky	82addcab0c	Merge branch 'aiattack' into 'master' ... Teach AI it can ignore attack requirement when it leads to payment See merge request core-developers/forge!6214	2022-02-11 13:48:00 +00:00
Michael Kamensky	2a639ae592	Merge branch 'freshmaster' into 'master' ... Tested card scripts for NEO (2022-02-10) See merge request core-developers/forge!6208	2022-02-11 13:47:03 +00:00
Renato Santos	7a5f20d816	Update forge-gui/res/cardsfolder/upcoming/automated_artificer.txt	2022-02-11 11:55:39 +00:00
TRT	277aa04f33	Teach AI it can ignore attack requirement when it leads to payment	2022-02-11 12:48:05 +01:00
Anthony Calosa	370f9eed16	Merge remote-tracking branch 'core/master' into DraftEnhancement	2022-02-11 14:50:06 +08:00
Anthony Calosa	308cea227f	Merge branch 'master' into 'master' ... fix missing bg texture See merge request core-developers/forge!6213	2022-02-11 06:39:25 +00:00
Anthony Calosa	3d7e2fbd33	fix missing bg texture	2022-02-11 14:36:00 +08:00
Anthony Calosa	1eb4aa5647	Draft Ranking on ImageView ... - add an option to show draft card rankings	2022-02-11 14:12:44 +08:00
Anthony Calosa	4cb29fb06e	Merge branch 'master' into 'master' ... update sprite_phyrexian.png See merge request core-developers/forge!6211	2022-02-11 05:41:23 +00:00
Anthony Calosa	cde13348d6	update sprite_phyrexian.png	2022-02-11 13:38:32 +08:00
Renato Santos	0f3e1a1b3f	Requested corrections	2022-02-11 05:36:14 +00:00
Anthony Calosa	5cc39a2f91	Merge branch 'master' into 'master' ... [Mobile] Fix splash See merge request core-developers/forge!6210	2022-02-11 05:27:32 +00:00
Anthony Calosa	67d5ad4ce6	[Mobile] Fix splash	2022-02-11 13:26:19 +08:00
Michael Kamensky	dbae9e381a	Merge branch 'newmana' into 'master' ... add new Phyrexian/color pair hybrid mana shards See merge request core-developers/forge!6200	2022-02-11 04:23:12 +00:00
Tim Mocny	a7f2d8f31e	add new Phyrexian/color pair hybrid mana shards	2022-02-11 04:23:04 +00:00
Michael Kamensky	5f09cb257f	Merge branch 'master' into 'master' ... Fix an unused import See merge request core-developers/forge!6209	2022-02-11 03:49:51 +00:00
Michael Kamensky	92c886ac06	- Fix an unused import.	2022-02-11 06:49:21 +03:00
Michael Kamensky	e574147e25	Merge branch 'neo_nec_9_feb' into 'master' ... 09 Feb - NEO & NEC card scripts from various Discord users See merge request core-developers/forge!6198	2022-02-11 03:36:04 +00:00
Michael Kamensky	4eafabe07c	Merge branch 'crew' into 'master' ... Crew rules change See merge request core-developers/forge!6206	2022-02-11 03:34:23 +00:00
Michael Kamensky	acaf7fa5c1	Merge branch 'AdventureModePort' into 'master' ... Mobile + Adventure port See merge request core-developers/forge!6180	2022-02-11 03:34:01 +00:00
Michael Kamensky	a8c18a28f4	Merge branch '406.3' into 'master' ... 406.3 extended See merge request core-developers/forge!6207	2022-02-11 03:29:14 +00:00
Bug Hunter	a1b3a2e40b	406.3 extended	2022-02-11 03:29:13 +00:00
Renato Santos	ca7e2e9bab	Tested card scripts for NEO (2022-02-10)	2022-02-11 01:10:52 +00:00
Anthony Calosa	a9956f8cfd	animated startup	2022-02-11 08:48:29 +08:00
paul_snoops	9a28f9b2b7	access denied filename fix	2022-02-11 00:03:15 +00:00
paul_snoops	9646bc4cfb	fixes	2022-02-11 00:03:15 +00:00
paul_snoops	087ae7ccc3	fixes	2022-02-11 00:03:15 +00:00
paul_snoops	44d96c1a79	aerial surveyor fix	2022-02-11 00:03:14 +00:00
paul_snoops	da8fd7d1ad	09 Feb - NEO & NEC card scripts from various Discord users	2022-02-11 00:03:14 +00:00
tool4EvEr	4232d9f376	Crew rules change	2022-02-10 22:11:51 +01:00
Anthony Calosa	f4987c0ba6	update splash	2022-02-11 00:34:14 +08:00
Anthony Calosa	5b98a0f70d	Merge remote-tracking branch 'core/master' into AdventureModePort	2022-02-10 23:48:14 +08:00
Michael Kamensky	c8c90c26ab	Merge branch 'attackfix' into 'master' ... Fix AI never attacking your PW when you have Blazing Archon See merge request core-developers/forge!6205	2022-02-10 15:35:23 +00:00
TRT	0496eaf446	Fix AI never attacking your PW when you have Blazing Archon	2022-02-10 16:33:03 +01:00