PersianKnight
42d57ccb92
The appearance of the reset buttons has improved.
2021-03-13 17:42:52 +03:30
PersianKnight
e3c0ceb9fa
Fixed Toggle Debug Info from Settings
2021-03-13 17:38:34 +03:30
Imbris
8d0b776f18
Move server-cli commands to separate file, tracy profiling par_join improvements, misc improvements
...
- remove overwritten logging setting in server-cli
- add server-cli command to load a random area for testing without a client
- make admin add/remove commands modify ingame players instead of needing to reconnect
- add spans to par_join jobs
- added test command that loads up an area of the world
- add tracy-world-server alias
- set debug directives to info for logging
2021-03-13 02:28:59 -05:00
Samuel Keiffer
4022937da7
Merge branch 'PersianKnight/InterfaceSettings' into 'master'
...
Separated InterfaceSettings from GameplaySettings
See merge request veloren/veloren!1887
2021-03-13 01:55:18 +00:00
DaforLynx
99261bf105
Many small changes to audio code, mainly sfx - changelog in MR
2021-03-12 15:00:09 -08:00
PersianKnight
dcb32a7ff1
Separated InterfaceSettings from GameplaySettings
2021-03-12 22:45:44 +03:30
jshipsey
49f496e290
intitial values
2021-03-12 00:58:12 -05:00
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
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
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
Lippy13
a7c30b6721
Account for no duration being possible
2021-03-03 00:25:14 +00:00
Lippy13
ffd0c01bbd
Fix Clippy errors
...
Fix code formatting
Add descriptions for other potential buffs for consumables
2021-03-03 00:25:13 +00:00
Lippy13
5e3a1b203f
Add buff information to item tooltips
2021-03-03 00:25:11 +00:00
ccgauche
7f4411ba1f
Merge branch 'master' into 'ccgauche/plugin-player-join-event'
...
# Conflicts:
# CHANGELOG.md
2021-03-02 09:45:15 +00:00
Ben Wallis
0f7ff21c20
Merge branch 'item-stacking-and-splitting' into 'master'
...
Implement stacking and splitting
Closes #904
See merge request veloren/veloren!1802
2021-03-02 00:08:47 +00:00
Jesus Bracho
c0573cca44
Implement stacking and splitting
2021-03-02 00:08:46 +00:00
heydabop
bfc82f7236
Fixes #974 - convert tool/weapon equip time to floating point seconds
2021-03-01 15:06:39 -06:00
ccgauche
9628dfaf99
Fixed comments
2021-03-01 21:29:18 +01:00
ccgauche
dbd4d70b79
Lots of improvement in pointer management (switched from i32 to u64) + New event implemented
2021-03-01 19:00:44 +01:00
Samuel Keiffer
0497a437a4
Merge branch 'sam/invulnerability-buff' into 'master'
...
Invulnerability Buff
Closes #965
See merge request veloren/veloren!1834
2021-03-01 05:46:46 +00:00
Samuel Keiffer
537efdd47e
Merge branch 'aweinstock/trade-requestitem' into 'master'
...
During a trade, allow requesting items from the counterparty's inventory...
See merge request veloren/veloren!1829
2021-03-01 02:39:36 +00:00
Sam
6ab4e2264e
Buff icon
2021-02-28 17:31:35 -05:00
Sam
531c38c3ad
Factored formatting of buff text out to a single function.
2021-02-28 16:04:33 -05:00
Sam
a88ad7b971
Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.
2021-02-28 15:02:03 -05:00
Imbris
b7bd0306e6
Merge branch 'Lerg/Issue_#976' into 'master'
...
Issue #976 Some inputs are missing the ability to be rebound
See merge request veloren/veloren!1832
2021-02-28 18:23:30 +00:00
Justin Shipsey
13df691f69
Merge branch 'heydabop/966-controller-y-invert' into 'master'
...
#966 - Setting to invert controller Y axis
See merge request veloren/veloren!1817
2021-02-28 18:02:04 +00:00
Lerg
94bd1f2605
Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator
2021-02-28 19:02:32 +03:00
Avi Weinstock
7e458ecd40
During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).
2021-02-28 10:13:49 -05:00
Samuel Keiffer
cb267ac3ee
Merge branch 'sam/combo-comp' into 'master'
...
Combo now persists as a compnent, rather than a field on a state
See merge request veloren/veloren!1828
2021-02-28 02:42:40 +00:00
Sam
b25a376995
Re-allowed for what stage you were on to persist through a roll
2021-02-27 19:24:18 -05:00
Sam
404c7f0905
Combo melee now checks combo
2021-02-27 18:24:28 -05:00
Snowram
7f2276324e
Reduces the instances of f64 in anims
2021-02-27 23:21:03 +01:00
jshipsey
b4627dfe19
look-based anims
2021-02-27 16:19:33 -05:00
Monty Marz
e5273e3a8e
reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button
2021-02-27 19:02:26 +00:00
Justin Shipsey
d2fffa1a92
Merge branch 'slipped/gremlins' into 'master'
...
dungeon enemy overhaul part 1
See merge request veloren/veloren!1697
2021-02-27 17:00:52 +00:00
Samuel Keiffer
fa809fc292
Merge branch 'Lerg/Accumulate_Damage_Floaters' into 'master'
...
Issue #836 - Declutter the scrolling combat text
See merge request veloren/veloren!1823
2021-02-27 16:18:18 +00:00
Lerg
3fe5f4484e
Issue #836 - Declutter the scrolling combat text
2021-02-27 15:10:47 +03:00
Sam
238fcaf5f1
Particle rebase fixes
2021-02-27 01:42:47 -05:00