2923 Commits

Author SHA1 Message Date
Samuel Keiffer
5e5ec967d1 Merge branch 'sam/sceptre-overhaul' into 'master'
Overhaul sceptre

Closes #768

See merge request veloren/veloren!1845
2021-03-11 16:47:50 +00:00
omm
22eb7438e0 File structure for lang es_ES aligned with EN 2021-03-11 12:08:37 +00:00
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
Sam
472a665826 Auras will now refresh buffs if a buff was already present that had a lesser duration.
Attack effects can now have multiple requirements.
Fix for sceptre heal not requiring energy.
Nerfed warding aura protection.
Added icon for warding aura.
Changelog.
2021-03-09 18:03:06 -05:00
Sam
0f1f8c89f5 Sceptre skill tree and migration. 2021-03-09 18:02:07 -05:00
Sam
22f81e4df3 Aura duration separated from cast duration in aura state
Healing beam now requires combo > 0 to enter character state
Removed last vestiges of old sceptre abilities
Combo extended to most other attacks
Cast aura state renamed to basic aura
2021-03-09 18:02:00 -05:00
Sam
be2f8ac6b8 Aura particles. 2021-03-09 17:59:45 -05:00
Monty Marz
2bd4cbd3e3 cleanup, icons 2021-03-09 17:59:45 -05:00
Monty
ba534f1548 adjusted combo counter anim 2021-03-09 17:59:43 -05:00
Sam
981405d731 Combo counter now uses outcomes. 2021-03-09 17:59:42 -05:00
Monty
9f443aea8e better combo indicator animation 2021-03-09 17:59:41 -05:00
Sam
1a2824344b 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
7d73ecf3f1 combo point display 2021-03-09 17:59:40 -05:00
Sam
3778999987 Animation for cast aura, combo information passed to skillbar. 2021-03-09 17:59:40 -05:00
Sam
228ea3beca Fixed beam offsets, told healing beam to use beam animation. 2021-03-09 17:59:40 -05:00
Sam
2293a2a064 Particles for lifesteal beam. Changed how frontend recognized beams. 2021-03-09 17:59:39 -05: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