4938 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Yanovski	c7d62a5818	Update recompile.yml	2020-09-02 18:33:36 +00:00
Marcel	466d5cc450	Merge branch 'update-zh' into 'master' ... update the Simplified Chinese translation See merge request veloren/veloren!1350	2020-09-02 08:07:28 +00:00
law4x	5e624456bb	update the Simplified Chinese translation	2020-09-02 08:07:27 +00:00
Joshua Barretto	4bd1d0ed91	Merge branch 'scott-c/fix-missing-firework-particles' into 'master' ... fix missing firework/bomb particle rng & adjust firework colors Closes #713 See merge request veloren/veloren!1351	2020-09-01 14:01:13 +00:00
scott-c	1964779355	fix missing firework particle rng & adjust firework colors	2020-09-01 20:33:17 +08:00
Joshua Yanovski	126a3d6c54	Merge branch 'sharp/typed-body' into 'master' ... Further generalize the typed module. See merge request veloren/veloren!1346	2020-09-01 06:29:35 +00:00
Songtronix	685fcb6664	Merge branch 'songtronix/fix-assets-finding' into 'master' ... fix: locate assets in hopefully all cases Closes #727 and #745 See merge request veloren/veloren!1347	2020-08-31 18:23:54 +00:00
Monty Marz	729910232d	Merge branch 'pfau/fix_orcs-add_inline_tweak' into 'master' ... Orcs adjustment and inline_tweak crate See merge request veloren/veloren!1348	2020-08-31 15:26:46 +00:00
Monty Marz	950baf68fc	orcs adjustment and inline_tweak crate ... Adjust female orc headsize add inline_tweak crate to voxygen and anim format cargo.toml alphabetically	2020-08-31 15:26:46 +00:00
Songtronix	af13a4161a	change(common): remove find_folder	2020-08-31 16:43:16 +02:00
Songtronix	c4a3d8853f	fix: locate assets in almost all cases	2020-08-31 10:25:45 +02:00
Joshua Yanovski	95b6d5e803	Further generalize the typed module. ... This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.	2020-08-31 05:59:44 +02:00
Marcel	61d047d43f	Merge branch 'vzikl/add-zh-translation' into 'master' ... Update to OpenSource Font - WQY-ZenHei & add zh_CN See merge request veloren/veloren!1304	2020-08-30 20:40:01 +00:00
VZIKL	e5760d3fd3	Update to OpenSource Font - WQY-ZenHei & add zh_CN	2020-08-30 20:40:01 +00:00
Marcel	439d1235eb	Merge branch 'easier_logging' into 'master' ... make logging easier and not as verbose on windows See merge request veloren/veloren!1344	2020-08-30 18:02:37 +00:00
Marcel	af10dc7661	make logging easier and not as verbose on windows	2020-08-30 18:02:37 +00:00
Imbris	125a9b9c30	Merge branch 'termac/hotbar_hotkey_fix' into 'master' ... small fix for handling hotbar hotkeys (fixes #687) Closes #687 See merge request veloren/veloren!1343	2020-08-29 20:32:07 +00:00
termac	2df76b5af4	small fix for handling hotbar hotkeys (fixes #687) ... Send an 'ChangeHotbarState' event when a hotbar slot is assigned via hotkey in the inventory.	2020-08-29 18:38:55 +02:00
Monty Marz	b33fadfcdf	Merge branch 'black-silence/fix-de-translation' into 'master' ... fix several DE translations See merge request veloren/veloren!1341	2020-08-28 19:42:23 +00:00
black silence	1e1e4a7890	fix several DE translations	2020-08-28 20:37:28 +02:00
Monty Marz	e58704fa74	Merge branch 'fix_text_overlap' into 'master' ... Fix overlapping text See merge request veloren/veloren!1340	2020-08-28 15:04:57 +00:00
Monty Marz	348f139e75	fix overlapping text	2020-08-28 16:10:50 +02:00
Joshua Yanovski	2b55b4eb6b	Merge branch 'sharp/sprite-config' into 'master' ... Move sprite data to a config file. See merge request veloren/veloren!1324	2020-08-28 08:30:50 +00:00
Joshua Yanovski	709c4d5ac6	Move sprite data to a config file.	2020-08-28 09:23:43 +02:00
Joshua Yanovski	03ca09e94e	Merge branch 'sharp/figure-mesh-background' into 'master' ... Move figure meshing to a background thread. See merge request veloren/veloren!1339	2020-08-28 04:14:54 +00:00
Joshua Yanovski	ae6174b43c	Move figure meshing to a background thread.	2020-08-28 05:25:31 +02:00
Marcel	49244f3560	Merge branch 'xMAC94x/fix_non_metrics_compile' into 'master' ... fix compiling without metrics See merge request veloren/veloren!1338	2020-08-27 08:19:52 +00:00
Marcel Märtens	0478fa9b38	fix compiling with metrics	2020-08-27 09:35:06 +02:00
Imbris	fe83c4c097	Merge branch 'imbris/small-fixes' into 'master' ... Fix a couple things See merge request veloren/veloren!1328	2020-08-27 01:54:11 +00:00
Imbris	c259f6cbde	Add State::read_component_copied	2020-08-26 20:47:41 -04:00
Imbris	039655997d	Fix broken features and avoid panic if the client leaves before character data loads	2020-08-26 20:47:39 -04:00
Marcel	7c76386fc6	Merge branch 'xMAC94x/reduce_metrics' into 'master' ... reduce load on metrics by ALOT! See merge request veloren/veloren!1337	2020-08-27 00:34:49 +00:00
Marcel Märtens	5a9a7b0236	reduce load on metrics by ALOT! ... - first remove participant AND channel in same metric. this caused a matrix full of 0 values which bloated alot. - then did the cid cache to be lazy loading to no longer generate that much 0 values - possible would also be no longer keeping metrics for INIT, HANDSHAKE and PARTICIPANTID	2020-08-27 01:55:13 +02:00
Marcel	8250b6612a	Merge branch 'xMAC94x/examples-cleanup' into 'master' ... Switch veloren_network over to use the official example layout. See merge request veloren/veloren!1336	2020-08-26 22:04:44 +00:00
Forest Anderson	129ecbe671	Merge branch 'scott-c/sound-effects-placeholder' into 'master' ... combat sfx See merge request veloren/veloren!1279	2020-08-26 12:52:11 +00:00
scott-c	fadfc4e846	Add combat sfx #647	2020-08-26 19:28:00 +08:00
Marcel Märtens	9f52800e5f	Switch veloren_network over to use the official example layout. ... adjusted those examples to run again created a CI TEST to always `check` examples fixed fmt in examples so that pipeline gets green	2020-08-26 10:07:22 +02:00
Marcel	39e105b7ac	Merge branch 'xMAC94x/compression' into 'master' ... Propper Compression support of network. See merge request veloren/veloren!1334	2020-08-25 22:21:05 +00:00
Marcel Märtens	b344e8d87c	Propper Compression support of network. ... - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct	2020-08-25 23:55:27 +02:00
Monty Marz	2022f52170	Merge branch 'pfau/nametag_height' into 'master' ... Nametag height See merge request veloren/veloren!1335	2020-08-25 20:43:02 +00:00
Monty Marz	c074c4eff7	fixed nametag height ... fmt fmt	2020-08-25 21:54:47 +02:00
Joshua Barretto	b2d6a08fe9	Merge branch 'zesterer/small-fixes' into 'master' ... Better world colours, better projectiles, better aiming, many other small improvements See merge request veloren/veloren!1332	2020-08-25 15:59:05 +00:00
Marcel	3403c5a710	Merge branch 'spelling' into 'master' ... Corrected some spelling errors See merge request veloren/veloren!1326	2020-08-25 12:21:25 +00:00
notoria	90b0012637	Corrected some spelling errors	2020-08-25 12:21:25 +00:00
Joshua Barretto	5f9208a45b	Handled 3d/2d sanity check bug	2020-08-25 12:54:30 +01:00
Joshua Barretto	7aacf23102	Addressed review issues	2020-08-25 11:01:17 +01:00
Joshua Barretto	73dcc7cd00	Improved single-tick projectile wall/entity collision bug	2020-08-25 00:04:04 +01:00
Marcel	ebab872bd1	Merge branch 'xMAC94x/lock-removal' into 'master' ... xmac94x/switch to more efficient Mutex locks See merge request veloren/veloren!1330	2020-08-24 21:26:51 +00:00
Joshua Barretto	a475357dba	Allowed small animals to block-hop again	2020-08-24 21:53:17 +01:00
Joshua Barretto	346dd951eb	Fixed quadruped hitboxes	2020-08-24 21:46:08 +01:00