3168 Commits

Author SHA1 Message Date
Ben Wallis
d0108fe32b Added client/server version mismatch message when a network error is encountered during client init.
Added warning banner on character select when successfully connected to a server with a mismatched version.
2021-04-24 09:08:30 +01:00
Joshua Barretto
58d5eb7748 Fixed broken crafting sprite requirement 2021-04-22 12:30:48 +01:00
jshipsey
414c47a402 comments 2021-04-22 00:04:39 -04:00
jshipsey
4500e2a4ca formatting 2021-04-22 00:04:39 -04:00
jshipsey
6d31e9ad84 fix for 1h on back 2021-04-22 00:04:39 -04:00
jshipsey
d47dc7c49e remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
Imbris
fcfb1f325a Revert "Merge branch 'revert-b10718c5' into 'master'"
This reverts merge request !2172
2021-04-21 17:10:13 +00:00
Joshua Barretto
580e99b968 Merge branch 'zesterer/lanterns' into 'master'
Made characters carry lanterns higher when possible

See merge request veloren/veloren!2169
2021-04-21 16:40:20 +00:00
Joshua Barretto
1c225ff449 Improve dynamic light reflection for hill climbing 2021-04-21 17:10:53 +01:00
Joshua Barretto
2bc0699f97 Improvements to lantern holding when sitting 2021-04-21 16:54:03 +01:00
Joshua Barretto
9e87da7a18 Made characters carry lanterns higher when possible 2021-04-21 15:59:29 +01:00
Imbris
b90b62fcc1 Revert "Merge branch 'imbris/agent-opt' into 'master'"
This reverts merge request !2024
2021-04-21 14:10:06 +00:00
Imbris
1ab842523d Rename common-sys to common-systems and rearrange common-state slightly 2021-04-20 15:25:04 -04:00
Ludvig Böklin
99d6cc04db Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
Joshua Barretto
66460584e7 Made crafting UI check exact crafting sprite 2021-04-20 15:23:52 +01:00
Monty Marz
7de0becc0d clippy 2021-04-20 02:48:17 +02:00
Monty
c40bd37452 more sprite stuff and crafting UI update
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Joshua Barretto
cf33cc8704 Prevent crafting without station 2021-04-20 02:46:05 +02:00
Monty
afea896b5b fmt, add sprites 2021-04-20 02:46:04 +02:00
Joshua Barretto
b605048ae3 Added crafting stations 2021-04-20 02:45:59 +02:00
Marcel Märtens
05d0eb9db4 seperate sys/state 2021-04-20 01:30:17 +02:00
Imbris
0f10b75130 Merge branch 'capucho/inactive-master' into 'master'
Lower volume of window on focus loss

See merge request veloren/veloren!2150
2021-04-19 20:39:49 +00:00
João Capucho
bd76302660
Voxygen: Allow zoom on minimap with kbd 2021-04-19 20:26:54 +01:00
João Capucho
ae99ed0ade
Voxygen: Add master volume sliders to the settings 2021-04-19 19:58:14 +01:00
João Capucho
6cb6b2aa8d
Voxygen: Add support for map zoom with keybind 2021-04-19 11:56:58 +01:00
João Capucho
476742d72a
Voxygen: Add inactive window volume 2021-04-19 10:24:31 +01:00
João Capucho
59032b69c9
Voxygen: Update ambient channels volume 2021-04-19 10:24:28 +01:00
João Capucho
9b3de8088a
Voxygen: Use the master volume setting 2021-04-19 10:20:42 +01:00
Samuel Keiffer
12cc4cb29f Merge branch 'capucho/stop-ambient' into 'master'
Stop ambient sounds on logout

See merge request veloren/veloren!2151
2021-04-18 23:38:10 +00:00
Sam
b0d9a3b4ba Overhauled dash melee. 2021-04-18 18:36:12 -04:00
João Capucho
61edb30808
Voxygen: Stop ambient sounds on logout 2021-04-18 21:35:43 +01:00
Avi Weinstock
b16d97b39c Unlock dodge roll iframes and staff explosion by default. 2021-04-18 16:16:06 -04:00
Samuel Keiffer
e2bb44a70b Merge branch 'xvar/inventory-sorting' into 'master'
Implemented inventory sorting

See merge request veloren/veloren!2141
2021-04-17 22:57:56 +00:00
Ben Wallis
07e6f8fbd9 Implemented inventory sorting 2021-04-17 22:04:08 +01:00
Yusuf Bera Ertan
84a7f666c2
build(nix): switch to nix-cargo-integration 2021-04-17 21:37:57 +03:00
Yusuf Bera Ertan
33c00839e9
build: use git keyboard-keynames to fix nix build error 2021-04-17 21:37:22 +03:00
Imbris
8b41409227 Use separate crate to compile anim as a cdylib to avoid compiling both all the time and improve voxygen pipelining 2021-04-16 21:58:59 -04:00
Samuel Keiffer
8a83b00e78 Merge branch 'DaforLynx/normalize' into 'master'
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds

See merge request veloren/veloren!2120
2021-04-16 00:35:15 +00:00
DaforLynx
4d74fe9d7c Normalize + shrink all sfx; tweaks to combat music; change footstep sounds 2021-04-16 00:35:13 +00:00
Samuel Keiffer
a62598c62c Merge branch 'gGmMsS/Burning' into 'master'
Added burning debuff for Staff M2

See merge request veloren/veloren!2134
2021-04-15 23:51:33 +00:00
Imbris
0a44ec852a Merge branch 'aweinstock/server-authoritative-physics' into 'master'
Aweinstock/server authoritative physics

See merge request veloren/veloren!2126
2021-04-15 22:24:00 +00:00
gGmMsS123
191d60266a m2 staff 2021-04-16 00:48:20 +03:00
gGmMsS123
90a47a20ea M2 Staff Final Touch 2021-04-16 00:34:24 +03:00
Ben Wallis
f0ab4bbb28 Fixed miscount in Overitem::prim_count causing the tutorial button to fly around when multiple overitem texts are drawn 2021-04-15 21:45:09 +01:00
gGmMsS123
db8d189ebd Added burning debuff for Staff M2 2021-04-15 23:34:28 +03:00
Justin Shipsey
b4757616f6 Merge branch 'slipped/changes' into 'master'
combat tweaks

See merge request veloren/veloren!2131
2021-04-15 17:36:19 +00:00
jshipsey
16869933b7 attacking movement tweaks 2021-04-15 12:13:50 -04:00
jshipsey
599981fca4 combat tweaks 2021-04-15 11:43:52 -04:00
Avi Weinstock
1064e3777b Add a toggle to negotiate the use of server-authoritative physics. 2021-04-15 08:50:17 -04:00
Marcel
219f577106 Merge branch 'hqurve/settings-cleanup' into 'master'
Settings changes from the ui are now wrapped into a single enum and handling was moved to session/settings_change.rs, also settings.rs was split up

See merge request veloren/veloren!2130
2021-04-15 09:06:10 +00:00