4356 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Monty Marz	4e9e757f1b	Merge branch 'pfau/loot_chat_icon' into 'master' ... Loot ChatType, Update german translation, map zooming See merge request veloren/veloren!1138	2020-07-01 19:05:44 +00:00
Monty Marz	89400264dc	Loot ChatType, Update german translation, map zooming	2020-07-01 19:05:44 +00:00
Marcel	f9a7dbaa77	Merge branch 'scott-c/daggers' into 'master' ... Scott-c/1h-wielding #185 See merge request veloren/veloren!1095	2020-07-01 12:07:35 +00:00
Marcel	cb9ce690e0	Merge branch 'clippy-fixup' into 'master' ... fix various clippy issues See merge request veloren/veloren!1137	2020-07-01 11:38:23 +00:00
scott-c	d53b51954b	Added ability to use 2 x 1h weapons or shields	2020-07-01 17:51:06 +08:00
Marcel Märtens	e1b27c51f5	fix clippy issues in tests and add it to CI	2020-07-01 00:37:15 +02:00
Marcel Märtens	6535fa5744	fix various clippy issues	2020-07-01 00:37:06 +02:00
Songtronix	97a446f2f9	Merge branch 'kevinglasson/hotfix-anim-hotreloading-compile-error' into 'master' ... Refactor and document hotreloading feature See merge request veloren/veloren!1102	2020-06-30 12:44:53 +00:00
Songtronix	a63dfe5581	Merge branch 'sam/whitelistfunction' into 'master' ... Adds a command that allows a username to be added or removed from the whitelist Closes #613 See merge request veloren/veloren!1136	2020-06-30 12:21:36 +00:00
Samuel Keiffer	44203ab817	Adds a command that allows a username to be added or removed from the whitelist	2020-06-30 12:21:36 +00:00
Kevin Glasson	bb5d91edca	Use find folder to locate debug dir	2020-06-30 18:54:42 +08:00
Kevin Glasson	2a42949df1	Refactor hot reloading ... - Remove conditional compilation in regards to the copying of an `_active` file so that the behaviour is the same accross all platforms. - Simplify code slightly. - Add documentation.	2020-06-30 18:54:42 +08:00
Luciano	4a8443f743	Update es_la.ron	2020-06-29 14:19:12 +00:00
Marcel	de1f970088	Merge branch 'xMAC94x/tarpaulin-flanky' into 'master' ... increase network sleep in order to fix flanky tests See merge request veloren/veloren!1133	2020-06-29 12:32:52 +00:00
Marcel Märtens	11e7b1f922	increase network sleep in order to fix flanky tests	2020-06-29 14:32:20 +02:00
Marcel	8f93038027	Merge branch 'xMAC94x/docker-compose-fix' into 'master' ... fix server-cli tracing accepting RUST_LOG env var and pass RUST_LOG via... See merge request veloren/veloren!1132	2020-06-29 12:29:07 +00:00
Marcel Märtens	c558c9de7c	fix server-cli tracing accepting RUST_LOG env var and pass RUST_LOG via docker-compose rather than hardcoding it ... - however RUST_BACKTRACE=1 is still hardcoded as its probably useful - dont spam the server-cli with debug	2020-06-29 11:05:55 +02:00
Marcel	0a8c896572	Merge branch 'xvar/failed-to-collect-item-fix' into 'master' ... Fixed inventory full message when pressing the pickup item key in quick succession (#651) See merge request veloren/veloren!1131	2020-06-29 07:58:45 +00:00
Ben Wallis	48a23e5f4c	Fixed inventory full message when pressing the pickup item key in quick succession (#651)	2020-06-29 07:48:44 +01:00
Marcel	807df57f64	Merge branch 'theduke/fix-milestones-readme-link' into 'master' ... Fix Milestones link in README See merge request veloren/veloren!1127	2020-06-29 06:09:39 +00:00
theduke	2dafadcfb7	Fix Milestones link in README	2020-06-29 00:41:30 -04:00
Forest Anderson	be6d139e26	Merge branch 'Swedneck/add-veloren-swedish-translation' into 'master' ... Add swedish translation See merge request veloren/veloren!824	2020-06-29 01:55:18 +00:00
Forest Anderson	27f7c59e6d	Merge branch 'polish' into 'master' ... Polish See merge request veloren/veloren!1001	2020-06-29 01:35:42 +00:00
Justin Shipsey	49a18ac659	Merge branch 'sam/gliderfix' into 'master' ... Fixed glider animation so glider does not block view in first person. See merge request veloren/veloren!1130	2020-06-29 01:35:40 +00:00
Forest Anderson	c50a2c8ac2	Fixed Veloren spelling	2020-06-28 20:41:22 -04:00
Patro	4bfe195336	final tweaks in translation	2020-06-28 20:41:22 -04:00
Patro	b37ed5f3a4	Fixed some spelling errors and retranslated some sentences to make them sound better	2020-06-28 20:41:22 -04:00
Redo11	54babe6615	Change uncanny valley to wildness as merged in ... 6c4e3eb00a (be21cb369b4dfb9d7a565ddff0161533680a3583)	2020-06-28 20:41:22 -04:00
Redo11	ecca666521	Add translated comments and add back opensans as default font, as special characters still aren't supported.	2020-06-28 20:41:22 -04:00
Redo11	2c17ecbc99	Add waypoints	2020-06-28 20:41:22 -04:00
jshipsey	622fa88b41	polish	2020-06-28 20:41:22 -04:00
Tim Stahel	3b246dee42	add swedish translation	2020-06-28 20:37:27 -04:00
Marcel	04b7837340	Merge branch 'xMAC94x/network-adj' into 'master' ... - switched participant to only error!() once a sec instead of every occurence... See merge request veloren/veloren!1129	2020-06-28 23:10:15 +00:00
Forest Anderson	07298cdbeb	Merge branch 'nwilder/add-brazilian-portugese-translation' into 'master' ... Nwilder/add brazilian portugese translation See merge request veloren/veloren!1128	2020-06-28 21:29:08 +00:00
Forest Anderson	985b0e2bfd	Merge branch 'wusyong/tchinese' into 'master' ... Add Traditional Chinese translation See merge request veloren/veloren!885	2020-06-28 21:23:57 +00:00
Forest Anderson	f5cede6a90	Merge branch 'nancok/add-spanish-translation' into 'master' ... Add Spanish translation See merge request veloren/veloren!822	2020-06-28 21:22:16 +00:00
unknown	7f02fa8132	Fixed glider animation so glider does not block view in first person.	2020-06-28 16:47:31 -04:00
Marcel Märtens	57453291e4	- switched participant to only error!() once a sec instead of every occurence in order to not spam error ... - switched the behavior of prio to keep the order of a stream, EVEN if messages of different length are used! This needs to be addresses to fulfill PROMISES_ORDERED I think we need to make thoughs if PRIO needs to handle this, or we add additional meta info and handle it on receiver site	2020-06-28 22:29:42 +02:00
Forest Anderson	cda757f96c	Merge branch 'FixFromDarkness/fix-russian-translations' into 'master' ... Update ru_RU.ron: Fix typos See merge request veloren/veloren!1126	2020-06-28 19:56:40 +00:00
Treeco	4098d69a69	Fixed up a few things ... Added fonts section to translation file required by changes to translation system Removed unneeded copy of translation file	2020-06-28 14:50:42 -04:00
Luciano	948db32ba8	Uploaded Spanish (Latin American) translation,	2020-06-28 14:50:42 -04:00
Luciano	9e33fd5131	Upload Latin America Spanish translation	2020-06-28 14:50:42 -04:00
Forest Anderson	9166969c37	Changed license name	2020-06-28 14:47:26 -04:00
Forest Anderson	635c0d06f0	Merge branch 'xvar/move-sfx-from-common-to-voxygen' into 'master' ... Moved sfx from common to voxygen See merge request veloren/veloren!1125	2020-06-28 18:38:25 +00:00
Forest Anderson	a3eafe9b70	Merge branch 'yusdacra/crate2nix' into 'master' ... nix: Switch to crate2nix for building, and niv for dependency management See merge request veloren/veloren!1090	2020-06-28 18:28:29 +00:00
Ben Wallis	dc1844b489	Moved sfx from common to voxygen	2020-06-28 18:16:22 +01:00
Forest Anderson	2b2e24be5e	Merge branch 'angel/fix-chattype-error' into 'master' ... Fixed meta chattype error on master See merge request veloren/veloren!1124	2020-06-28 17:10:01 +00:00
Forest Anderson	201f513737	Fixed meta chattype error on master	2020-06-28 17:10:01 +00:00
Forest Anderson	9246e34c1b	Merge branch 'CapsizeGlimmer/chat_modes' into 'master' ... Capsize glimmer/chat modes Closes #217 See merge request veloren/veloren!1043	2020-06-28 14:35:39 +00:00
Monty Marz	f3a84e07a7	changed message type for motd	2020-06-28 16:04:55 +02:00