6930 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcel	a3d54e908e	Merge branch 'xMAC94x/terrain_stream' into 'master' ... Transport ChunkRequests and Chunkupdates in a own stream. See merge request veloren/veloren!1876	2021-03-11 15:46:51 +00:00
Marcel Märtens	f8b7d96066	git push -fTransport ChunkRequests and Chunkupdates in a own stream. ChunkUpdates are very big and having them in a own stream, helps slow clients to keep up with entity syncs and ... lagging a bit behind on terrain. Which is fine. Block Places and Block Pickup are not handled in this stream, as they go through the standart route of event handling.	2021-03-11 14:50:46 +01:00
Marcel	19a792228c	Merge branch 'oriolmm/file_structure_es_ES_aligned' into 'master' ... File structure for lang es_ES aligned with EN See merge request veloren/veloren!1872	2021-03-11 12:08:37 +00:00
omm	ef7b215f07	File structure for lang es_ES aligned with EN	2021-03-11 12:08:37 +00:00
Marcel	3a7ff55dc0	Merge branch 'ccgauche/improved-retrieve-system' into 'master' ... Improved retrieve system to allow write components to be used + Reintroduced get_player_name See merge request veloren/veloren!1873	2021-03-11 00:13:54 +00:00
ccgauche	2cbbff7fb9	Fixed clippy	2021-03-10 21:10:08 +01:00
ccgauche	908cf16090	Delete veloren_plugin_template.plugin.tar	2021-03-10 19:37:24 +01:00
ccgauche	67b24294d6	Change Ecs access system to allow write accesses to be used + reintroduced get_player_name	2021-03-10 19:36:53 +01:00
Marcel	cf46ce70cf	Merge branch 'xMAC94x/update-specs' into 'master' ... update specs to get rid of old deps See merge request veloren/veloren!1871	2021-03-10 13:14:23 +00:00
Marcel Märtens	b151a246c3	update specs to get rid of old deps	2021-03-10 13:22:17 +01:00
Marcel	39f5e969ba	Merge branch 'update_deps' into 'master' ... Stop required euc version (was done to hold back vek version) See merge request veloren/veloren!1870	2021-03-10 02:28:44 +00:00
Marcel	524ded586d	Merge branch 'aweinstock/validate-char-create' into 'master' ... Validate starting item and body type server-side. See merge request veloren/veloren!1869	2021-03-10 01:42:42 +00:00
Marcel	81959c0a89	Merge branch 'ccgauche/move-back-register-to-system' into 'master' ... Moved back register to a system See merge request veloren/veloren!1868	2021-03-10 00:56:33 +00:00
Bryan Quigley	506adb4eec	Stop requiring specfici euc version (was done to hold back vek version) ... Then ran cargo update	2021-03-09 15:53:24 -08:00
Avi Weinstock	f64c29f09d	Validate starting item and body type server-side.	2021-03-09 18:28:25 -05:00
Marcel	afbc810b3e	Merge branch 'xMAC94x/update_deps' into 'master' ... update dependencies, including removal of some tracy deps as they are get through common/tracy See merge request veloren/veloren!1867	2021-03-09 20:42:00 +00:00
ccgauche	10e5620642	Moved back register to a system	2021-03-09 21:16:23 +01:00
Marcel Märtens	d7df741671	update dependencies, including removal of some tracy deps as they are get through common/tracy	2021-03-09 20:17:29 +01:00
Marcel	ee0ab197da	Merge branch 'updated_spanish_es_strings' into 'master' ... Updated strings Added missing translations in Spanish es_ES and retrieving localized text See merge request veloren/veloren!1866	2021-03-09 12:59:03 +00:00
Marcel	f6028f4ae3	Merge branch 'xMAC94x/metrics_fixes' into 'master' ... get rid of a lazy_static and update agent multithreaded metrics See merge request veloren/veloren!1865	2021-03-09 12:59:00 +00:00
tukilo	cea895ea24	Updated strings Added missing translations in Spanish es_ES and retrieving localized text	2021-03-09 12:30:53 +01:00
Marcel	d229ab1eb9	Merge branch 'aweinstock/critical-stats' into 'master' ... Add critical chance and critical multiplier stats to weapons. See merge request veloren/veloren!1864	2021-03-09 10:55:36 +00:00
Marcel Märtens	77dea4980c	get rid of a lazy_static and update agent multithreaded metrics	2021-03-09 11:52:57 +01:00
Marcel	8c868aebc7	Merge branch 'xMAC94x/common_ecs' into 'master' ... Move Specs code to own common_ecs create, put tracy and macros into common_base See merge request veloren/veloren!1863	2021-03-09 09:48:53 +00:00
Avi Weinstock	d8f0a1c426	Add critical chance and critical multiplier stats to weapons.	2021-03-08 23:27:25 -05:00
Marcel Märtens	4ebfbdde0f	Move Specs code to own common_ecs create, put tracy and macros into common_base	2021-03-09 00:54:01 +01:00
Marcel	19d55b1da3	Merge branch 'Frinksy/reset-button' into 'master' ... Add reset button to graphics settings See merge request veloren/veloren!1861	2021-03-08 22:46:18 +00:00
Adam Blanchet	16b66f9cd6	Add reset button to graphics settings	2021-03-08 18:48:38 +01:00
Marcel	8c1ac78ce3	Merge branch 'xMAC94x/advanced_systems' into 'master' ... Implement a VSystem trait that can be implemented by Systems. See merge request veloren/veloren!1858	2021-03-08 13:01:44 +00:00
Marcel Märtens	f353f14703	change Name from VSystem to System	2021-03-08 13:15:00 +01:00
Joshua Barretto	5f15037679	Merge branch 'zesterer/worldgen' into 'master' ... Addressed pine tree criticism by improving generation See merge request veloren/veloren!1859	2021-03-08 10:52:51 +00:00
Marcel Märtens	989d130692	update state to system name. This will break grafana boards and thus needs an adjustment	2021-03-08 11:51:18 +01:00
Marcel Märtens	ea94ca6656	switch server to the new Registry struct, this gets rid of RegistryFn pattern and simplyfies stuff, its a result of the Prometheus-tracy crate	2021-03-08 11:51:16 +01:00
Marcel Märtens	6b88545481	restructure server metrics ... - get rid of old SysTimers for each system in favour of VSystem tracking - move metrics generation from lib.rs to own system - code cleanup - remove time tracking in common::sys	2021-03-08 11:51:13 +01:00
Joshua Barretto	549f89f590	Addressed pine tree criticism by improving generation	2021-03-08 10:51:06 +00:00
Marcel Märtens	c515fece28	Implement a VSystem trait that can be implemented by Systems. ... It will autodo some things, like track start and time and export those in system metrics Add a origin and implement it for all Systems in Veloren	2021-03-08 11:51:04 +01:00
Marcel	b7079b454c	Merge branch 'ccgauche/moved-plugins-ecs' into 'master' ... Improved ECS system for plugins to enable async execution of plugins in systems See merge request veloren/veloren!1857	2021-03-07 23:00:07 +00:00
ccgauche	89774980b4	First commit	2021-03-07 22:32:52 +01:00
Marcel	e29964ead1	Merge branch 'sarrakitty/fireworks' into 'master' ... added a white firework See merge request veloren/veloren!1856	2021-03-07 18:37:35 +00:00
Marcel	52cfc2f301	Merge branch 'zesterer/worldgen' into 'master' ... Worldgen Improvements See merge request veloren/veloren!1768	2021-03-07 18:01:00 +00:00
Joshua Barretto	e42be14a37	Updated lockfile dependencies	2021-03-07 16:55:58 +00:00
Joshua Barretto	e4e512a5d7	Updated changelog	2021-03-07 14:25:33 +00:00
Joshua Barretto	36d20e6990	Better docs, faster terrain meshing	2021-03-07 14:25:07 +00:00
Joshua Barretto	9910398917	Fixed snow biome trees	2021-03-07 14:25:07 +00:00
Joshua Barretto	911acdd9db	Fixed clippy warnings and fmt	2021-03-07 14:25:07 +00:00
Joshua Barretto	0cbdc2b1b7	Better tree names	2021-03-07 14:25:07 +00:00
Synis	c35780d05b	More work on castles	2021-03-07 14:25:07 +00:00
Synis	f7f7f12a38	Basic Castle Wall	2021-03-07 14:25:07 +00:00
Joshua Barretto	eff9fc5393	Better giant tree spawn rate	2021-03-07 14:25:07 +00:00
Joshua Barretto	db573f6b2d	Turn giant trees into proper sites	2021-03-07 14:25:07 +00:00