12335 Commits

Author	SHA1	Message	Date
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
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
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
CCTV-1	555a1f8411	update simplified chinese translation	2019-11-17 11:11:41 +08: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
Anthony Calosa	fe5d8e537c	Fix game pause	2019-11-15 11:14:54 +08:00
Anthony Calosa	86dd21ae7b	Fix permanents not updating when animated to creature.	2019-11-15 06:57:43 +08:00
Alessandro Coli	3fb601adfb	Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git	2019-11-13 19:23:30 +01:00
Hans Mackowiak	7ec12fb58d	November 11, 2019 Pioneer Banned Announcement	2019-11-13 00:54:18 +00:00
tehdiplomat	02299a0400	Add 7 Dwarves	2019-11-11 14:12:49 -05:00
Blacksmith	a3a4ef22df	Clear out release files in preparation for next release	2019-11-11 02:50:48 +00:00
Blacksmith	c2db78baf7	[maven-release-plugin] prepare for next development iteration	2019-11-11 02:45:55 +00:00
Blacksmith	9a30d78f54	[maven-release-plugin] prepare release forge-1.6.30	2019-11-11 02:45:50 +00:00
Blacksmith	db98ce160b	Update README.txt for release	2019-11-11 02:43:16 +00:00
Sol	0c4055726c	Update ANNOUNCEMENTS.txt	2019-11-11 02:26:43 +00:00
Anthony Calosa	044cc793e8	Merge remote-tracking branch 'remotes/core/master' into newBranch	2019-11-09 21:04:48 +08:00
Alessandro Coli	ca81b2b55c	Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git	2019-11-09 12:59:40 +01:00
Anthony Calosa	f239755249	Fix "controls" when alternating human vs ai, then ai vs ai play on mobile forge, ... update refreshfield, update targeting arrows on 3 to 4 players (shows attacked player on 3/4 player match...)	2019-11-09 19:28:21 +08:00
austinio7116	57686c0554	Updated standard deckgen data ... (cherry picked from commit 75f1a60)	2019-11-09 09:04:06 +00:00
Anthony Calosa	5ecde572c3	Merge remote-tracking branch 'remotes/core/master' into newBranch	2019-11-09 06:27:14 +08:00
Anthony Calosa	23e9974950	Update some GUI elements on networkplay -> client	2019-11-09 06:20:13 +08:00
Dagin Svezek	7be34625f6	fix typos	2019-11-07 14:03:24 +00:00
Alessandro Coli	f15762b746	Introduction of "wild duels" in quest	2019-11-07 13:26:22 +01:00
Agetian	3b636be2fe	Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master	2019-11-07 08:10:19 +03:00
Agetian	8cb1789e60	- Added puzzle PS_ELD4. ... - Added OnAdventure functionality to game states. - Fixed a NPE when dev-adding a card to exile.	2019-11-07 08:06:31 +03:00
Michael Kamensky	01782de3a6	Merge branch 'patch-7' into 'master' ... Update de-DE.properties from forum (twosat user) See merge request core-developers/forge!2270	2019-11-07 04:02:59 +00:00
Michael Kamensky	3a7e35c51d	Merge branch 'cardtranslationforgecore' into 'master' ... Moved CardTranslation to forge-core. See merge request core-developers/forge!2253	2019-11-07 04:02:57 +00:00
swordshine	bff24a1d3d	Merge branch 'patch-6' into 'master' ... Replace sprite_icons.png in darkred skin See merge request core-developers/forge!2269	2019-11-07 00:52:17 +00:00
Churrufli	5e0761d085	Update de-DE.properties from forum (twosat user)	2019-11-06 23:33:57 +00:00
Churrufli	2184ddf1bb	Replace sprite_icons.png in darkred skin	2019-11-06 17:54:06 +00:00
Churrufli	fd032f6ccd	Replace bg_splash.png in Darkred skin	2019-11-06 17:52:30 +00:00
Hans Mackowiak	987043ead2	Update dread_warlock: added Warlock type	2019-11-06 15:06:41 +00:00
swordshine	4aa9c224d0	Merge branch 'pioneerrandomquestworld' into 'master' ... Pioneer random quest mode See merge request core-developers/forge!2266	2019-11-06 08:32:13 +00:00
swordshine	2ac6fa4542	Merge branch 'elddeckgendata' into 'master' ... Updated Modern and Standard Deckgen Data See merge request core-developers/forge!2265	2019-11-06 08:31:48 +00:00
austinio7116	5eb9be6248	Pioneer random quest mode	2019-11-06 08:07:21 +00:00
austinio7116	23eebf9037	Updated Modern and Standard Deckgen Data	2019-11-06 06:17:41 +00:00
CCTV-1	b59adab68d	added missing translation label	2019-11-06 10:45:44 +08:00
CCTV-1	b2d44105be	update simplified chinese translation	2019-11-06 10:44:19 +08:00
swordshine	2235546f2a	Merge branch 'translation10' into 'master' ... More translations: New menu settings, Search, Priority, PayMana, Discard, Order, Exile, Delve, ... See merge request core-developers/forge!2251	2019-11-06 01:04:53 +00:00
austinio7116	02969cfe5b	Pioneer archetype deck generation added to UI	2019-11-05 23:02:58 +00:00
austinio7116	c6a2c35850	Pioneer initial meta ... (cherry picked from commit af89555)	2019-11-05 22:37:00 +00:00
maustin	4c0a71f37d	Merge branch '1191-format-pioneer' of https://git.cardforge.org/core-developers/forge into pioneerdeckgen	2019-11-05 22:36:19 +00:00
Hans Mackowiak	74e3bd1895	Pionier: November 2019 Banned cards	2019-11-05 12:05:34 +00:00
Hans Mackowiak	121c9f5012	add PioneerPredicate to magicDb	2019-11-05 08:36:19 +00:00
Hans Mackowiak	7b1cd816b7	Update formats	2019-11-05 08:25:43 +00:00