353 Commits

Author	SHA1	Message	Date
Ada Lovegirls	01c30868eb	Add option to load English string as fallback if string missing	2021-04-24 14:39:35 +00:00
Ben Wallis	c6205875ee	Merge branch 'xvar/server-version-check' into 'master' ... Added client/server version mismatch warnings See merge request veloren/veloren!2184	2021-04-24 09:05:45 +00:00
Ben Wallis	2e08c2f76f	Added client/server version mismatch message when a network error is encountered during client init. ... Added warning banner on character select when successfully connected to a server with a mismatched version.	2021-04-24 09:08:30 +01:00
holychowders	516f2fec4a	Fix grammatical error in NPC message	2021-04-23 22:43:37 -07:00
Illia Denysenko	4e7aba5b3f	update uk_UA localization	2021-04-23 21:30:46 +00:00
Nícolas Wildner	6188bb9e96	update pt_br 20210422	2021-04-23 01:00:41 +00:00
Monty	a4d56e7843	more sprite stuff and crafting UI update ... fix item images fix CR display	2021-04-20 02:46:06 +02:00
Imbris	8c9d4dc3dd	Merge branch 'capucho/inactive-master' into 'master' ... Lower volume of window on focus loss See merge request veloren/veloren!2150	2021-04-19 20:39:49 +00:00
Marcel	c5caec4921	Merge branch 'capucho/map-kb-zoom' into 'master' ... Add keybindings for map/minimap zoom See merge request veloren/veloren!2161	2021-04-19 19:52:27 +00:00
João Capucho	164411cb43	Voxygen: Added translations for map zoom	2021-04-19 20:27:02 +01:00
Illia Denysenko	ef8926bc5c	Update localization for uk_UA	2021-04-19 19:26:20 +00:00
João Capucho	f23b515dd8	Voxygen: Add master volume sliders to the settings	2021-04-19 19:58:14 +01:00
Sam	ce7581037c	Overhauled dash melee.	2021-04-18 18:36:12 -04:00
Samuel Keiffer	60d38cc03b	Merge branch 'aweinstock/dodgesplosion' into 'master' ... Unlock dodge roll iframes and staff explosion by default. See merge request veloren/veloren!2146	2021-04-18 20:46:15 +00:00
Avi Weinstock	0404250300	Unlock dodge roll iframes and staff explosion by default.	2021-04-18 16:16:06 -04:00
Marcel	62fcdcd998	Merge branch 'nwildner/update_pt_BR_20210417' into 'master' ... update pt_br 20210417 See merge request veloren/veloren!2143	2021-04-18 19:33:39 +00:00
Nícolas Wildner	24b55d0f07	update pt_br 20210417	2021-04-18 19:33:39 +00:00
Ben Wallis	a4cdb89987	Implemented inventory sorting	2021-04-17 22:04:08 +01:00
Marcel	2a0c8e575f	Merge branch 'kinggred-master-patch-80352' into 'master' ... Update main.ron See merge request veloren/veloren!2123	2021-04-17 18:28:31 +00:00
Samuel Keiffer	c962c5f12e	Merge branch 'gGmMsS/Burning' into 'master' ... Added burning debuff for Staff M2 See merge request veloren/veloren!2134	2021-04-15 23:51:33 +00:00
gGmMsS123	e33961e1fa	M2 Staff Final Touch	2021-04-16 00:34:24 +03:00
gGmMsS123	0d956610ec	Added burning debuff for Staff M2	2021-04-15 23:34:28 +03:00
Avi Weinstock	2fb7575d60	Address MR 2126 comments.	2021-04-15 15:17:39 -04:00
Avi Weinstock	50d0314a75	Add a toggle to negotiate the use of server-authoritative physics.	2021-04-15 08:50:17 -04:00
Stanisław Grupiński	fd7bf41678	Update main.ron	2021-04-14 12:40:02 +00:00
jshipsey	ea9b871374	loot tables, clippy, animation tweaks	2021-04-13 20:18:59 -04:00
Yuri Socher Bichibichi	c6dea3acca	Updates the Brazilian Portuguese (pt-BR) translation	2021-04-13 11:56:58 -03:00
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