Marcel
93cab075f8
Merge branch 'xMAC94x/non_blocking_register' into 'master'
...
Auth requests are now done async, the register system is fetching it, via a PendingLogin component
See merge request veloren/veloren!1875
2021-03-11 21:51:55 +00:00
Joshua Barretto
a9bcaf0a37
Merge branch 'PersianKnight/Reset_to_Defaults_Buttons' into 'master'
...
Add Reset to Default Buttons for Interface, Gameplay and Sound Settings
See merge request veloren/veloren!1877
2021-03-11 21:29:11 +00:00
PersianKnight
3b3ffe30e9
Add Reset to Default Buttons for Interface, Gameplay and Sound Settings
2021-03-11 22:09:30 +03:30
Joshua Barretto
f479231b15
Merge branch 'glowy-shiny-pretty' into 'master'
...
Glowy shiny pretty
See merge request veloren/veloren!1874
2021-03-11 17:37:33 +00:00
Samuel Keiffer
9b198b5cda
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
Marcel Märtens
728bff610b
Allow HTTP auth servers again.
...
only `localhost` are allowed in a release build.
when debug assertions are on, others are also allowed.
This change undoes the changes to the settings, so compared to master, there is no effect
2021-03-11 17:24:52 +01:00
Marcel Märtens
381bb5eef0
fix tracy
2021-03-11 17:05:17 +01:00
Marcel Märtens
a98e72c391
Auth requests are now done async, the register system is fetching it, via a PendingLogin component
...
The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without.
correct is now `auth.veloren.net`
incorrect is: `https://auth.veloren.net `
2021-03-11 17:05:02 +01:00
Joshua Barretto
6e0807f3f5
Cheaper and less broken material reflection/glow
2021-03-11 13:56:11 +00:00
omm
ef7b215f07
File structure for lang es_ES aligned with EN
2021-03-11 12:08:37 +00:00
Joshua Barretto
09e32cb952
Initial implementation of glow/shininess
2021-03-10 18:58:25 +00:00
Marcel Märtens
b151a246c3
update specs to get rid of old deps
2021-03-10 13:22:17 +01:00
Bryan Quigley
506adb4eec
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
de5ef03ac4
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
16222948a3
Sceptre skill tree and migration.
2021-03-09 18:02:07 -05:00
Sam
c13e84aff5
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
d711c77468
Aura particles.
2021-03-09 17:59:45 -05:00
Monty Marz
935aec743d
cleanup, icons
2021-03-09 17:59:45 -05:00
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
