Commit Graph

14840 Commits

Author SHA1 Message Date
22a8f3ca89 make adlet elder drop only 1 bone key 2023-09-07 13:33:32 +02:00
2559afa51b Fixed dungeon cyclops loot table 2023-09-07 13:26:59 +02:00
f26fc8a137 made sagitta and orange monarch obtainable again 2023-09-07 13:05:36 +02:00
0613cd8dc1 Changelog entry 2023-09-06 17:54:43 +02:00
ec42b9b5ce don't store group id in ChatMode 2023-09-06 17:47:16 +02:00
ec92b2c33b Fix group chat leak 2023-09-03 21:25:44 +02:00
19742bb930 Merge branch 'translation_fr' into 'master'
rename fr/quest.ftl

See merge request veloren/veloren!4096
2023-09-01 18:14:24 +00:00
1b7d5f0915 Merge branch 'xMAC94x/fluent_stances' into 'master'
add back stances removed by weblate

See merge request veloren/veloren!4095
2023-08-31 16:20:43 +00:00
c9a7e6e072 ad back stances removed by weblate, and register them in EN file, hopefully that weblate accepts them now 2023-08-31 15:51:06 +02:00
d0b3d6a181 Merge branch 'xiretza/better-buff-death-messages' into 'master'
Better buff-death messages

Closes #1654

See merge request veloren/veloren!4092
2023-08-31 08:22:56 +00:00
flo
78b2443edc Merge branch 'qsto/bosses_loot_overhaul' into 'master'
Bosses loot overhaul

See merge request veloren/veloren!4072
2023-08-30 12:08:52 +00:00
579daf77a8 review fixes 2: elder and chieftain: armor drops same tier as weapon drops 2023-08-29 20:45:13 +02:00
9e44f77a73 review fixes 2023-08-29 20:15:00 +02:00
60538e0664 server: fix kill source for buff deaths without origin 2023-08-29 17:09:49 +00:00
06111612a3 voxygen: better translation of buff-death messages
This removes interpolation of translated strings, which is bad practice
because it simply doesn't work in many languages.

Translation files were updated using the following fish script. Some
resulting translations are truly terrible, but they always have been -
now it's just a lot more obvious.

```
function getbuff --argument langfile buff
    grep hud-outcome-$buff $langfile | cut -d= -f2- | string trim
end

set buffs burning bleeding curse crippled frozen mysterious

function replacebuffs --argument langfile entity
	set slug 'hud-chat-died_of_'$entity'_buff_msg'
    for buff in $buffs[-1..1]
        set bstr (getbuff $langfile $buff)
        or continue
        sed -i -e '/'$slug'/{p; s/[^=]* = \(.*\)/ .'$buff' = \1/; s/{ \$died_of_buff }/'(string replace / '\\/' $bstr)'/}' $langfile
    end
    sed -i -E 's/('$slug' \=).*/\1/' $langfile
end

function dofile --argument langfile
    sed -i -e s/buff_nonexistent/nonexistent_buff/ $langfile
    for entity in pvp npc nonexistent
        replacebuffs $langfile $entity
    end
    sed -i -e s/nonexistent_buff/buff_nonexistent/ $langfile
    sed -i -e /hud-outcome-/d $langfile
    sed -i -e '/#.*outcomes/d' $langfile
end

for langfile in assets/voxygen/i18n/*/hud/chat.ftl
    echo doing $langfile
    dofile $langfile
end
```
2023-08-29 17:09:48 +00:00
9ef2875db7 voxygen: avoid unnecessary allocation
Cow::to_string() goes through &str even for an Owned variant,
Cow::into_owned() passes Owned variants through as-is. As it happens,
the values here are always Owned (see comment in try_msg_ctx()
implementation).
2023-08-29 17:09:31 +00:00
c0f33efa98 rename quest.ftl 2023-08-29 17:40:48 +02:00
804e24adef Merge branch 'isse/fix-airships' into 'master'
Fix rtsim airships

See merge request veloren/veloren!4064
2023-08-29 12:56:25 +00:00
06d7548dc6 Fix rtsim airships 2023-08-29 12:56:25 +00:00
0c2b4148fe Merge branch 'master' into 'master'
add fr translations

See merge request veloren/veloren!3979
2023-08-29 10:14:49 +00:00
4d21fbaea5 add fr translations 2023-08-29 10:14:48 +00:00
0383fdd626 Merge branch 'master' into 'master'
Translation: Update zh_Hans

See merge request veloren/veloren!3970
2023-08-29 10:14:46 +00:00
65b251436f Translation: Update zh_Hans 2023-08-29 10:14:45 +00:00
95b8f931a6 Merge branch 'walpo/update-documentation' into 'master'
Update README.md document

See merge request veloren/veloren!4031
2023-08-29 07:52:03 +00:00
e0cc8aa0c3 Update README.md document 2023-08-29 07:52:02 +00:00
0413dfdec2 Merge branch 'vasco-welcome-aboard' into 'master'
Italian translation (axe abilities, buffs and others...)

See merge request veloren/veloren!3976
2023-08-29 07:32:39 +00:00
bb4b91244e Italian translation (axe abilities, buffs and others...) 2023-08-29 07:32:39 +00:00
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
d54ed537ac update uuid via authc 2023-08-28 20:09:17 +02: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