Marcel
c0f63b11c5
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
e848bac228
update specs to get rid of old deps
2021-03-10 13:22:17 +01:00
Marcel
211e717ead
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
276e408786
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
0e5f63735b
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
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
Avi Weinstock
ad31b40aea
Validate starting item and body type server-side.
2021-03-09 18:28:25 -05:00
Sam
a452aff112
Made migration more explicit in what skills it targeted, instead of using a LIKE query.
2021-03-09 18:03:12 -05: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
Sam
8586121cfc
Beam particle tweaks
2021-03-09 17:59:43 -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
Sam
5772757f7a
Basic beam now generates combo. Healing beam now consumes combo, and requires combo to heal.
2021-03-09 17:59:33 -05:00
Sam
3ee05be147
Added healing beam character state.
...
This was done as there was a lot of special casing in basic beam to account for healing.
2021-03-09 17:58:20 -05:00
Sam
f23c5db806
New abilities for sceptre are done
2021-03-09 17:56:38 -05:00
Marcel
bd73740515
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
734891738f
Moved back register to a system
2021-03-09 21:16:23 +01: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
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
