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
15,836 Commits 151 Branches 18 Tags 2.1 GiB
007397c644
Commit Graph

4320 Commits

Author SHA1 Message Date
Codeberg Translate
6d0e57d2b2
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:55 +00:00
Codeberg Translate
2aed2dbecf
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:54 +00:00
Codeberg Translate
ab24bec336
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:54 +00:00
Codeberg Translate
59d39ee284
Translated using Weblate (Swedish) 
Currently translated at 86.7% (59 of 68 strings)

Translated using Weblate (Swedish)

Currently translated at 60.2% (41 of 68 strings)

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Positron832 <Positron832@users.noreply.translate.codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/potion/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-main/sv/
Translation: Veloren/potion
Translation: Veloren/voxygen-main
 2024-03-09 10:50:54 +00:00
Codeberg Translate
cfb79f3d75
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:54 +00:00
Codeberg Translate
19b14f1dc2
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:53 +00:00
Codeberg Translate
1250aa4a9c
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:53 +00:00
Codeberg Translate
8e4e7b38dd
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:53 +00:00
Codeberg Translate
0a5ce1e659
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

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/items/potion/
Translate-URL: https://translate.codeberg.org/projects/veloren/items/weapon/
Translation: Veloren/potion
Translation: Veloren/weapon
 2024-03-09 10:50:53 +00:00
Codeberg Translate
d3f66fad26
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:52 +00:00
Codeberg Translate
2b7646061a
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:52 +00:00
Codeberg Translate
54c12f37cd
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:52 +00:00
Codeberg Translate
6865a77a8b
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:52 +00:00
Codeberg Translate
d1240a06d3
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:52 +00:00
Codeberg Translate
158555568e
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:51 +00:00
Codeberg Translate
5ff8e1008e
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:51 +00:00
Codeberg Translate
aacd939ff9
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:51 +00:00
Codeberg Translate
b216215a3b
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:51 +00:00
Codeberg Translate
355969727c
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:50 +00:00
Codeberg Translate
fc88577014
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:50 +00:00
Codeberg Translate
94b4ee9480
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:50 +00:00
Codeberg Translate
6815dd546d
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:50 +00:00
Codeberg Translate
8abffa6dca
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:49 +00:00
Codeberg Translate
0e58704185
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:49 +00:00
Codeberg Translate
de9c4892d7
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:49 +00:00
Codeberg Translate
570d2491ee
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:49 +00:00
Codeberg Translate
c6609c030c
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:49 +00:00
Codeberg Translate
ca3a668a57
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:48 +00:00
Codeberg Translate
9db37106e1
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/items/potion/
Translation: Veloren/potion
 2024-03-09 10:50:48 +00:00
Otto Richter
b92235d651 Fix translation conflict 2024-03-08 12:13:29 +00:00
crabman
d58f7f0931
address review comments 2024-03-06 20:44:06 +01:00
crabman
51152f47fa
**tamed** cultist darkhounds 2024-03-06 20:24:03 +01:00
crabman
504e45ebdb
allow entity -> chunk anchor chains 2024-03-06 20:24:03 +01:00
crabman
40fed95760
allow pet definitions in entity configurations 2024-03-06 20:24:03 +01:00
Javier Pérez
30d924274c Update English translation 2024-03-06 18:36:07 +00:00
Illia Denysenko
8fcdff8304 Merge branch 'weblate-translation' into 'master' 
Update translation files (Weblate)

See merge request veloren/veloren!4366
 2024-03-06 14:42:58 +00:00
Otto Richter
48da79f6a4 Update translation files (Weblate) 2024-03-06 14:42:58 +00:00
Illia Denysenko
840e95f21c Merge branch 'juliancoffee/glider-ability' into 'master' 
Vroom Glider

See merge request veloren/veloren!4282
 2024-03-06 13:13:49 +00:00
juliancoffee
d5226eadca Nerf debug glider upward boost 2024-03-06 03:11:07 +02:00
crabman
82052f4517
add InlineLootTable to LootSpec 2024-03-05 15:36:29 +00:00
flo
327c195374 cursekeeper_tweaks 2024-03-03 17:50:46 +00:00
juliancoffee
18a26731d3 Add glider aux abilities 2024-03-03 17:56:09 +02:00
juliancoffee
3283eb6916 Vroom Glider 
- GlideBoost ability
- Vroom Glider item
- Made possible to attach ability_spec to gliders
- Activate glider ability while Glide/GlideWield

TODO:
- make it visible in voxygen
 2024-03-03 17:56:09 +02:00
Illia Denysenko
ef5a9663ba Merge branch 'juliancoffee/gliding-travelers' into 'master' 
Better Gliding for NPCs

See merge request veloren/veloren!4348
 2024-03-02 23:27:16 +00:00
Francesco Vasco
c6ae981d2b Italian translation 2024-03-02 10:59:00 +01:00
juliancoffee
e861aae836 Add gliders to travelers 2024-03-01 21:28:09 +02:00
Illia Denysenko
e9a04db92c Merge branch 'walpo/update-en-translation' into 'master' 
Update English translation

See merge request veloren/veloren!4339
 2024-02-29 23:45:09 +00:00
Javier Pérez
156c6c768c refactor: replace integer literal with variable 2024-03-01 00:05:45 +01:00
Javier Pérez
27b2709ccb refactor: make selector consistent 2024-02-29 23:58:59 +01:00
Javier Pérez
5ceedc8448 fix(misc.ftl): separate key from equals sign 2024-02-29 23:43:22 +01:00
Javier Pérez
cbbdf95212 feat(subtitles.ftl): add fluent key 2024-02-29 23:42:10 +01:00
Illia Denysenko
6bf48eb156 Merge branch 'juliancoffee/i18n-chat-comments' into 'master' 
Fix group-comments

See merge request veloren/veloren!4347
 2024-02-29 21:54:13 +00:00
Javier Pérez
2ef9cae614 revert: change 'stamina' to 'energy' 2024-02-29 20:41:25 +01:00
juliancoffee
ddbe1dc0c1 Fix group-comments 2024-02-29 16:05:07 +02:00
Illia Denysenko
0af21e54af Merge branch 'weblate-translation' into 'master' 
Fix translation conflicts

See merge request veloren/veloren!4345
 2024-02-29 12:10:08 +00:00
Otto Richter
0f7142f82e Fix translation conflicts 2024-02-29 12:10:07 +00:00
crabman
c50f1047f7
Added allow_players flag to Transform character state 2024-02-28 22:06:57 +00:00
crabman
a14c2f054c
addressed review comments 2024-02-28 22:03:35 +00:00
crabman
036e79284e
transform character state 2024-02-28 22:03:35 +00:00
Illia Denysenko
3bb1e625cb Merge branch 'weblate-translation' into 'master' 
Update translation files

See merge request veloren/veloren!4343
 2024-02-28 16:46:22 +00:00
Illia Denysenko
8176b93c34 Update translation files 2024-02-28 16:46:22 +00:00
Syniis
50905aebfe Mushroom spore particles 2024-02-27 19:28:03 +01:00
Syniis
17a88acd1c Various tweaks. New ArtLeaves BlockKind 2024-02-24 23:18:14 +01:00
Syniis
3dbbf80bb2 Various tweaks to sprites and colors. Made giant trees influence roots in caves 2024-02-24 23:09:02 +01:00
Syniis
6c5dc11d0d Added new cave assets 2024-02-24 23:09:02 +01:00
Syniis
ec310efb3c More cave features 2024-02-24 23:09:01 +01:00
Javier Pérez
497e66d2bb fix: update social.ftl 2024-02-24 14:31:01 +01:00
Francesco Vasco
9c179b9438 Italaian translation 2024-02-23 17:45:26 +01:00
Javier Pérez
7cb04a7040 feat: minor adjustments 2024-02-22 22:47:05 +01:00
Javier Pérez
e8c1666d64 feat: update English translation 2024-02-22 19:56:52 +01:00
crabman
dcbbf01bd9 Merge branch 'do-no-van/more-sword-balancing' into 'master' 
buff crippling/cleaving basics and fix fortitude

See merge request veloren/veloren!4328
 2024-02-22 06:32:05 +00:00
Samuel Keiffer
abea5bc9f3 Merge branch 'necti/revert-sword-speed-buff-energy-reward' into 'master' 
reverting recover duration of some sword attacks and increasing the energy...

See merge request veloren/veloren!4338
 2024-02-22 00:59:10 +00:00
do-no-van
52c79375eb decrease cleaving cross cut damage 2024-02-21 23:23:33 +00:00
do-no-van
f051509ce1 decrease cleaving fell strike damage 2024-02-21 23:23:33 +00:00
do-no-van
edddab997e buff crippling/cleaving basics and fix fortitude 2024-02-21 23:23:32 +00:00
nectical
92bcfbd884 reverting recover duration and increasing the energy reward of sword and axe M1/M2 2024-02-21 21:55:01 +00:00
flo
ab89750a9a Merge branch 'terracotta_tweaks' into 'master' 
terracotta_small_tweaks

See merge request veloren/veloren!4332
 2024-02-21 21:52:09 +00:00
flo
673425f9f1 terracotta_small_tweaks 2024-02-21 21:52:09 +00:00
Samuel Keiffer
94f6c3350c Merge branch 'danielkenji83/block-based-on-poise' into 'master' 
Block based on poise

See merge request veloren/veloren!4283
 2024-02-21 16:53:24 +00:00
UncomfySilence
4506fdce1a review comments 2024-02-21 14:11:20 +01:00
UncomfySilence
efadb07032 wolf armor 2024-02-21 13:10:27 +01:00
UncomfySilence
f3cc4bf90f cave and tree distributions and minor tweaks 2024-02-21 12:28:41 +01:00
nectical
9efda9f189 reverting recover duration of some sword attacks and increasing the energy reward of double slash/thrust and triple chop/cleave 2024-02-20 23:23:34 +00:00
UncomfySilence
3b7a9b38af tweaks to starter weapons and secondary components w/start of entity balancing 2024-02-20 16:18:57 +01:00
UncomfySilence
d7af58aefd overworld entity distribution tweaks and movement speed changes 2024-02-20 16:18:03 +01:00
uniior
cf8371373a Address TreantSapling 2024-02-20 16:18:03 +01:00
uniior
ba0db563cc Address comments 2024-02-20 16:18:02 +01:00
uniior
7e7bfa00e4 Further tweaks from testing 2024-02-20 16:18:02 +01:00
uniior
e720ee834e Initial 2024-02-20 16:18:01 +01:00
danielkenji83
961edf910d Updates from review 2024-02-19 19:42:37 -03:00
danielkenji83
9d73fcfc3f Updates from review 2024-02-18 23:30:43 -03:00
flo
605cb0837f phoenix_tweaks 2024-02-18 19:11:34 +00:00
danielkenji83
c449b229d5 Updates from review 2024-02-17 19:09:32 -03:00
danielkenji83
53fddba3ef Remove block_strength stat 2024-02-17 13:12:34 -03:00
Francesco Vasco
2480469cbb Italian translation 2024-02-17 13:23:05 +01:00
danielkenji83
81cfb26059 Updates from review 2024-02-17 00:50:30 -03:00
danielkenji83
5c401215cf Rebase commit 2024-02-17 00:50:23 -03:00
Imbris
8e62c17a81 Merge branch 'imbris/shaderc-opt' into 'master' 
Fix issue with missing capability when enabling shaderc optimizations

Closes #1936

See merge request veloren/veloren!4322
 2024-02-15 17:25:12 +00:00
flo
ed4fd55bc3 terracotta 2024-02-15 06:08:03 +00:00
Youssef Fahmy
0d2938d8f1 Beginner balance tweaks 2024-02-14 23:23:29 +00:00
Imbris
5434ce546b Fix issue with missing capability when enabling shaderc optimizations 
See https://github.com/gfx-rs/wgpu/issues/4915

Also:
* Remove unused vert-out frag-in variables from shaders (naga doesn't
  like this probably because they are optimized out on the fragment
  side). This restriction from naga may be relaxed in the future
  see https://github.com/gfx-rs/wgpu/issues/3748.
* Enable OptimizationLevel::Performance for shaderc by default
* Add a environment variable VOXYGEN_SHADERC_OPTS for disabling this
  (e.g. to test if it actually makes a difference on any platform).
  (TODO: testing might be easier if there was a way to do toggle it
  without restarting...)
 2024-02-14 16:36:59 -05:00
evgenkot
eb4911f60d I18n pickup-msg correction for en uk ru 2024-02-12 23:26:14 +05:00
evgenkot
eee330c9e9 I18n loot_scroller correct name 2024-02-12 21:24:57 +05:00
evgenkot
f9ee398a17 I18n loot_scroller user_gender 2024-02-12 21:24:57 +05:00
Francesco Vasco
e75117688b Italian translation with genders 2024-02-11 16:40:47 +01:00
Joshua Barretto
9f48a855c4 Improved cloud scale 2024-02-09 22:03:30 +00:00
Joshua Barretto
f1ee52b2cc Better LoD detail 2024-02-09 22:03:30 +00:00
Joshua Barretto
47d502fa56 Better horizon 2024-02-09 22:03:30 +00:00
Maxicarlos08
a084351aad
fix incorrect i18 group chat key 2024-02-09 19:57:59 +01:00
juliancoffee
1dee12af85 Improve airflow particles 2024-02-08 16:25:39 +02:00
juliancoffee
52328b89d2 rebase 2024-02-08 16:25:39 +02:00
laundmo
283b404724 Working wind/lift particles 
+ clippy fixes
 2024-02-08 16:25:39 +02:00
Maxicarlos08
88feb4cc60
removed unused fields from item assets 2024-02-06 22:05:08 +01:00
unknown
c3942b5f1f
Removed crit_chance stat from two item .ron files 2024-02-06 21:47:41 +01:00
Illia Denysenko
9b6c678473 Merge branch 'master' into 'master' 
Add hints on how to use animal materials to craft weapons

See merge request veloren/veloren!4306
 2024-02-06 13:02:48 +00:00
Illia Denysenko
330e5ee3b0 Translated using Weblate 2024-02-05 13:59:08 +00:00
Scott Bronson
86ce5960a7 Add hints on how to use animal materials to craft weapons 2024-02-04 17:54:00 -08:00
Illia Denysenko
a2d52d09fc Merge branch 'juliancoffee/i18n-gender-chat' into 'master' 
First step to enabling grammatical genders

See merge request veloren/veloren!4301
 2024-02-04 17:40:08 +00:00
Illia Denysenko
c645031c3f Merge branch 'juliancoffee/articled-bodies' into 'master' 
Improve translator documentation and wording

See merge request veloren/veloren!4303
 2024-02-04 16:34:36 +00:00
Francesco Vasco
7870548746 Italian translation 2024-02-04 14:12:02 +01:00
juliancoffee
ffa031d1bd Specify context of messages 2024-02-04 00:21:21 +02:00
juliancoffee
e5c2ee6b23 Improve translator documentation and wording 2024-02-04 00:11:49 +02:00
juliancoffee
273ac621a9 (i18n) Ukrainian translation for chat uses genders 2024-02-03 18:58:46 +02:00
juliancoffee
450de681e4 Refactor chat message i18n 
- All message types now use i18n to declare format, similar to /tell
- hud-chat-you is removed for now, along with its usage in
  insert_alias()
 2024-02-03 18:58:46 +02:00
juliancoffee
96681cd448 Remove/Deprecate KillSource::Environment 2024-02-03 18:58:46 +02:00
juliancoffee
13011606d9 Reorganize hud/chat i18n file 2024-02-03 18:58:46 +02:00
Animoe
dfa184657c Translation:add some new translations for menu and hud 2024-02-03 13:41:13 +00:00
Woeful_Wolf
c89e3f2b5e Settings labels use i18n 2024-02-01 20:36:34 +02:00
Marcel
6d412089c7 Merge branch 'isse/wgpu-update' into 'master' 
Update wgpu

See merge request veloren/veloren!4245
 2024-02-01 12:14:32 +00:00
Isse
b7a56e895a Only show available present modes in graphic settings 2024-02-01 12:05:06 +01:00
BigKhan
9c57a37a58 fixed comma + changelog 2024-01-31 18:27:38 +00:00
BigKhan
5d6d976b7f removed comment 2024-01-31 16:52:31 +00:00
BigKhan
554e5b6c80 Added Autumn ForestKind 2024-01-31 16:50:13 +00:00
Illia Denysenko
43cbcf2514 Merge branch 'update-zh-Hans' into 'master' 
update zh-Hans item translations

See merge request veloren/veloren!4294
 2024-01-31 15:30:47 +00:00
Animoe
5ba6ba7ac9 update zh-Hans item translations 2024-01-31 15:30:47 +00:00
BigKhan
ee10e03736 wood darker 2024-01-31 13:19:48 +00:00
BigKhan
f600d48e15 Added Cherry Tree ForestKind 2024-01-31 13:15:26 +00:00
maxicarlos08
be056ef595 Merge branch 'AutumnTrees' into 'master' 
Autumn trees

See merge request veloren/veloren!4284
 2024-01-31 11:19:11 +00:00
Illia Denysenko
36bd96e116 Merge branch 'fvasco-item' into 'master' 
Add assets/voxygen/i18n/it/item/

See merge request veloren/veloren!4272
 2024-01-30 22:25:38 +00:00
Isse
9903d2c545 more testing 2024-01-30 00:52:49 +01:00
BigKhan
7dce9513c1 cleaned description 2024-01-28 14:37:08 +00:00
BigKhan
69f549deab made the trees maples instead. renamed the ForestKind to match. 2024-01-28 14:34:11 +00:00
BigKhan
9d36a1446d adding autumn trees to temperate forest 2024-01-27 22:52:57 +00:00
BigKhan
f626fdc496 Added Autumn Trees 2024-01-27 21:12:51 +00:00
flo666
7714bd0445 sea_decor_block_fix 2024-01-26 18:41:24 +01:00
Illia Denysenko
353351e16a Update translation files 2024-01-26 00:01:07 +00:00
maxicarlos08
880e9044d5 Merge branch 'burnpot-model' into 'master' 
New bed and door sprites

See merge request veloren/veloren!4184
 2024-01-25 21:12:36 +00:00
Illia Denysenko
4ab0717e71 Translated using Weblate (Spanish (Latin America)) 2024-01-25 20:36:52 +00:00
unknown
47694f6896 Updated bed sprite offsets 2024-01-25 15:54:07 -03:00
unknown
928a3bb6ca New bed and door sprites 2024-01-25 14:42:42 -03:00
unknown
962bbcb045 Update Burning Potion model 2024-01-25 14:37:26 -03:00
Francesco Vasco
ac3b67bbdb Add assets/voxygen/i18n/it/item/ 2024-01-25 08:33:35 +01:00
maxicarlos08
8d3cd277b9 Merge branch 'jcoxeye/price-entries' into 'master' 
Lots of price entries for miscellaneous items

See merge request veloren/veloren!4231
 2024-01-24 06:57:07 +00:00
maxicarlos08
ef84ab6603 Merge branch 'jcoxeye/item-tiering-fixes' into 'master' 
Adjusted tiers of various items

See merge request veloren/veloren!4249
 2024-01-23 21:58:14 +00:00
JCoxeye
d017844416 Adjusted tiers of various items 2024-01-23 21:58:14 +00:00
JCoxeye
3207df3762 Rebalances, and moved sandals to cloth armor loot table, in line with other starter armor. 2024-01-23 16:46:24 -05:00
Joshua Barretto
92a8bc2806 Merge branch 'zesterer/toggle-light-sprites' into 'master' 
Added the ability to toggle light sources on and off

See merge request veloren/veloren!4267
 2024-01-22 09:39:31 +00:00
Joshua Barretto
4cbec5d93c Interaction distance check, better text 2024-01-21 21:30:08 +00:00
do-no-van
8c5759cb5e balance sword abilities 2024-01-21 20:18:19 +00:00
Illia Denysenko
5137966940 Merge branch 'evgenkot/follow-up-processing-of-i18n-items' into 'master' 
i18n items processing

See merge request veloren/veloren!4260
 2024-01-21 18:45:08 +00:00
Evgen Kot
7ea133e4b5 Correcting comments for i18n changes and moving debug.ftl to admin.ftl 2024-01-21 22:03:17 +05:00
Evgen Kot
5a1efcc964 Move npc and unused armor to npc.ftl and lanterns, bags, gliders to other.ftl 2024-01-21 21:33:44 +05:00
evgenkot
7fb8506565 Split i18n items by category 2024-01-21 21:29:27 +05:00
evgenkot
799d636833 Change names of items with the same vox descriptor 
| old | new |
|-|-|
| object-key_rusty-0-ancient | object-key_quarry_ancient |
| object-key_rusty-0-backdoor | object-key_quarry_backdoor |
| items-keeper_goggle | object-key_quarry_keeper_goggle_left |
| items-keeper_goggle-flamekeeper_right | object-key_quarry_keeper_goggle_right |
| object-key_rusty-0-overseer | object-key_quarry_overseer |
| object-key_rusty-0-smelting | object-key_quarry_smelting |
| weapon-staff-firestaff_starter | weapon-staff-firestaff_humble_stick |
| weapon-staff-firestaff_starter_gnarled | weapon-staff-firestaff_starter |
| weapon-hammer-2hhammer_rusty-starter_hammer | weapon-hammer-2hhammer_starter |
| armor-misc-chest-worker_green-worker_orange_0 | armor-misc-chest-worker_orange_0 |
| armor-misc-chest-shirt_white-worker_orange_1 | armor-misc-chest-worker_orange_1 |
| armor-misc-chest-worker_green-worker_purple_0 | armor-misc-chest-worker_purple_0 |
| armor-misc-chest-shirt_white-worker_purple_1 | armor-misc-chest-worker_purple_1 |
| armor-misc-chest-worker_green-worker_red_0 | armor-misc-chest-worker_red_0 |
| armor-misc-chest-shirt_white-worker_red_1 | armor-misc-chest-worker_red_1 |
| armor-misc-chest-worker_green-worker_yellow_0 | armor-misc-chest-worker_yellow_0 |
| armor-misc-chest-shirt_white-worker_yellow_1 | armor-misc-chest-worker_yellow_1 |
| armor-misc-back-backpack-backpack | armor-misc-back-backpack-traveler |
| armor-tabard_admin-admin | armor-tabard-admin_tabard |
| armor-misc-back-admin-admin_back | armor-misc-back-admin_back |
| weapon-sword-frost-1-admin_sword | weapon-sword-frost-admin_sword |
| armor-velorite_battlemage-belt-cultist_belt | armor-velorite-belt |
| armor-velorite_battlemage-foot-cultist_boots | armor-velorite-boots |
| armor-velorite_battlemage-chest-cultist_chest_blue | armor-velorite-chest |
| armor-velorite_battlemage-hand-cultist_hands_blue | armor-velorite-hands |
| armor-velorite_battlemage-pants-cultist_legs_blue | armor-velorite-legs |
| armor-velorite_battlemage-shoulder-cultist_shoulder_blue | armor-velorite-shoulder |
| armor-velorite_battlemage-back-dungeon_purple | armor-velorite-back |
| weapon-bow-velorite-velorite_bow_debug | weapon-bow-velorite-debug |
| sprite-mineral-ore-coal | sprite-mineral-stone-coal |
| sprite-mineral-ore-coal-coal | sprite-mineral-ore-coal |
| sprite-crafting_ing-animal_misc-grim_eyeball | sprite-crafting_ing-animal_misc-cyclops_eyeball |
| sprite-crafting_ing-animal_misc-grim_eyeball-grim_eyeball | sprite-crafting_ing-animal_misc-grim_eyeball |
| object-potion_red-potion_big | object-potion_big |
| object-potion_red-potion_med | object-potion_med |
| object-potion_red-potion_minor | object-potion_minor |
| sprite-flowers-sunflower_1-yellow | sprite-flowers-yellow |
 2024-01-21 21:21:10 +05:00
Maxicarlos08
0b1f8dc29a
add charm buff icons 2024-01-21 15:05:31 +01:00
maxicarlos08
83a24acc1e
Add charm animation 2024-01-21 15:00:06 +01:00
Sam
95835887e1
Charms now have crafting recipes. 2024-01-21 15:00:06 +01:00
Marcel
d4f993ca1d Merge branch 'minor-fixes' into 'master' 
Correct/improve some en-US text.

See merge request veloren/veloren!4246
 2024-01-21 10:12:20 +00:00
flo666
a849286563 fix_adlet_elder_sword 2024-01-20 21:07:38 +01:00
Samuel Keiffer
3224bc5147 Merge branch 'crabman/earthsplitter-nerf' into 'master' 
earthsplitter nerf

See merge request veloren/veloren!4264
 2024-01-20 18:30:55 +00:00
flo
48a79b3e78 haniwa 2024-01-20 17:45:23 +00:00
Maxicarlos08
d30fed3961
earthsplitter nerf 2024-01-20 18:32:29 +01:00
Isse
99154897b2 Merge branch 'fvasco-command' into 'master' 
Add assets/voxygen/i18n/it/command.ftl

See merge request veloren/veloren!4124
 2024-01-18 18:00:51 +00:00
Francesco Vasco
0e9630bd13 Add assets/voxygen/i18n/it/command.ftl 2024-01-18 18:00:51 +00:00
Codeberg Translate
b91d37a5ee
Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Translation: Veloren/voxygen-hud-subtitles
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-subtitles/
 2024-01-17 18:56:43 +00:00
Codeberg Translate
ff73a9b3cc
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-npc/
Translation: Veloren/voxygen-npc
 2024-01-17 18:56:43 +00:00
Joshua Barretto
a852298010 Merge branch 'zesterer/better-char-select-scene' into 'master' 
Render render LoD terrain on char select, remove old backdrop figure

See merge request veloren/veloren!4254
 2024-01-16 18:51:04 +00:00
Isse
4f084506c0 Merge branch 'juliancoffee/item-i18n' into 'master' 
Add Item i18n

Closes #903

See merge request veloren/veloren!4250
 2024-01-16 17:58:35 +00:00
juliancoffee
d3fcade857 Rename ItemL10n to ItemI18n 2024-01-16 19:14:14 +02:00
Maxicarlos08
25c7169991
Renamed share_with_server -> send_to_server 
requested by @juliancoffee
 2024-01-16 17:21:52 +01:00
JCoxeye
941e953348 Merge branch veloren:master into jcoxeye/price-entries 2024-01-15 22:47:06 +00:00
Joshua Barretto
d51b5c5bea Add airship to char select 2024-01-15 22:35:42 +00:00
Joshua Barretto
43d935a150 Render render LoD terrain on char select, remove old backdrop figure 2024-01-15 19:06:17 +00:00
Maxicarlos08
d6371f7f9b
Server rules i18n and rules button in character screen 2024-01-15 00:03:23 +01:00
Joshua Barretto
f99bf91617
Added rules menu when connecting to server 2024-01-15 00:02:43 +01:00
juliancoffee
7228543fbf Mark legacy item asset content 2024-01-14 21:25:15 +02:00
juliancoffee
28b400825e Add item localization assets 2024-01-14 21:25:15 +02:00
juliancoffee
b8e6840bf6 Enhance /kit all 
- "all" is now in proposed completions
- `/kit all` gives all imaginable items, it's not limited to assets
  anymore
 2024-01-14 21:25:15 +02:00
juliancoffee
aba8ec7558 Implement item localization 
- Add Content::Key as proxy to Language::try_msg
- Add Content::Attr as proxy to Language::try_attr
- Extend ItemKey::TagExamples so it includes base asset id
- Implement ItemDesc::l10n using new Content variants
- Add all_items_expect() function to grab all items, because
  try_all_item_defs() covers only items in asset folder.

Required assets will go in next commit
 2024-01-14 21:25:15 +02:00
juliancoffee
75013cc04a Make sfx.ron use ItemKey 2024-01-14 21:25:15 +02:00
Samuel Keiffer
dc215ace34 Merge branch 'juliancoffee/buff-misc-cmd' into 'master' 
Add /buff_complex command

See merge request veloren/veloren!4243
 2024-01-14 17:35:21 +00:00
JCoxeye
be951e747c Merge branch veloren:master into jcoxeye/price-entries 2024-01-11 14:21:23 +00:00
Hrom
88c5a2e009 renamed twiggy shoulders 2024-01-09 23:54:32 +00:00
juliancoffee
296f70c1b2 Unify /buff_complex and /buff 
Turns out parse_cmd_args allows omitting arguments, /buff <buff>
[misc_data] will be idential to /buff <buff> [strength] [duration]
[misc_data]
 2024-01-08 20:13:17 +02:00
juliancoffee
2746a98f40 Add /buff_complex command 2024-01-08 20:13:17 +02:00
juliancoffee
5aa30b0175 Warn about complex buffs when using /buff 2024-01-08 20:13:17 +02:00
Isse
12a4c5a256 Merge branch 'the_dimasmith/update-uk' into 'master' 
update Ukrainian translation

See merge request veloren/veloren!4215
 2024-01-08 16:39:08 +00:00
Dmytro Kovalchuk
95f63e46e6 update Ukrainian translation 2024-01-08 16:39:08 +00:00
Darren Salt
7051ba5c89 Correct/improve some en-US text. 2024-01-05 11:47:27 +00:00
Pybit
f6204f9d04 Merge branch 'master' into 'More-potions' 
# Conflicts:
#   CHANGELOG.md
 2024-01-04 11:48:30 +00:00