Marcel
b4431b4dda
Merge branch 'lle-bout/upgrade-rustls-quinn' into 'master'
...
RUSTSEC-2023-0052 Upgrade rustls and quinn
See merge request veloren/veloren!4087
2023-08-23 07:44:49 +00:00
Imbris
e0ead44b54
Fix windows build
2023-08-23 01:22:17 -04:00
Imbris
8816957489
Changelog entry
2023-08-23 00:48:57 -04:00
Imbris
eec1b5853e
Remove unused cpal version
...
Also it turns out directories-next is in use for something that we need
2023-08-23 00:47:31 -04:00
Imbris
f5445774de
Update winit to 0.28
...
Hopefully works better on wayland!
2023-08-23 00:45:36 -04:00
Laura
b03d0dcc7b
Upgrade rustls and quinn
...
According to RUSTSEC-2023-0052 we need to upgrade rustls to 0.21
to get a fix for the issue which may or may not affect Veloren
since it's about client certificates but with the absence of a
PoC it seems like a good idea to upgrade anyway, just to be sure.
webpki has gone unmaintained (which rustls 0.20 depends on),
starting with rustls 0.21 it depends on rustls-webpki which
contains a fix for the issue. Since quinn also depends on
rustls 0.20 in 0.8 and 0.9 versions, we needed to upgrade it to
0.10 so that it depends on rustls 0.21 which we now use.
2023-08-23 06:35:36 +02:00
Christof Petig
24773cb3f1
deduplicate location name code
2023-08-22 23:11:18 +02:00
Christof Petig
b20ff5144c
determine location names when loading character list
2023-08-22 22:41:48 +02:00
Joshua Barretto
6fbca74e88
Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master'
...
Cheesing fixes to old-style dungeons
See merge request veloren/veloren!4014
2023-08-19 11:12:01 +00:00
Maxicarlos08
1274dc43c8
document and cleanup StateExt::position_mut
2023-08-19 12:43:48 +02:00
Maxicarlos08
14f433b6cd
used second sfx for teleport event
2023-08-19 11:44:58 +02:00
Gaxrodi
b7f92eb6e1
correction of mistakes #2
2023-08-18 21:10:32 +03:00
Maxicarlos08
dc1756b2df
added sfx (thanks to @flo666)
2023-08-17 22:47:35 +02:00
Gaxrodi
3e348ee33c
Update of subtitles.ftl
2023-08-17 20:51:46 +03:00
Gaxrodi
448aa70929
correction of mistakes
2023-08-17 20:26:37 +03:00
Gaxrodi
dccea51b50
translation of stay/follow
2023-08-17 19:52:17 +03:00
Marcel
09646a9830
Merge branch 'tibbon1/update_num_derive_0_4_0' into 'master'
...
num_derive 0.3 -> 0.4.0
See merge request veloren/veloren!4053
2023-08-17 16:42:31 +00:00
Isse
5a9b83aeb0
Merge branch 'evgenkot/si-prefixes-condition' into 'master'
...
Settings for Si prefixes in the interface menu
See merge request veloren/veloren!4061
2023-08-17 15:24:05 +00:00
Evgen Kot
9f213019d1
Settings for Si prefixes in the interface menu
2023-08-17 15:24:05 +00:00
Joshua Barretto
c9da8fb6a4
Merge branch 'maxicarlos08/fix-pet-follow' into 'master'
...
Fix pets not following after making them stay
See merge request veloren/veloren!4081
2023-08-17 10:48:31 +00:00
Maxicarlos08
ce8be9596b
fix pets not following after making them stay and translation
2023-08-17 12:10:32 +02:00
Maxicarlos08
e5e26149ed
review
2023-08-17 11:16:20 +02:00
Joshua Barretto
13789b3de4
Merge branch 'maxicarlos08/cactus-fix' into 'master'
...
Reduced large cacti sizes
See merge request veloren/veloren!4080
2023-08-16 20:16:44 +00:00
Maxicarlos08
8c77356ec1
reduced large cacti sizes
2023-08-16 20:19:35 +02:00
Gaxrodi
0f9feb0a7e
tiny letter correction #2
2023-08-16 18:11:26 +03:00
Gaxrodi
9231123be6
tiny letter correction
2023-08-16 18:04:34 +03:00
tygyh
b63d87f888
Merge branch 'tygyh/Update-swedish-translations' of https://gitlab.com/veloren/dev/veloren into tygyh/Update-swedish-translations
2023-08-16 15:19:07 +02:00
tygyh
387d8b47c6
Update swedish translations
2023-08-16 15:13:51 +02:00
flo
237d13dbce
Merge branch 'jungle_ruin' into 'master'
...
JungleRuin
See merge request veloren/veloren!4027
2023-08-16 12:35:29 +00:00
flo
fdea283f98
JungleRuin
2023-08-16 12:35:27 +00:00
flo
49d03ab096
Merge branch 'wyvern_tweaks' into 'master'
...
wyvern_tweaks
See merge request veloren/veloren!4077
2023-08-16 09:22:04 +00:00
flo
a2b1097df8
wyvern_tweaks
2023-08-16 09:22:04 +00:00
flo
21bf0a5572
Merge branch 'pirate_hideout_site' into 'master'
...
site pirate_hideout
See merge request veloren/veloren!4057
2023-08-16 06:59:59 +00:00
flo
fba1976dee
site pirate_hideout
2023-08-16 06:59:58 +00:00
Imbris
e8361d5abf
Merge branch 'imbris/sync-toggle' into 'master'
...
Add field to Presence to control when an entity is synced to other clients
See merge request veloren/veloren!3972
2023-08-16 00:10:35 +00:00
Joshua Barretto
7497ef93c8
Merge branch 'coastal_town_fence_fix' into 'master'
...
coastal town fence fix
See merge request veloren/veloren!4070
2023-08-15 22:34:38 +00:00
flo
36c0096f6a
coastal town fence fix
2023-08-15 22:34:38 +00:00
Maxicarlos08
0c9a942027
refactor teleporter system and include nearby pets
2023-08-15 12:24:49 +02:00
Maxicarlos08
92ab8dab9a
require interaction to start teleportation
2023-08-15 12:24:49 +02:00
Maxicarlos08
0929a3c76c
use same timings for both portals
2023-08-15 12:24:49 +02:00
Maxicarlos08
6a4a6bab9f
dance dance
2023-08-15 12:24:49 +02:00
Maxicarlos08
ac68f0af7b
addressed review comments and added hud interaction
2023-08-15 12:24:49 +02:00
Maxicarlos08
26ada89bb9
portal event -> change body and teleport to
2023-08-15 12:24:49 +02:00
Maxicarlos08
8fe5f2e708
addressed review comments
2023-08-15 12:24:49 +02:00
Maxicarlos08
e5fe64ccf6
pre-review cleanups
2023-08-15 12:24:49 +02:00
Maxicarlos08
bb2034ca92
portal particles
2023-08-15 12:24:48 +02:00
Maxicarlos08
09f7087ac6
buildup time adjustments
2023-08-15 12:24:48 +02:00
Maxicarlos08
3343ddf4cc
go into blink state at half buildup time
2023-08-15 12:24:48 +02:00
Maxicarlos08
25fcb04ad3
buildup times and portal model update
2023-08-15 12:24:48 +02:00
Maxicarlos08
14141ecc80
failed attempt at making dungeons avoid caves
2023-08-15 12:24:46 +02:00
