43780 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
swordshine	dc000318bd	Merge branch 'patch-3' into 'master' ... Refactor String.join -> StringUtils.join See merge request core-developers/forge!2213	2019-10-04 03:35:29 +00:00
swordshine	0dbc90817a	Merge branch 'patch-2' into 'master' ... Prevent NPE casting adventure card as spell See merge request core-developers/forge!2211	2019-10-04 03:35:07 +00:00
Alessandro Coli	0bcc0e9248	Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git	2019-10-03 20:44:18 +02:00
leriomaggio	780343a746	Added myself to the list of contributors	2019-10-03 19:37:29 +01:00
Valerio Maggio	c07230c447	workaround to fix Deck Editor extra space for label	2019-10-03 18:50:37 +01:00
Valerio Maggio	27565d4cc0	fixed bug that was keep on creating filters in deck editor every tab switch (issue 1174)	2019-10-03 18:33:12 +01:00
Valerio Maggio	c6bd5aaaf1	Merge remote-tracking branch 'upstream/master' into ref-base-fork	2019-10-03 18:10:26 +01:00
Anthony Calosa	90e2c08e75	Refactor String.join -> StringUtils.join	2019-10-03 13:54:34 +00:00
swordshine	3c2eac78d6	Merge branch 'patch' into 'master' ... Fix Tome of Legends See merge request core-developers/forge!2212	2019-10-03 12:58:19 +00:00
swordshine	92077f1647	Fix Tome of Legends	2019-10-03 20:47:13 +08:00
Michael Kamensky	3b47b51bb7	Merge branch 'newBranch' into 'master' ... Manaicons update See merge request core-developers/forge!2210	2019-10-03 07:18:21 +00:00
Anthony Calosa	c9c27faf8f	Prevent NPE casting adventure card as spell	2019-10-03 05:45:44 +00:00
Anthony Calosa	ed5d654ac3	Rounded edges a little	2019-10-03 13:06:16 +08:00
Anthony Calosa	353263f936	Add slight drop shadow	2019-10-03 13:00:34 +08:00
swordshine	cecf532da8	Merge branch 'german-translation' into 'master' ... german translation update See merge request core-developers/forge!2209	2019-10-03 03:15:09 +00:00
Anthony Calosa	5c9edece87	Reduce edge aliasing	2019-10-02 23:38:29 +08:00
Alessandro Coli	aecee3cea2	Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git	2019-10-02 13:30:06 +02:00
Dagin Svezek	677c19ca80	german translation update	2019-10-02 05:53:04 +00:00
Michael Kamensky	7b6543e7fa	Merge branch 'staticEffectCleanup' into 'master' ... StaticEffect: cleanup old methods See merge request core-developers/forge!2208	2019-10-02 05:06:15 +00:00
Hans Mackowiak	9fefaa58fc	StaticEffect: cleanup old methods	2019-10-02 05:06:15 +00:00
swordshine	297b7e9728	Merge branch 'patch' into 'master' ... Fix Rowan, Fearless Sparkmage See merge request core-developers/forge!2207	2019-10-02 02:50:55 +00:00
swordshine	873d4dfc0a	Fix Rowan, Fearless Sparkmage	2019-10-02 10:45:58 +08:00
Michael Kamensky	e2f7358970	Merge branch 'newBranch' into 'master' ... Upscale some sprites See merge request core-developers/forge!2201	2019-10-01 17:34:05 +00:00
Michael Kamensky	d2666caf73	Merge branch 'master' into 'master' ... No need to separately add the Food card by name to AI sac preferences. See merge request core-developers/forge!2206	2019-10-01 17:30:39 +00:00
Agetian	6e906888cb	- No need to separately add the Food card by name to AI sac preferences.	2019-10-01 20:22:21 +03:00
Alessandro Coli	3432b9fdcd	Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git	2019-10-01 18:56:14 +02:00
Anthony Calosa	72ab3cc690	adjust spacing - rendered icons	2019-10-01 21:47:53 +08:00
Anthony Calosa	7a614352bd	Merge remote-tracking branch 'remotes/core/master' into newBranch	2019-10-01 20:13:51 +08:00
swordshine	5ccc6ca10f	Merge branch 'patch' into 'master' ... Update some cards See merge request core-developers/forge!2204	2019-10-01 09:04:03 +00:00
swordshine	5f9f22ddab	Update 5 scripts	2019-10-01 16:56:46 +08:00
swordshine	aa75871aae	Merge branch 'master' into 'master' ... update simplified chinese translation See merge request core-developers/forge!2205	2019-10-01 08:47:42 +00:00
CCTV-1	d405fd7ae6	update simplified chinese translation	2019-10-01 16:31:43 +08:00
CCTV-1	eb05ce8da7	Merge remote-tracking branch 'upstream/master'	2019-10-01 16:11:06 +08:00
swordshine	af2ac7e611	Fix Rohgahh of Kher Keep	2019-10-01 16:02:54 +08:00
Anthony Calosa	bf5f581cf6	Merge remote-tracking branch 'remotes/core/master' into newBranch	2019-10-01 14:28:38 +08:00
Anthony Calosa	1345bbe671	Revert to allow merge	2019-10-01 14:18:04 +08:00
swordshine	e998eb379e	Merge branch 'eld-ai-hints' into 'master' ... Fix a couple AI hints for Throne of Eldraine, add some more hints See merge request core-developers/forge!2202	2019-10-01 06:16:21 +00:00
Michael Kamensky	b01c4220d2	Fix a couple AI hints for Throne of Eldraine, add some more hints	2019-10-01 06:16:21 +00:00
swordshine	474e7f42d9	Merge branch 'translation08' into 'master' ... Translated strings related to Win/Lose/Concede See merge request core-developers/forge!2197	2019-10-01 06:16:08 +00:00
swordshine	11c3e17c98	Merge branch 'patch' into 'master' ... Fix two cards See merge request core-developers/forge!2203	2019-10-01 06:12:20 +00:00
swordshine	f3206bfe27	Fix two cards	2019-10-01 14:02:44 +08:00
Anthony Calosa	91674ef0b2	Seperate some Sprite Icons, Upscaled sprite_planar_conquest, ... added some ability icons, Enabled texture filter on some textures	2019-10-01 13:41:52 +08:00
Anthony Calosa	a939a8a042	Merge remote-tracking branch 'remotes/core/master' into newBranch	2019-10-01 11:27:54 +08:00
Anthony Calosa	c988ecfefa	fix guttergrime	2019-10-01 09:46:05 +08:00
Michael Kamensky	059264c2f9	Merge branch 'eld-ai-hints' into 'master' ... Throne of Eldraine AI hints See merge request core-developers/forge!2198	2019-09-30 18:50:12 +00:00
Michael Kamensky	4e48ffbd20	Throne of Eldraine AI hints	2019-09-30 18:50:12 +00:00
Anthony Calosa	11c8dd0f44	Merge remote-tracking branch 'remotes/core/master' into newBranch	2019-09-30 19:48:36 +08:00
Peter	e869c6ac6b	Remove unused imports	2019-09-30 11:35:18 +02:00
Peter	17fabb0bec	Translated strings related to Win/Loose/Concede	2019-09-30 11:25:27 +02:00
CCTV-1	88448366d5	Merge remote-tracking branch 'upstream/master'	2019-09-30 16:21:22 +08:00