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,672 Commits 151 Branches 18 Tags 2.1 GiB
601712cf77
Commit Graph

3083 Commits

Author SHA1 Message Date
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
28b400825e Add item localization assets 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
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
Isse
100568f955 Merge branch 'feat/time_length_on_map_settings' into 'master' 
Feat: Day duration slider on map creation UI (#1909)

Closes #1909

See merge request veloren/veloren!4204
 2024-01-03 22:21:53 +00:00
Joaquin Tornello
0ecfbce4d2 Feat: Day duration slider on map creation UI (#1909) 2024-01-03 22:21:53 +00:00
Darren Salt
dc0725e104 Avoid a wgpu SPIR-V warning about BitFieldUExtract 
premultiply-alpha-vert.glsl contains a function unpack() which, without this
change, causes the following warnings:

WARN wgpu_core::device: Failed to parse shader SPIR-V code for Some("premultiply-alpha-vert.glsl …"): UnsupportedInstruction(Function, BitFieldUExtract)
WARN wgpu_core::device:     Proceeding unsafely without validation

This avoids that warning (and removes now-unnecessary type conversions).
 2024-01-03 16:33:02 +00:00
Samuel Keiffer
5bd089c56d Merge branch 'sam/remove-combo-melee' into 'master' 
Deprecated combo melee character state

See merge request veloren/veloren!4233
 2023-12-29 17:29:44 +00:00
DaforLynx
0b62898060 Audio fixes and new music 2023-12-29 00:25:08 +00:00
Sam
f65d449aa3 Deprecated combo melee character state 2023-12-28 19:02:10 -05:00
Froggy
7c66fff767 Froggy/armor offset fixes 2023-12-25 12:14:24 +00:00
Christof Petig
5af8c4687e Merge branch 'christof/christmas23' into 'master' 
Christmas theme revival

See merge request veloren/veloren!4209
 2023-12-20 17:02:01 +00:00
Froggy
8cfd65ff76 fixed armor offsets to enable mix'n'match armor 2023-12-20 12:05:58 +00:00
Froggy
01ac73b73e fixed headwear offsets and some vox files 2023-12-18 20:42:52 +11:00
do-no-van
b5eaa58728 fix typo and armor offsets 2023-12-17 22:44:43 +00:00
Uniior
737b5761f6 Crate and Barrel sprites 2023-12-17 16:17:14 +00:00
flo
569ab5c5ed crustacean-skeleton and crab 2023-12-16 13:47:55 +00:00
Christof Petig
4b7f3d07d2 add hirdrasil ornament variants and fix clippy 2023-12-16 12:10:17 +01:00
Isse
b60ebd4131 don't show red text when walking 2023-12-07 20:08:03 +01:00
Isse
63e500d3d8 laying and steering animation 2023-12-07 20:08:02 +01:00
Isse
5320f83462 configurable walking speed 2023-12-07 20:08:02 +01:00
HEIEnthusiast
933c897450 Renamed to potion of agility, burning potion to combustion 2023-12-05 14:15:54 -04:00
HEIEnthusiast
99b5571fd8 Renamed swiftness to retreating, changed model 2023-12-05 13:09:14 -04:00
HEIEnthusiast
5001c4a262 Added swiftness debuffs 2023-11-28 11:41:29 -04:00
HEIEnthusiast
db71625226 Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions 2023-11-28 10:07:00 -04:00
HEIEnthusiast
568d12cdd0 Swiftness potion changes 2023-11-28 10:03:07 -04:00
Michał
14120232a0 Phoenix overhaul 2023-11-28 11:13:18 +00:00
HEIEnthusiast
bb2adfb2e5 Removed strength and regeneration potions 2023-11-27 15:16:44 -04:00
HEIEnthusiast
783cfdc719 Merge branch 'master' into More-potions 2023-11-27 07:00:48 -04:00
HEIEnthusiast
4d87a9ab44 General potion modifications 2023-11-27 06:57:42 -04:00
HEIEnthusiast
59c3162c49 Merge branch 'master' of https://gitlab.com/veloren/dev/veloren 
12 commits behind master fix
 2023-11-27 06:32:18 -04:00
HEIEnthusiast
ac4101e70d Changed textures, added strength pot 2023-11-27 06:25:58 -04:00
HEIEnthusiast
0bb74f9efe Added swiftness and regeneration potions 2023-11-26 10:54:02 -04:00
Isse
5a3e6316a5 fix tethering 2023-11-23 01:01:31 +01:00
Sam
4e0e94b5c6 Removed spin melee character state 2023-11-16 19:17:38 -05:00
Maxicarlos08
17904d9387 crit_power -> precise_power 2023-11-14 18:07:01 -05:00
Sam
d3b3bca621 Added precision 2023-11-14 18:06:59 -05:00
PopeRigby
688fd67c33 Add Burning Potion that applies the Burning effect to the user 2023-11-14 02:00:50 +00:00
Isse
db1480b564 put ice_reflections under REFLECTION_MODE_HIGH 2023-11-10 12:53:09 +01:00
Christof Petig
0ddd40336a Merge branch 'zesterer/worldgen' into 'master' 
Various worldgen improvements

See merge request veloren/veloren!4152
 2023-11-10 00:15:29 +00:00
Sorann753
a63debe1b7 Fixed French Translation 2023-11-09 19:41:05 +00:00
Joshua Barretto
84e59c52fb Made portal fizz better convey access 2023-11-08 23:19:02 +01:00
Joshua Barretto
83dc22dfbf Made ice reflective 2023-11-08 23:19:00 +01:00
Uniior
1d8a23c30e Starter glider. 2023-11-04 22:09:00 +00:00
Isse
7a8e363df1 better way to show glitter 2023-11-02 15:22:32 +01:00
Isse
48d95e7699 SnowGlitter experimental shader 2023-11-02 12:53:34 +01:00
Isse
f98e4331a1 Fix LoD reflections for nvidea + vulkan 2023-10-23 19:48:30 +00:00
Joshua Barretto
7589774967 Renamed tether renderer to rope, fixed tether lengths 2023-10-21 13:51:42 +01:00
Joshua Barretto
a5ec81a2ab Better tether pattern, account for mass 2023-10-21 13:51:41 +01:00
Joshua Barretto
deca7ae258 Finished adding tether graphics 2023-10-21 13:51:40 +01:00
Joshua Barretto
9a72d52c48 Began adding tether visuals 2023-10-21 13:49:04 +01:00
jshipsey
cf425a09c8 setup 2023-10-19 00:14:12 -04:00
Joshua Barretto
e81516a154 Log shader warnings 2023-10-18 21:50:40 +01:00
Joshua Barretto
cea7636e29 Reverted bad shader changes 2023-10-18 21:20:15 +01:00
Joshua Barretto
321cc030ad Better LoD giant trees 2023-10-18 09:58:00 +01:00
Joshua Barretto
ba763f2da5 Make no terrain pop the default 2023-10-18 09:58:00 +01:00
Joshua Barretto
6a82fcf703 Added block noise to LoD objects 2023-10-18 09:58:00 +01:00
Joshua Barretto
8036ffa374 Removed unnecessary shader code 2023-10-18 09:58:00 +01:00
Joshua Barretto
c07d7a212b Better LoD effects, performance improvements 2023-10-18 09:58:00 +01:00
Joshua Barretto
4d6c3a00f3 Testing better LoD voxelisation techniques 2023-10-18 09:57:59 +01:00
Isse
b6c234b26e fix puddle details 2023-10-15 00:48:37 +02:00
Raul Wagner Costa
46cf1f1914 Linearize light colors on the CPU 2023-10-14 18:10:35 +00:00
Isse
d620206f37 fix reflection mode low 2023-10-14 09:52:46 +02:00
Joshua Barretto
32b0b33abe Merge branch 'zesterer/backpack-fixes' into 'master' 
Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons

See merge request veloren/veloren!4131
 2023-10-13 22:21:53 +00:00
Isse
e0c67c470b Merge branch 'isse/small-fixes' into 'master' 
Client local time, used for fluid shaders

See merge request veloren/veloren!4128
 2023-10-13 12:17:51 +00:00
Isse
56175c2730 rename client_time to local_time 2023-10-13 13:17:52 +02:00
Joshua Barretto
9dd5cd24d1 Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons 2023-10-13 11:57:49 +01:00
Joshua Barretto
0f2d4c261a Merge branch 'zesterer/better-anims' into 'master' 
Improving some animations

See merge request veloren/veloren!4127
 2023-10-12 20:18:11 +00:00
Joshua Barretto
0b1ffb6695 Fixed footstep timings 2023-10-12 20:31:10 +01:00
Isse
3e19c847f1 use client local time for water 2023-10-12 01:46:43 +02:00
Isse
72db9b61b3 client local time 2023-10-12 01:46:12 +02:00
Isse
472b996c8e Merge branch 'isse/shader-fp-fixes' into 'master' 
Shader floating point fixes

See merge request veloren/veloren!4120
 2023-10-11 23:04:33 +00:00
Isse
a1afd5c62f fix signs in particle-vert.glsl 2023-10-11 20:46:44 +02:00
Isse
d12f0acd1c fix uses of time of day, which are scaled wrong 2023-10-11 20:39:17 +02:00
Isse
65e6eb4e38 add comments explaining the elements of time_of_day and tick in shaders 2023-10-11 20:29:37 +02:00
maxicarlos08
8a5f237e9c Frost gigas tweaks 2023-10-08 11:35:01 +00:00
Uniior
cd91943ebf Revamps for some object/sprite models 2023-10-07 18:49:06 +00:00
Isse
7d37646dac renames and comments 2023-10-07 19:53:55 +02:00
Isse
2eae780e71 vectorize wave functions 2023-10-07 19:53:55 +02:00
Isse
bc436e2c9f make particles only use 1 float for inst time again 2023-10-07 19:53:55 +02:00
Isse
a152e4dfb4 time-proof usages of tick 2023-10-07 19:53:55 +02:00
Isse
6d4be9bd01 time proof time of day in shaders 2023-10-07 19:53:55 +02:00
Maxicarlos08
a3be68930e
review comments 2023-10-02 23:23:42 +02:00
Maxicarlos08
9ababec625
fix UI issues & cleanup 2023-09-29 23:30:44 +02:00
Maxicarlos08
66f6b81575
singleplayer server initialization status 2023-09-29 23:30:14 +02:00
Maxicarlos08
9a3f53c32c
added status updates to loading screen 2023-09-29 23:30:14 +02:00
Laura
f4d48d2689 New Arena building and visit site for NPCs 2023-09-26 12:29:14 +00:00
Maxicarlos08
772dd660a1
testing 2023-09-20 23:29:24 +02:00
Maxicarlos08
91284565a2
addressed review comments 2023-09-20 23:29:24 +02:00
Maxicarlos08
fd42b3f767
localize commands 2023-09-20 23:29:24 +02:00
Isse
f4ca60cbb6 Map selector and generation UI 2023-09-17 17:11:19 +00:00
Francesco Vasco
d9b7f202f5
Italian: common-sprite-crate and typo 2023-09-10 11:35:30 +00: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
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
Maxicarlos08
0c9a942027
refactor teleporter system and include nearby pets 2023-08-15 12:24:49 +02:00
Maxicarlos08
92ab8dab9a
require interaction to start teleportation 2023-08-15 12:24:49 +02:00
Maxicarlos08
ac68f0af7b
addressed review comments and added hud interaction 2023-08-15 12:24:49 +02:00
Maxicarlos08
bb2034ca92
portal particles 2023-08-15 12:24:48 +02:00
Maxicarlos08
09f7087ac6
buildup time adjustments 2023-08-15 12:24:48 +02:00
Maxicarlos08
3343ddf4cc
go into blink state at half buildup time 2023-08-15 12:24:48 +02:00
Maxicarlos08
25fcb04ad3
buildup times and portal model update 2023-08-15 12:24:48 +02:00
Maxicarlos08
0f2db68498
added portals 2023-08-15 12:24:17 +02:00
Maxicarlos08
1ea0f249f5
display if pet is currently following or staying 2023-08-15 11:10:54 +02:00
TelepathicWalrus
4bdbb3ff6b
Move stay position to agent 2023-08-15 11:10:54 +02:00
TelepathicWalrus
e611d695b1
Add stay/follow option for pets 2023-08-15 11:10:52 +02:00
Gaxrodi
e54ca7e80d ukrainian translation of all files 2023-08-14 21:54:31 +03:00
Gaxrodi
1c8d62f147 ukrainian translation of ability.ftl, trade.ftl 2023-08-12 13:17:33 +03:00
tygyh
67dcb2a778 Update swedish translations 2023-08-11 15:04:56 +02:00
Youser Nayme
5ef300c72c Add keybinding for zooming the camera 2023-08-10 16:55:09 +00:00
Michał
97725a3147 Reliable leather pack 2023-08-09 20:44:51 +00:00
Isse
58b541490b Merge branch 'fix_sea_wyvern_head_offset' into 'master' 
fix sea wyvern head offset

See merge request veloren/veloren!4059
 2023-08-09 12:44:27 +00:00
Isse
d74a743d4f update shovel voxel files to fit animations better 2023-08-08 20:44:37 +02:00
flo666
607af6f227 shovel sfx & particles 2023-08-03 21:52:55 +02:00
Isse
a39923e4d6 digging shovel 2023-08-03 19:32:09 +02:00
flo666
9bd5003d31 fix sea wyvern head offset 2023-08-03 19:25:55 +02:00
flo
57fe2c4adb spawn wyverns 2023-08-02 07:55:10 +00:00
DaforLynx
32f3437fb0 Combat music toggle 2023-07-30 08:10:36 +00:00
Sam
d6fcd893bf Addressed testing feedback 2023-07-29 19:04:10 -04:00
Sam
6e2dff7136 Weapon stats adjustments and ability icon revisions 2023-07-29 19:04:09 -04:00
Sam
30bafec247 Icons 2023-07-29 19:04:08 -04:00
Monty Marz
a4bfa1d242 skills_bg 2023-07-29 19:04:08 -04:00
Sam
9fa556b165 Axe AI 2023-07-29 19:04:07 -04:00
Sam
68181e9b5b Axe skill tree 2023-07-29 19:04:06 -04:00
Sam
93ddb36c0a Axe skill icons 2023-07-29 19:04:06 -04:00
Sam
834a811def Buff icons 2023-07-29 19:04:05 -04:00
Sam
9b126dc502 Localization for english 2023-07-29 19:04:05 -04:00
Sam
188be17b95 Defiance 2023-07-29 19:04:03 -04:00
Sam
820f8dca94 Sunder 2023-07-29 19:04:02 -04:00
Sam
a2deac19ee Furor 2023-07-29 19:03:59 -04:00
Sam
4a690840e4 Savage sense 2023-07-29 18:53:47 -04:00
Sam
3e8b2b283a Triple chop 2023-07-29 18:53:44 -04:00
Sam
80ab9c26ec Initial setup 2023-07-29 18:53:38 -04:00
Samuel Keiffer
026b61baee Merge branch 'maxicarlos08/chieftain-mask-fix' into 'master' 
Maxicarlos08/chieftain mask fix

See merge request veloren/veloren!4024
 2023-07-29 01:22:28 +00:00
Marcel
3ad6517aa1 Merge branch 'czech-translation-supply-missing-files' into 'master' 
Czech translation - adding missing files

See merge request veloren/veloren!4018
 2023-07-24 15:02:13 +00:00
Maxicarlos08
9901ba691e
fix alignment of wanderer's hat and a typo 2023-07-14 00:59:27 +02:00
Maxicarlos08
b16b1bf51f
Fix alignments and remove unused variations 2023-07-13 17:11:07 +02:00
flo666
326d33d935 re-add helmet definitions & fix offsets, add missing helmets in image and drop manifest 2023-07-13 16:25:43 +02:00
Maxicarlos08
d057e9d4d6
remove incorret chieftain mask definitions 2023-07-13 14:19:04 +02:00
Monty Marz
102945b9e7 Dungeon rework initial patch 2023-07-09 20:03:09 +00:00
Jaroslav Lichtblau
e0212f4470 Czech translation - adding missing files 2023-07-09 12:59:58 +02:00
Marcel
fd5fdd1840 Merge branch 'fix-typos-czech-translation' into 'master' 
Typos fixed in Czech localisation

See merge request veloren/veloren!4016
 2023-07-08 10:36:50 +00:00
Marcel
9b73fa0807 Merge branch 'sglorch/translation-de' into 'master' 
sglorch/translation-de

See merge request veloren/veloren!3996
 2023-07-07 15:11:16 +00:00
Stefan Glorch
4cf73b2eb4 sglorch/translation-de 2023-07-07 15:11:16 +00:00
Hugo Famechon
a648c68233 Sort items in inventory by quantity 2023-07-05 19:07:16 +00:00
Jaroslav Lichtblau
bade2a176a Typos fixed in Czech localisation 2023-07-05 18:44:24 +02:00
Marcel
32c7994cca Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!4009
 2023-07-05 13:01:08 +00:00
Samuel Keiffer
dab040baa4 Merge branch 'trade-thirdconfirm' into 'master' 
Added additional confirmation when trading for nothing.

See merge request veloren/veloren!3997
 2023-07-03 23:45:59 +00:00
Marcel
620c58fecc Merge branch 'bd/esperanto' into 'master' 
Esperanto translation

See merge request veloren/veloren!3432
 2023-07-03 23:34:36 +00:00
Brandon Dyer
a7ff12f012 Esperanto translation 2023-07-03 23:34:35 +00:00
tygyh
0b2ad222dc Update swedish translations 2023-07-03 21:10:37 +02:00
walpo
9c0046f790 i18n: add bulgarian (bg) translation 2023-07-02 08:50:17 +00:00
Joshua Barretto
ffabace13d Fixed bloom sample UV, added Cinematic shader 2023-06-28 12:21:16 +01:00
Monty Marz
5c3ab74bdf login background 2023-06-27 21:37:19 +02:00
Avi Weinstock
ced6880168 Added additional confirmation when trading for nothing. 2023-06-26 10:39:30 -04:00
Youssef Fahmy
65ea69bef3 Small balance changes 2023-06-19 01:16:42 +00:00
Samuel Keiffer
079e7bfed6 Merge branch 'uniior/cacti' into 'master' 
New/revamped cacti sprites

See merge request veloren/veloren!3986
 2023-06-18 01:22:33 +00:00
unknown
413befadae Lowercase asset files 2023-06-17 20:35:28 -04:00
unknown
1269cfe00d Lowercase asset files 2023-06-17 20:20:05 -04:00
Imbris
69dcc12dcd Merge branch 'gradientsobel' into 'master' 
Add `GradientSobel` experimental filter that adds object outlines based on the normal map.

See merge request veloren/veloren!3975
 2023-06-08 16:59:20 +00:00
Avi Weinstock
d023f9db54 Only bind the materials texture in the postprocess bindgroup if it's needed. 2023-06-07 16:21:28 -04:00
Avi Weinstock
025831d9a2 Add GradientSobel experimental filter that adds object outlines based on the normal map. 2023-06-07 15:39:57 -04:00
unknown
526386e51c Initial cacti work 2023-06-07 14:46:54 -04:00
walpo
b919312d1b Make i18n language identifiers comply with IETF BCP 47 2023-06-07 13:12:34 +00:00
Justin Shipsey
d90926e4a3 Merge branch 'master' into 'master' 
updating fr_FR translations

See merge request veloren/veloren!3966
 2023-06-04 09:32:10 +00:00
Isse
a884e0e058 Various rtsim related stuff 2023-06-03 22:14:18 +00:00
flo
16d58c6b4e plant creatures 2023-06-03 13:59:52 +00:00
Thomas S
7e7017d705 adding fr_FR translations 2023-06-01 20:17:51 +02:00
Pedro H
25c3fe3657 Add all missing pt_br translations 2023-05-31 21:19:23 +00:00
Joshua Barretto
2064ad5d80 Added color dither 2023-05-31 19:10:09 +01:00
Joshua Barretto
2a9e43b847 Draw distinction between bilinear filtering and nearest neighbour 2023-05-31 18:26:53 +01:00
Joshua Barretto
b2051767ff More experimental shaders 2023-05-31 17:07:22 +01:00
Marcel
b5c4b435ff Merge branch 'vasco-steam' into 'master' 
Italian translation

See merge request veloren/veloren!3949
 2023-05-26 15:01:05 +00:00
Marcel
5b7005f8f4 Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3929
 2023-05-26 15:01:01 +00:00
Jonathan Berglin
fc4e1c8a87 Update swedish translations 2023-05-26 15:01:00 +00:00
Francesco Vasco
713533da0b Italian translation 2023-05-24 22:45:09 +02:00
flo
a55276ea73 seachapel_rework 2023-05-24 18:13:29 +00:00
DaforLynx
1555797675 Merge branch 'thanosfisherman/loudness_adjustments' into 'master' 
adjusted eq and loudness to align with the majority of tracks

See merge request veloren/veloren!3941
 2023-05-21 21:54:30 +00:00
Thanos Psaridis
8dad923c3a adjusted eq and loudness to align with the majority of tracks 2023-05-21 21:54:29 +00:00
Joshua Barretto
2219797142 Merge branch 'zesterer/shader-block-kinds' into 'master' 
Added support for block kinds in shaders

See merge request veloren/veloren!3932
 2023-05-21 17:19:51 +00:00
Francesco Vasco
c6ab618d2e Italian translation 2023-05-20 11:49:07 +02:00
Joshua Barretto
00b2bcb7b4 Merge branch 'zesterer/one-way-walls' into 'master' 
One-way walls

See merge request veloren/veloren!3943
 2023-05-19 17:55:13 +00:00
Joshua Barretto
423e6f0348 Adjusted particle offset 2023-05-19 15:05:18 +01:00
Joshua Barretto
2893f400f8 Better particle lighting 2023-05-19 14:58:59 +01:00
Joshua Barretto
4961ca2f6d Fixed particle effect UB 2023-05-19 14:46:22 +01:00
Joshua Barretto
c73848b932 Fixed minor issues with walls, better particles 2023-05-19 14:25:49 +01:00
Joshua Barretto
c94d6c502a Added one-way wall sprites 2023-05-19 13:24:45 +01:00
Marcel
d5ca004d2b Merge branch 'vasco-adlet' into 'master' 
Italian translation

See merge request veloren/veloren!3934
 2023-05-19 09:35:30 +00:00
Tao In Way
f18297ec75 taoist/charms 2023-05-19 03:07:44 +00:00
Joshua Barretto
a634da2d07 Addressed review comments 2023-05-17 22:22:54 +01:00
Francesco Vasco
295e7003af Italian translation 2023-05-16 17:50:56 +02:00
Joshua Barretto
aeb72bcf22 Added support for block kinds in shaders 2023-05-15 17:31:21 +01:00
flo666
0ba58d8785 map icon fix & set difficulty indicator to 2 2023-05-13 09:32:28 -04:00
flo666
c7831a8ca9 loot_tables yeti&elder , 
change drum to wildskin_drum,
add map icons,
yeti attacks buff
 2023-05-13 09:32:27 -04:00
flo666
7739aaff78 add more loot 2023-05-13 09:32:24 -04:00
flo666
9a6ab28c3d adlet elder tweaks 2023-05-13 09:32:24 -04:00
flo666
ed260f832d add loot, reduce enemies 2023-05-13 09:32:21 -04:00
flo666
c2cf88da3d - bigger yetipit mob rooms 
- tweaks
 2023-05-13 09:32:20 -04:00
flo666
25ef582f1a - sprites IceCrystal, GlowIceCrystal for yetipit 
- rough creature balance
 2023-05-13 09:32:16 -04:00
flo666
38a6cc67f9 add models: bone_door, bone_keyhole, bone_key 2023-05-13 09:31:29 -04:00
flo666
6668df9f08 add adlet elder 2023-05-13 09:30:56 -04:00
flo666
86803c43bf adlet tracker tweaks 2023-05-13 09:30:54 -04:00
flo666
f936c2f00e rocky yetipit entrance & AdletTrap object 2023-05-13 09:30:54 -04:00
Sam
95347e8a60 Spear magic 2023-05-13 09:30:53 -04:00
Sam
92e28f09fc Adlet abilities 2023-05-13 09:30:51 -04:00