2f1597e2cb
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!4025
2023-08-29 07:28:28 +00:00
b323ca57e1
Merge branch 'walpo/fix-translation' into 'master'
...
fix(i18n): fix mistranslations caused by weblate
See merge request veloren/veloren!4094
2023-08-28 23:27:55 +00:00
c3a993f93a
fix(i18n): fix mistranslations caused by weblate
2023-08-28 22:59:39 +02:00
5a76a4d31c
Merge branch 'weblate-translation' into 'master'
...
Update translation files
See merge request veloren/veloren!4055
2023-08-28 20:27:01 +00:00
a09637c80d
Merge branch 'master' into 'weblate-translation'
...
# Conflicts:
# assets/voxygen/i18n/uk/buff.ftl
# assets/voxygen/i18n/uk/common.ftl
# assets/voxygen/i18n/uk/hud/settings.ftl
2023-08-28 19:43:06 +00:00
b1ebac9c9c
Merge branch 'gaxrodi/ukrainian-translation' into 'master'
...
Update the Ukrainian translation
See merge request veloren/veloren!4083
2023-08-28 18:10:29 +00:00
e103b078c3
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Translation: Veloren/voxygen-hud-misc
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-misc/
2023-08-28 17:37:37 +00:00
cdd2d00017
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org >
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
dcabc0ff6a
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org >
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
37f9ac31a9
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org >
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
da7e379398
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org >
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
1b6569ebab
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org >
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
a503c5e54d
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org >
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
f6b1d39cf4
Merge branch 'xMAC94x/update_dependencies' into 'master'
...
xmac94x/update dependencies
See merge request veloren/veloren!4090
2023-08-28 17:08:55 +00:00
a386c68df5
Merge branch 'maxicarlos08/teleporter-fix' into 'master'
...
Portal tweaks
See merge request veloren/veloren!4091
2023-08-28 06:06:02 +00:00
e5a737dee0
changelog entry
2023-08-28 00:09:16 +02:00
fc8a10f551
model update 2
2023-08-27 19:40:49 +02:00
f2958954b9
new model for portal & use cultist particles
2023-08-27 19:40:49 +02:00
0f13b407a2
allow for non-owned entities to teleport
2023-08-27 19:40:49 +02:00
b4216ec634
get rid of old criterion
2023-08-27 19:17:04 +02:00
96bf6309d2
small updates to dependencies
2023-08-27 19:17:04 +02:00
4ff25d7233
cargo update
2023-08-27 19:17:04 +02:00
3346a3bc1f
some manual dependency updates
2023-08-27 19:17:01 +02:00
de34726fa7
Merge branch 'imbris/winit-update-v2' into 'master'
...
Update winit to 0.28
See merge request veloren/veloren!4088
2023-08-27 15:10:00 +00:00
653b3b7374
Merge branch 'christof/location_names' into 'master'
...
Send the location name to the character selection dialog
See merge request veloren/veloren!4085
2023-08-26 15:56:40 +00:00
5195f6aaca
Merge branch 'lle-bout/upgrade-authc-rev' into 'master'
...
Upgrade authc dependency revision
See merge request veloren/veloren!4089
2023-08-23 10:01:52 +00:00
f0d8237e2d
Upgrade authc dependency revision
...
42dddd666f28e1a94cdf4b542fcd61f67658e261 contains additional fixes
for RUSTSEC-2023-0052.
2023-08-23 11:17:30 +02:00
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
e0ead44b54
Fix windows build
2023-08-23 01:22:17 -04:00
8816957489
Changelog entry
2023-08-23 00:48:57 -04:00
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
f5445774de
Update winit to 0.28
...
Hopefully works better on wayland!
2023-08-23 00:45:36 -04:00
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
24773cb3f1
deduplicate location name code
2023-08-22 23:11:18 +02:00
b20ff5144c
determine location names when loading character list
2023-08-22 22:41:48 +02:00
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
1274dc43c8
document and cleanup StateExt::position_mut
2023-08-19 12:43:48 +02:00
14f433b6cd
used second sfx for teleport event
2023-08-19 11:44:58 +02:00
b7f92eb6e1
correction of mistakes #2
2023-08-18 21:10:32 +03:00
dc1756b2df
added sfx (thanks to @flo666)
2023-08-17 22:47:35 +02:00
3e348ee33c
Update of subtitles.ftl
2023-08-17 20:51:46 +03:00
448aa70929
correction of mistakes
2023-08-17 20:26:37 +03:00
dccea51b50
translation of stay/follow
2023-08-17 19:52:17 +03:00
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
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
9f213019d1
Settings for Si prefixes in the interface menu
2023-08-17 15:24:05 +00:00
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
ce8be9596b
fix pets not following after making them stay and translation
2023-08-17 12:10:32 +02:00
e5e26149ed
review
2023-08-17 11:16:20 +02:00
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