6912 Commits

Author SHA1 Message Date
Marcel
86e663c4e7 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
0195d8031f 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
0b54cc5b78 Updated strings Added missing translations in Spanish es_ES and retrieving localized text 2021-03-09 12:30:53 +01:00
Marcel
61e472dcbc 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
1fd0e15e29 get rid of a lazy_static and update agent multithreaded metrics 2021-03-09 11:52:57 +01:00
Marcel
2b2ac2da05 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
e9357e1dd6 Add critical chance and critical multiplier stats to weapons. 2021-03-08 23:27:25 -05:00
Marcel Märtens
c0129b0505 Move Specs code to own common_ecs create, put tracy and macros into common_base 2021-03-09 00:54:01 +01:00
Marcel
0affdaab82 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
5884530486 Add reset button to graphics settings 2021-03-08 18:48:38 +01:00
Marcel
23f61a8216 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
7c3d5d04ba change Name from VSystem to System 2021-03-08 13:15:00 +01:00
Joshua Barretto
45aec73dd5 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
e527d443f4 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
1876db56ae 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
7a47c6e19f 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
ccb696d661 Addressed pine tree criticism by improving generation 2021-03-08 10:51:06 +00:00
Marcel Märtens
77aa787b94 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
42cabd369c 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
801a4a9f0f First commit 2021-03-07 22:32:52 +01:00
Marcel
a7562e975e 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
2240c3cb29 Merge branch 'zesterer/worldgen' into 'master'
Worldgen Improvements

See merge request veloren/veloren!1768
2021-03-07 18:01:00 +00:00
Joshua Barretto
0a5838a5be Updated lockfile dependencies 2021-03-07 16:55:58 +00:00
Joshua Barretto
7b8ea9578d Updated changelog 2021-03-07 14:25:33 +00:00
Joshua Barretto
7b0b410b4f Better docs, faster terrain meshing 2021-03-07 14:25:07 +00:00
Joshua Barretto
34f98e7d4b Fixed snow biome trees 2021-03-07 14:25:07 +00:00
Joshua Barretto
081b290b45 Fixed clippy warnings and fmt 2021-03-07 14:25:07 +00:00
Joshua Barretto
4b2c7c9dbc Better tree names 2021-03-07 14:25:07 +00:00
Synis
73e1b1d7ca More work on castles 2021-03-07 14:25:07 +00:00
Synis
83a56e0062 Basic Castle Wall 2021-03-07 14:25:07 +00:00
Joshua Barretto
6790327b90 Better giant tree spawn rate 2021-03-07 14:25:07 +00:00
Joshua Barretto
71fdf0e333 Turn giant trees into proper sites 2021-03-07 14:25:07 +00:00
Monty
465bb9cb0f tree icon UI works and hover icon 2021-03-07 14:25:07 +00:00
Joshua Barretto
67f085d948 Added tree map icon 2021-03-07 14:25:05 +00:00
Joshua Barretto
144b8bbcda Brick fill 2021-03-07 14:25:04 +00:00
Joshua Barretto
6266e13614 Better Fill type 2021-03-07 14:25:03 +00:00
Joshua Barretto
b0951c972b Better paths 2021-03-07 14:25:03 +00:00
Joshua Barretto
8601cfe2a6 Fewer fields 2021-03-07 14:25:03 +00:00
Joshua Barretto
db79fefede Fixed plazas, buggy willow trees 2021-03-07 14:25:03 +00:00
Joshua Barretto
65bd1a4ad1 fmt 2021-03-07 14:25:03 +00:00
Joshua Barretto
1a55540493 Switched to 6x6 tiles, more natural paths 2021-03-07 14:25:02 +00:00
Joshua Barretto
9b7ec491bb Static light improvements, fixed lighting update bug 2021-03-07 14:25:02 +00:00
Joshua Barretto
05ad45518f Switched back to simd repr 2021-03-07 14:25:02 +00:00
Joshua Barretto
5e6906a3df Static light flickering 2021-03-07 14:25:02 +00:00
Joshua Barretto
e86d6318ec Reverted to repr_c vek 2021-03-07 14:25:02 +00:00
Joshua Barretto
46f1eadf10 Small fixes 2021-03-07 14:25:02 +00:00
Joshua Barretto
b217e89b30 Updated vek, fixed house wall bugs 2021-03-07 14:25:02 +00:00
Joshua Barretto
5ec57101e5 Fixed more silly issues 2021-03-07 14:25:02 +00:00
Joshua Barretto
3dec950c5d Fixed stupid generation bugs, made houses more interesting 2021-03-07 14:25:02 +00:00
Joshua Barretto
31cc6cbe2a More plot generation work 2021-03-07 14:25:02 +00:00