43780 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alessandro Coli	f3ff419462	Changes for the stack effect notifications - request by Michael Kamensky ... @Agetian in merge request https://git.cardforge.org/core-developers/forge/merge_requests/2294	2019-11-23 12:05:08 +01:00
Alessandro Coli	d79c2469ec	Merge remote-tracking branch 'upstream/master'	2019-11-23 09:44:59 +01:00
swordshine	94de9e7cf2	Merge branch 'fix-broken-start' into 'master' ... Fix start crash See merge request core-developers/forge!2296	2019-11-23 02:40:36 +00:00
Chris H	a9d9c800b8	Fix start crash	2019-11-22 21:02:02 -05:00
swordshine	678d09558c	Merge branch 'patch-5' into 'master' ... Syr Konrad, the Grim: The Leave the Graveyard Trigger is only for your Graveyard See merge request core-developers/forge!2295	2019-11-23 01:25:30 +00:00
Hans Mackowiak	831edab34b	Syr Konrad, the Grim: The Leave the Graveyard Trigger is only for your Graveyard	2019-11-23 01:25:30 +00:00
Alessandro Coli	5b64b41f21	Merge remote-tracking branch 'upstream/master'	2019-11-22 13:40:18 +01:00
Alessandro Coli	78a5827976	Fixed some code indentations	2019-11-22 08:17:45 +01:00
Michael Kamensky	a9b6faeb7c	Merge branch 'remove_some_build_warnings' into 'master' ... Remove some build warnings See merge request core-developers/forge!2219	2019-11-22 04:56:48 +00:00
Ryan1729	bebc58d91d	Merge branch 'master' of git.cardforge.org:core-developers/forge into remove_some_build_warnings ... # Conflicts: # forge-gui-mobile/src/forge/assets/FSkin.java	2019-11-21 10:24:52 -07:00
Alessandro Coli	2c70b8b7e0	End of the stack modal panel implementation, rollback about the Wild ... Quests implementation	2019-11-21 16:49:50 +01:00
Alessandro Coli	07d7b7cb58	Merge remote-tracking branch 'upstream/master'	2019-11-21 16:35:45 +01:00
Anthony Calosa	4c80dd3c42	Merge remote-tracking branch 'remotes/core/master' into newBranch	2019-11-20 21:13:35 +08:00
swordshine	0b436479be	Merge branch 'spanishcards02' into 'master' ... Spanish Cards Translations. Fixed some translations. Translated to Ardent Soldier See merge request core-developers/forge!2293	2019-11-20 05:11:08 +00:00
swordshine	036cd90516	Merge branch 'master' into 'master' ... Update the B&R list (Nov 18, 2019) See merge request core-developers/forge!2292	2019-11-20 05:10:55 +00:00
Ryan1729	f0076117df	respond to code review	2019-11-19 19:38:51 -07:00
klaxnek	f8b4a843c5	Spanish CardS Translations. Fixed some translations. Translated to Ardent Soldier	2019-11-19 22:39:00 +01:00
Agetian	5a24092dc0	- Update the B&R list (Nov 18, 2019)	2019-11-19 16:18:56 +03:00
Michael Kamensky	bf1c32f12a	Merge branch 'master' into 'master' ... Added puzzle PS_ELD5 - Possibility Storm - Throne of Eldraine 05. See merge request core-developers/forge!2291	2019-11-19 10:55:15 +00:00
Agetian	f0fb6539ef	- Added puzzle PS_ELD5.	2019-11-19 11:59:59 +03:00
swordshine	a85a761bee	Merge branch 'spanishcards01' into 'master' ... Spanish cards translation: from Abandon Hope to Altar of Bone. See merge request core-developers/forge!2290	2019-11-19 01:11:05 +00:00
swordshine	2c61dc9a75	Merge branch 'patch-4' into 'master' ... Update Deckmasters Garfield vs. Finkel.txt See merge request core-developers/forge!2289	2019-11-19 01:10:55 +00:00
klaxnek	9516929495	Restore newline at end of file	2019-11-19 01:57:08 +01:00
klaxnek	5350a4c476	Spanish cards translation: from Abandon Hope to Altar of Bone. ... Updated spanish card translations from Scryfall.	2019-11-19 01:54:10 +01:00
Alessandro Coli	26dc246c52	Merge remote-tracking branch 'upstream/master'	2019-11-18 13:44:34 +01:00
Anthony Calosa	ad6716f00e	Update Deckmasters Garfield vs. Finkel.txt	2019-11-18 07:17:34 +00:00
Hans Mackowiak	dffb63d95f	Merge branch 'newBranch' into 'master' ... Fix declare attackers Closes #1205 See merge request core-developers/forge!2288	2019-11-18 04:19:10 +00:00
Anthony Calosa	5069c71dd8	Fix declare attackers	2019-11-18 04:19:10 +00:00
Anthony Calosa	287abb9f37	Merge remote-tracking branch 'remotes/core/master' into newBranch	2019-11-18 12:09:22 +08:00
Anthony Calosa	7f8325fb6c	Fix declare attackers	2019-11-18 12:06:59 +08:00
swordshine	6c38674716	Merge branch 'german-translation' into 'master' ... german translation update See merge request core-developers/forge!2287	2019-11-18 00:51:47 +00:00
swordshine	54fdb69e88	Merge branch 'patch-2' into 'master' ... Update proteus_staff.txt Remember Target Controller not Owner. See merge request core-developers/forge!2283	2019-11-18 00:51:30 +00:00
Computica	068cee2326	Update proteus_staff.txt Remember Target Controller not Owner.	2019-11-18 00:51:29 +00:00
Alessandro Coli	e9c2e1034c	Merge remote-tracking branch 'upstream/master'	2019-11-17 17:48:03 +01:00
Alessandro Coli	f453c2af78	Labels for the preferences of the new stack addition modal popup	2019-11-17 17:42:51 +01:00
Alessandro Coli	cc3c631cad	Introduction of modal popup to notify when something is added to the ... stack, including images for cards, complete with sources and targets.	2019-11-17 17:26:31 +01:00
Dagin Svezek	7cfd060ed8	Update de-DE.properties from forum	2019-11-17 09:18:03 +00:00
swordshine	c77f5e9b61	Merge branch 'newBranch' into 'master' ... Fix images not loading when missing suffix See merge request core-developers/forge!2285	2019-11-17 06:46:03 +00:00
swordshine	f18bd75257	Merge branch 'master' into 'master' ... update simplified chinese translation See merge request core-developers/forge!2286	2019-11-17 06:45:58 +00:00
CCTV-1	555a1f8411	update simplified chinese translation	2019-11-17 11:11:41 +08:00
Anthony Calosa	c600dc3b4f	Update	2019-11-17 08:10:29 +08:00
Anthony Calosa	0f138a1bf5	Merge remote-tracking branch 'remotes/core/master' into newBranch	2019-11-17 08:06:43 +08:00
Anthony Calosa	1c19f36637	Fix cards like planes/phenomenon not loading an existing images that have .full/.fullborder	2019-11-17 08:02:11 +08:00
Michael Kamensky	d19973208c	Merge branch 'newBranch' into 'master' ... Add support for "fullborder" cards See merge request core-developers/forge!2284	2019-11-16 15:20:12 +00:00
Anthony Calosa	0a9078a2ec	Merge remote-tracking branch 'remotes/core/master' into newBranch	2019-11-16 17:51:04 +08:00
Anthony Calosa	bf2368ee44	Update	2019-11-16 17:44:56 +08:00
Anthony Calosa	d0a23fbf14	Add support for ".fullborder" cards ... (to differentiate full image cards and full image cards with full borders, so it will only crop full image cards with full borders)	2019-11-16 17:36:30 +08:00
Michael Kamensky	015f561740	Merge branch 'translation11' into 'master' ... Translation: All Abilities Triggers in Stack & Initial GameLogFormatter. See merge request core-developers/forge!2252	2019-11-16 09:06:27 +00:00
klaxnek	cff4a29f1c	Merge branch 'master' of https://git.cardforge.org/core-developers/forge into translation11 ... Conflicts: forge-gui/res/languages/de-DE.properties forge-gui/res/languages/en-US.properties forge-gui/res/languages/es-ES.properties forge-gui/res/languages/zh-CN.properties	2019-11-16 09:59:06 +01:00
Michael Kamensky	f50ee0ba36	Merge branch 'newBranch' into 'master' ... Fix permanents not updating/moving to its row when animated to creature. See merge request core-developers/forge!2282	2019-11-15 06:04:31 +00:00