2908 Commits

Author SHA1 Message Date
Marcel Märtens
e848bac228 update specs to get rid of old deps 2021-03-10 13:22:17 +01:00
Bryan Quigley
b2d4f9332c Stop requiring specfici euc version (was done to hold back vek version)
Then ran cargo update
2021-03-09 15:53:24 -08:00
Marcel Märtens
51cf530877 update dependencies, including removal of some tracy deps as they are get through common/tracy 2021-03-09 20:17:29 +01:00
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
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
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
Adam Blanchet
5884530486 Add reset button to graphics settings 2021-03-08 18:48:38 +01:00
Marcel Märtens
7c3d5d04ba change Name from VSystem to System 2021-03-08 13:15:00 +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
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
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
Joshua Barretto
7b0b410b4f Better docs, faster terrain meshing 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
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
65bd1a4ad1 fmt 2021-03-07 14:25:03 +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
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
57844df18d Removed dead code 2021-03-07 14:25:02 +00:00
Monty
80454d005a PoI icon 2021-03-07 14:25:01 +00:00
Joshua Barretto
afddd76ce2 Better static light propagation between translucent objects 2021-03-07 14:25:01 +00:00
Joshua Barretto
a3b47fa288 Fixed static light directionality 2021-03-07 14:25:01 +00:00
Joshua Barretto
bbcf881349 Fixed wall leaking with dynamic light ambiance 2021-03-07 14:25:01 +00:00
Joshua Barretto
43f5e86884 Point light ambiance for less harsh shadows 2021-03-07 14:25:01 +00:00
Joshua Barretto
e01f33a121 Directional baked lights for figures 2021-03-07 14:25:01 +00:00
Joshua Barretto
abef0960ac Faster More interesting giant trees, better oaks, hives on branches 2021-03-07 14:25:01 +00:00
Joshua Barretto
54bb6484e8 Experimental giant mother trees 2021-03-07 14:25:01 +00:00
Sarra
7df4371ccd added a white firework 2021-03-07 03:48:50 -05:00
Imbris
f48a522e07 Merge branch 'Quibble/item-buff-tooltips' into 'master'
Tooltips use item stats for buff information

See merge request veloren/veloren!1820
2021-03-05 22:00:24 +00:00
Marcel
a7ecd8e180 Merge branch 'vfoulon80/skilltree-icons' into 'master'
implement the new skilltree icons

See merge request veloren/veloren!1794
2021-03-04 18:37:33 +00:00
Vincent Foulon
4b23a3b307 implement the new skilltree icons 2021-03-04 18:37:32 +00:00
Marcel
faeacb8ce2 Merge branch 'aweinstock/stack-trading' into 'master'
Allow using stack splitting into or out of a trade.

See merge request veloren/veloren!1850
2021-03-04 14:34:05 +00:00
Joshua Yanovski
e7cd5fedf4 Bring vek up to date so we can bump rustc (hopefully). 2021-03-04 05:46:59 +01:00
Avi Weinstock
33bed4a2ad Allow using stack splitting into or out of a trade. 2021-03-03 18:19:10 -05:00
Lippy13
4f9b365c20 Make the BuffKind match expression exhaustive 2021-03-03 21:10:41 +00:00
Lippy13
310c4b655d Check if duration exists instead of defaulting to zero and clean up code 2021-03-03 20:39:14 +00:00
Marcel Märtens
d7a4bae537 fix #46 🥳 2021-03-03 12:37:09 +01:00
Lippy13
05e25ba31f Address comments on passing effects 2021-03-03 00:25:15 +00:00
Lippy13
c1642d0408 Account for no duration being possible 2021-03-03 00:25:14 +00:00
Lippy13
7b136feeb3 Fix Clippy errors
Fix code formatting

Add descriptions for other potential buffs for consumables
2021-03-03 00:25:13 +00:00
Lippy13
cad852c9e1 Add buff information to item tooltips 2021-03-03 00:25:11 +00:00
Snowram
8b6688581a Fixes light offset for objects 2021-03-02 19:28:33 +01:00
ccgauche
2bb54137a0 Merge branch 'master' into 'ccgauche/plugin-player-join-event'
# Conflicts:
#   CHANGELOG.md
2021-03-02 09:45:15 +00:00
Justin Shipsey
c9e8302cda Merge branch 'armor-org' into 'master'
armor org

See merge request veloren/veloren!1835
2021-03-02 01:29:46 +00:00