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,860 Commits 151 Branches 18 Tags 2.1 GiB
88a4d0898f
Commit Graph

3986 Commits

Author SHA1 Message Date
Justin Shipsey
c422616f70 Merge branch 'slipped/lavanoise' into 'master' 
lava noise

See merge request veloren/veloren!4147
 2023-10-20 18:11:24 +00:00
Joshua Barretto
cfc5a5c0f0 Stop dullahan spawning in the overworld 2023-10-19 18:24:54 +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
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
flo
21bf0a5572 Merge branch 'pirate_hideout_site' into 'master' 
site pirate_hideout

See merge request veloren/veloren!4057
 2023-08-16 06:59:59 +00:00
flo
fba1976dee site pirate_hideout 2023-08-16 06:59:58 +00: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
ed8fe545f8
Fixed temperate dungeon entrance height and wall artifacts around dungeons 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
Michal Sroczynski
3a6c3ac669 Small adjustments 2023-08-11 14:09:31 +02:00
Michal Sroczynski
daa1e1b00d Small adjustments 2023-08-11 11:55:25 +02:00
Michal Sroczynski
c8feb568ba Bosses loot overhaul p1 2023-08-11 09:47:13 +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
flo666
5f7895ffa0 wyverns: parallel loot drops - All() 2023-08-03 20:11:51 +02:00
Isse
5e225d7f35 add to changelog 2023-08-03 19:38:31 +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
UncomfySilence
4c953cd36a teeny tweak 2023-08-02 22:53:49 +02:00
Michal Sroczynski
2c23781d22 Remove tiers from dungeons names 2023-08-02 18:48:01 +02:00
Michal Sroczynski
c1b8544065 Fix 2023-08-02 18:48:01 +02:00
Michal Sroczynski
4879f75069 Various loot changes 2023-08-02 18:47:59 +02:00
Michal Sroczynski
a577ed1d36 Changes to Gnarling Tree 2023-08-02 18:45:40 +02:00
Isse
b08b9cf8e8 Merge branch 'spawn_wyverns' into 'master' 
spawn wyverns

See merge request veloren/veloren!3994
 2023-08-02 07:55:10 +00:00
flo
57fe2c4adb spawn wyverns 2023-08-02 07:55:10 +00:00
Michal Sroczynski
2805509c12 Brinestone armor recipe fix 2023-08-02 09:06:02 +02:00
DaforLynx
32f3437fb0 Combat music toggle 2023-07-30 08:10:36 +00:00
Sam
d2cbcbe698 Changelog and rebase fixes 2023-07-29 19:12:54 -04:00
Sam
4bc6d9a6dc Added documentation 2023-07-29 19:04:44 -04:00
Sam
e3ad16ef47 Addressed review comments 2023-07-29 19:04:11 -04:00
Sam
d6fcd893bf Addressed testing feedback 2023-07-29 19:04:10 -04:00
Sam
df0244c5e7 Balancing feedback 2023-07-29 19:04:09 -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
27f590352f Capsize 2023-07-29 19:04:04 -04:00
Sam
976ecaa0b6 Bulkhead 2023-07-29 19:04:04 -04:00
Sam
98f33f0633 Keelhaul 2023-07-29 19:04:03 -04:00
Sam
188be17b95 Defiance 2023-07-29 19:04:03 -04:00
Sam
c62626cec1 Plunder 2023-07-29 19:04:02 -04:00
Sam
820f8dca94 Sunder 2023-07-29 19:04:02 -04:00
Sam
daea14f8e5 Skull bash 2023-07-29 19:04:01 -04:00