326 Commits

Author	SHA1	Message	Date
Illia Denysenko	4ac8015ed9	Update localization for Ukrainian	2021-04-12 02:28:55 +00:00
Marcel	5e7adc6767	Merge branch 'trade-help-tooltips' into 'master' ... Show ctrl-click and shift-click usage in item tooltips during trades. See merge request veloren/veloren!2101	2021-04-11 22:56:03 +00:00
Rickey Chamblee	8a25ebb59a	Show ctrl-click and shift-click usage in item tooltips during trades.	2021-04-11 22:56:02 +00:00
Marcel	d7a9ab7e23	Merge branch 'master' into 'master' ... Update and fix zh_CN See merge request veloren/veloren!2103	2021-04-11 22:56:00 +00:00
law4x	4403cd71a5	Update and fix zh_CN	2021-04-11 22:55:59 +00:00
BuildTools	c4294d968d	Add/modify Polish translations	2021-04-11 19:10:09 +02:00
Monty Marz	6772e71aaa	UI fixes and more	2021-04-11 03:49:47 +00:00
Marcel	99e494976d	Merge branch 'ccm7676/lang_bug_fix' into 'master' ... fixed the Select a Language text on languages where it was broken See merge request veloren/veloren!2089	2021-04-10 15:47:28 +00:00
Marcel	e6683bb764	Merge branch 'juliancoffee/uk_UA-localizaion' into 'master' ... Update localization files for Ukrainian See merge request veloren/veloren!2090	2021-04-10 14:54:13 +00:00
Illia Denysenko	4717ad25a8	Update localization files for Ukrainian	2021-04-10 14:54:12 +00:00
Marcel	12c3ee440e	Merge branch 'MigraineX/update-es-ES' into 'master' ... Updated the Spanish (ES) translation See merge request veloren/veloren!2094	2021-04-10 14:20:40 +00:00
MigraineX	07fd6f16f8	Updated the Spanish (ES) translation	2021-04-10 14:31:57 +02:00
Joshua Yanovski	af94753ad9	Remove panics and unwraps, part 1. ... Also fixes various other miscellaneous bugs.	2021-04-10 10:03:21 +02:00
Carl Marino	d2151ad76c	fixed the Select a Language text on languages where it was broken	2021-04-09 18:39:53 +02:00
hqurve	be42cc60c4	Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window	2021-04-07 20:24:22 +00:00
Vincent Foulon	5e23c164e6	Add missing translations + Add "enemy_killed" text for villagers	2021-04-07 13:26:15 +02:00
James Melkonian	16871208f2	Add topographic option to map	2021-04-06 09:16:17 -07:00
Marcel	187a85e056	Merge branch 'renamenorsk_norskbokmål' into 'master' ... Rename Norsk to Norsk bokmål See merge request veloren/veloren!2064	2021-04-06 11:37:54 +00:00
Kim André Moen Bjørkede	2380f9e8c2	Rename Norsk to Norsk bokmål	2021-04-06 11:37:51 +00:00
Marcel	2ed85a2dc0	Merge branch 'tonyvu0605/VietTranslation' into 'master' ... Started Vietnamese Translation See merge request veloren/veloren!2059	2021-04-06 10:48:03 +00:00
Joshua Barretto	de9ad0942f	Merge branch 'zesterer/follow-cam' into 'master' ... Added auto camera setting See merge request veloren/veloren!2071	2021-04-06 04:23:40 +00:00
Samuel Keiffer	3c50321a80	Merge branch 'sam/consolidate-roll' into 'master' ... Flattened roll progression. See merge request veloren/veloren!2073	2021-04-06 03:31:46 +00:00
Samuel Keiffer	f79493f7d0	Merge branch 'sam/sceptre-nerfs' into 'master' ... Sam/sceptre nerfs See merge request veloren/veloren!2072	2021-04-06 02:41:56 +00:00
Joshua Barretto	60e2ed3e7d	Added auto camera setting	2021-04-05 23:24:31 +01:00
Sam	ba0b6c309b	Flattened roll progression.	2021-04-05 17:50:53 -04:00
Sam	a7e39bc8c9	Nerfs	2021-04-05 17:38:52 -04:00
theCow61	b99c02401d	Change to auto walk/glide.	2021-04-05 16:07:17 -05:00
Marcel	88079cfd30	Merge branch 'japanese' into 'master' ... Add Japanese message translation See merge request veloren/veloren!2049	2021-04-05 13:38:30 +00:00
tonyvu0605	e0dbd5566d	Started Vietnamese Translation	2021-04-03 22:17:57 -04:00
Snowram	9a3f6d8261	Substitutes DPS for CR in item tooltip	2021-04-03 00:10:31 -04:00
Jun NOGATA	129a3de2eb	Add Japanese message translation	2021-04-03 01:50:10 +09:00
Vincent Foulon	dcde8df365	address review comments	2021-04-01 19:13:08 +02:00
Vincent Foulon	c2a8feada5	Add dialogue when the Merchant is busy and randomize some trading dialogues	2021-03-31 19:06:41 +02:00
Snowram	606dd64741	Fix a staff icon, some offset fixes, lower wolf spawn rate	2021-03-30 00:27:03 +02:00
Snowram	6adaac8106	Addresses comments	2021-03-29 18:35:12 +02:00
Snowram	b8ac90d049	Changelog, cleanup, clippy	2021-03-29 18:35:10 +02:00
Snowram	508e35ca17	Add several new i18n lines	2021-03-29 18:34:45 +02:00
Scott Williams	9ca0388561	Character Creation Randomization Fix	2021-03-27 15:58:34 +00:00
aljazerzen	0ea102dc9c	refactor handling of duplicate login	2021-03-25 12:33:56 +01:00
Avi Weinstock	4ec6b43693	Add a vertical camera clamp option and toggle to voxygen.	2021-03-23 18:22:32 -04:00
Marcel	983523c463	Merge branch 'vfoulon80/climbing-skill' into 'master' ... Add climbing speed and cost See merge request veloren/veloren!1950	2021-03-21 18:35:44 +00:00
Vincent Foulon	e06870702f	Add skill for swimming speed	2021-03-21 15:58:38 +01:00
Vincent Foulon	71d3bf5821	fix typo in sceptre aura skill	2021-03-20 22:12:43 +01:00
Vincent Foulon	8ef30dd2f3	fix one line from custist_alarm vector	2021-03-20 20:53:27 +01:00
Vincent Foulon	d4fbc78d06	Translate cultist_alarm in FR	2021-03-20 17:37:59 +01:00
Vincent Foulon	d0aa68a9d2	Add climbing speed and cost	2021-03-20 17:17:28 +01:00
Marcel	6e6878ca9e	Merge branch 'tormeh/add-monologue-strings' into 'master' ... Add monologue strings. See merge request veloren/veloren!1925	2021-03-17 08:45:27 +00:00
Marcel	684789c886	Merge branch 'vfoulon80/fr-skills' into 'master' ... [FR] translate skills.ron + missing keys See merge request veloren/veloren!1901	2021-03-17 01:25:12 +00:00
Vincent Foulon	6b0028907d	[FR] translate skills.ron + missing keys	2021-03-17 01:25:11 +00:00
Tormod G. Hellen	f695b11171	Add monologue strings.	2021-03-17 01:58:12 +01:00