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,586 Commits 151 Branches 18 Tags 2.1 GiB
38df083e0c
Commit Graph

3071 Commits

Author SHA1 Message Date
Treeco
9d83b046a6 Added savannah settlement lod 2024-03-27 01:42:11 +00:00
crabman
c589bc5ca0
friendly fire and pvp at desert arenas! 2024-03-26 11:34:07 +00:00
crabman
8dd7e3e0d5
/aura command 2024-03-25 19:56:08 +00:00
Treeco
954cede352 Add new LOD trees and objects 2024-03-23 17:32:54 +00:00
Treeco
62a99f2466 Use real colours for LOD trees and rooftops, lay groundwork for further additions 2024-03-23 17:32:54 +00:00
Joshua Barretto
3c846d4d17 Merge branch 'zesterer/shader-improvements' into 'master' 
Shader improvements

See merge request veloren/veloren!4290
 2024-03-22 18:40:45 +00:00
juliancoffee
7e4dcfd95a Re-shape General ST UI 2024-03-20 23:11:33 +02:00
juliancoffee
90454b1287 Remove roll skills 2024-03-20 23:11:31 +02:00
juliancoffee
1e6e595a87 Comment-out health/energy skills 2024-03-20 23:08:45 +02:00
Uniior
92e5bad450 Revised cacti sprites 2024-03-20 14:03:27 +00:00
Otto Richter
ac5ccb671a Update translation files (Weblate) 2024-03-20 12:05:44 +00:00
Thomas S
9a922016ea More Specific NPC Dialogs 2024-03-13 22:32:02 +00:00
Otto Richter
91938a0b51 Update translation files (Weblate) 2024-03-13 17:09:58 +00:00
Francesco Vasco
e9a35f5f8c Italian translation 2024-03-09 15:27:23 +01:00
Codeberg Translate
61822dfdde
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
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
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
flo
327c195374 cursekeeper_tweaks 2024-03-03 17:50:46 +00: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
Francesco Vasco
c6ae981d2b Italian translation 2024-03-02 10:59:00 +01: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
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
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
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
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
f3cc4bf90f cave and tree distributions and minor tweaks 2024-02-21 12:28:41 +01:00
uniior
ba0db563cc Address comments 2024-02-20 16:18:02 +01: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
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
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