Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,358 Commits 151 Branches 18 Tags 2.1 GiB
b372a0c836
Commit Graph

3844 Commits

Author SHA1 Message Date
Christof Petig
744ede6a0b Merge branch 'master' into 'master' 
fixed item quality to match others

See merge request veloren/veloren!3511
 2023-09-12 21:33:21 +00:00
Francesco Vasco
d9b7f202f5
Italian: common-sprite-crate and typo 2023-09-10 11:35:30 +00:00
Maxicarlos08
5fe5440ce2
use All grouping for phoenix drops 2023-09-08 12:21:34 +02:00
Maxicarlos08
e1da740394
updated dungeon cyclops loot table 2023-09-08 00:08:39 +02:00
Maxicarlos08
22a8f3ca89
make adlet elder drop only 1 bone key 2023-09-07 13:33:32 +02:00
Maxicarlos08
2559afa51b
Fixed dungeon cyclops loot table 2023-09-07 13:26:59 +02:00
Maxicarlos08
f26fc8a137
made sagitta and orange monarch obtainable again 2023-09-07 13:05:36 +02:00
Marcel
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
Marcel
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
Marcel Märtens
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
Joshua Barretto
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
flo666
579daf77a8 review fixes 2: elder and chieftain: armor drops same tier as weapon drops 2023-08-29 20:45:13 +02:00
flo666
9e44f77a73 review fixes 2023-08-29 20:15:00 +02:00
Xiretza
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
Sanctorum Thomas
c0f33efa98 rename quest.ftl 2023-08-29 17:40:48 +02:00
Marcel
0c2b4148fe Merge branch 'master' into 'master' 
add fr translations

See merge request veloren/veloren!3979
 2023-08-29 10:14:49 +00:00
Thomas S
4d21fbaea5 add fr translations 2023-08-29 10:14:48 +00:00
Marcel
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
Marcel
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
Francesco Vasco
bb4b91244e Italian translation (axe abilities, buffs and others...) 2023-08-29 07:32:39 +00:00
Marcel
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
walpo
c3a993f93a fix(i18n): fix mistranslations caused by weblate 2023-08-28 22:59:39 +02:00
Christof Petig
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
Marcel
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
Codeberg Translate
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
Codeberg Translate
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
Codeberg Translate
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
Codeberg Translate
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
Codeberg Translate
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
Codeberg Translate
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
Codeberg Translate
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
Maxicarlos08
fc8a10f551
model update 2 2023-08-27 19:40:49 +02:00
Maxicarlos08
f2958954b9
new model for portal & use cultist particles 2023-08-27 19:40:49 +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
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
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
Maxicarlos08
ce8be9596b
fix pets not following after making them stay and translation 2023-08-17 12:10:32 +02: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
387d8b47c6 Update swedish translations 2023-08-16 15:13:51 +02:00
flo
fdea283f98 JungleRuin 2023-08-16 12:35:27 +00:00