Commit Graph

2914 Commits

Author SHA1 Message Date
Monty
49fcd6ee13 adjusted combo counter anim 2021-03-09 17:59:43 -05:00
Sam
940b4b5de7 Combo counter now uses outcomes. 2021-03-09 17:59:42 -05:00
Monty
c29cb037e7 better combo indicator animation 2021-03-09 17:59:41 -05:00
Sam
398370ca51 Changed lifesteal beam particles to look better.
Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.
2021-03-09 17:59:41 -05:00
Monty
53100b6f37 combo point display 2021-03-09 17:59:40 -05:00
Sam
c5f74e528d Animation for cast aura, combo information passed to skillbar. 2021-03-09 17:59:40 -05:00
Sam
b6f4543a14 Fixed beam offsets, told healing beam to use beam animation. 2021-03-09 17:59:40 -05:00
Sam
c6a222340e Particles for lifesteal beam. Changed how frontend recognized beams. 2021-03-09 17:59:39 -05: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
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
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
Adam Blanchet
16b66f9cd6 Add reset button to graphics settings 2021-03-08 18:48:38 +01:00
Marcel Märtens
f353f14703 change Name from VSystem to System 2021-03-08 13:15:00 +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
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
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
Joshua Barretto
36d20e6990 Better docs, faster terrain meshing 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
db573f6b2d Turn giant trees into proper sites 2021-03-07 14:25:07 +00:00
Monty
b6ac4e46fb tree icon UI works and hover icon 2021-03-07 14:25:07 +00:00
Joshua Barretto
862cd5fe49 fmt 2021-03-07 14:25:03 +00:00
Joshua Barretto
a229d65932 Static light improvements, fixed lighting update bug 2021-03-07 14:25:02 +00:00
Joshua Barretto
120cb86c0d Switched back to simd repr 2021-03-07 14:25:02 +00:00
Joshua Barretto
427e0af73c Reverted to repr_c vek 2021-03-07 14:25:02 +00:00
Joshua Barretto
1d16f14dd5 Small fixes 2021-03-07 14:25:02 +00:00
Joshua Barretto
f537f82b17 Updated vek, fixed house wall bugs 2021-03-07 14:25:02 +00:00
Joshua Barretto
7b807ed34c Removed dead code 2021-03-07 14:25:02 +00:00
Monty
8214c9df82 PoI icon 2021-03-07 14:25:01 +00:00
Joshua Barretto
717bbbf23e Better static light propagation between translucent objects 2021-03-07 14:25:01 +00:00
Joshua Barretto
9e09c96a2a Fixed static light directionality 2021-03-07 14:25:01 +00:00
Joshua Barretto
31832e1245 Fixed wall leaking with dynamic light ambiance 2021-03-07 14:25:01 +00:00
Joshua Barretto
aabe1d7cfd Point light ambiance for less harsh shadows 2021-03-07 14:25:01 +00:00
Joshua Barretto
100cafa91b Directional baked lights for figures 2021-03-07 14:25:01 +00:00
Joshua Barretto
6fc7d2a906 Faster More interesting giant trees, better oaks, hives on branches 2021-03-07 14:25:01 +00:00
Joshua Barretto
7d526da735 Experimental giant mother trees 2021-03-07 14:25:01 +00:00
Sarra
db3bc1b9bb added a white firework 2021-03-07 03:48:50 -05:00
Imbris
575301c763 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
cb305536e8 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
fb953cc7f4 implement the new skilltree icons 2021-03-04 18:37:32 +00:00
Marcel
a68afa1fad 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
2dd7089e52 Bring vek up to date so we can bump rustc (hopefully). 2021-03-04 05:46:59 +01:00
Avi Weinstock
0472956b5c Allow using stack splitting into or out of a trade. 2021-03-03 18:19:10 -05:00
Lippy13
d9d3c1f55b Make the BuffKind match expression exhaustive 2021-03-03 21:10:41 +00:00
Lippy13
59594a8b60 Check if duration exists instead of defaulting to zero and clean up code 2021-03-03 20:39:14 +00:00
Marcel Märtens
a55ec20c74 fix #46 🥳 2021-03-03 12:37:09 +01:00
Lippy13
48f974bf01 Address comments on passing effects 2021-03-03 00:25:15 +00:00