Commit Graph

14226 Commits

Author SHA1 Message Date
29a1a7050b Loot, foods and salvage tweaks 2023-07-19 14:16:20 +00:00
9cbbf5c28b Merge branch 'imbris/fix-3983' into 'master'
Revert GIT_STRATEGY: none from !3983

See merge request veloren/veloren!4033
2023-07-19 13:19:22 +00:00
02637ff347 Revert GIT_STRATEGY: none from !3983, it turns out that the git repo is
actually needed in the docker job for the docker file in the server-cli
folder... although it is only 1 file so there may be more efficient ways
to get it...
2023-07-18 21:33:02 -04:00
7bc3596caa Merge branch 'xMAC94x/remove_old_code' into 'master'
update mumble-link and remove a old path handling

See merge request veloren/veloren!4030
2023-07-17 21:39:39 +00:00
93adeaa491 Merge branch 'imbris/minor-ci-opt' into 'master'
Minor CI optimization

See merge request veloren/veloren!3983
2023-07-17 10:09:44 +00:00
31da906f84 update mumble-link and remove a old path to migrate pre-2020 voxygen saves to the new save location
With this change people with older version need to run a version from 2021-2022 before updating to this change and start singleplayer once.
Get rid of old rust dependencies
2023-07-17 10:50:53 +02:00
fb99265d4a Use common base image for gittag job 2023-07-16 20:30:56 -04:00
f0a324e729 Minor CI optimization (don't fetch git repo in docker publishing job
where we don't use it)

(and cargo decided to update cfg-if version in random dependency)
2023-07-16 20:30:55 -04:00
2c7a9d1a7a Use SI prefixes as suffixes for shortening item quantities shown in slots, to prevent the quantity associated with large stacks from overflowing into adjacent grid cells. 2023-07-14 11:02:37 -04:00
7f06607899 Remove coin counter at the bottom of inventories. 2023-07-14 11:02:37 -04:00
9901ba691e fix alignment of wanderer's hat and a typo 2023-07-14 00:59:27 +02:00
2cbb104243 Miner helmet migrations 2023-07-13 17:18:46 +02:00
b16b1bf51f Fix alignments and remove unused variations 2023-07-13 17:11:07 +02:00
326d33d935 re-add helmet definitions & fix offsets, add missing helmets in image and drop manifest 2023-07-13 16:25:43 +02:00
d057e9d4d6 remove incorret chieftain mask definitions 2023-07-13 14:19:04 +02:00
1605fdb610 Merge branch 'fix_desertcity_repairbench' into 'master'
fix_desertcity_repairbench

See merge request veloren/veloren!4023
2023-07-13 11:30:53 +00:00
flo
36889f671e fix_desertcity_repairbench 2023-07-13 11:30:53 +00:00
e48ef26952 Merge branch 'floppy_coastal_town' into 'master'
coastal_town

See merge request veloren/veloren!3887
2023-07-12 23:02:40 +00:00
flo
b556befe73 coastal_town 2023-07-12 23:02:40 +00:00
02cb319624 Refactor save_thread function 2023-07-12 21:46:57 +02:00
f94061dbfb Merge branch 'dwarven_quarry' into 'master'
Dwarven Dungeon

See merge request veloren/veloren!3978
2023-07-09 20:03:10 +00:00
102945b9e7 Dungeon rework initial patch 2023-07-09 20:03:09 +00:00
e0212f4470 Czech translation - adding missing files 2023-07-09 12:59:58 +02:00
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
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
4cf73b2eb4 sglorch/translation-de 2023-07-07 15:11:16 +00:00
b79ef70a17 Merge branch 'consumable-improvements' into 'master'
Small reduction of craftable consumables costs

See merge request veloren/veloren!4011
2023-07-06 12:13:14 +00:00
ac4b277d7c Merge branch 'loot-changes' into 'master'
Loot changes

See merge request veloren/veloren!4007
2023-07-06 12:11:29 +00:00
a8ce3240c2 Loot changes 2023-07-06 12:11:28 +00:00
6d966eede2 Merge branch 'RunRobDog/Spawn-Entities-tab' into 'master'
RunRobDog/spawn entities tab

See merge request veloren/veloren!3877
2023-07-06 11:37:42 +00:00
34ffad71df Merge branch 'xMAC94x/tcp_buffer' into 'master'
increase the TCP Recv Buffer

See merge request veloren/veloren!4013
2023-07-06 10:45:17 +00:00
8afcf07465 Merge branch 'Fengo/sort_by_quantity' into 'master'
Sort items in inventory by quantity

See merge request veloren/veloren!4015
2023-07-05 19:07:17 +00:00
a648c68233 Sort items in inventory by quantity 2023-07-05 19:07:16 +00:00
bade2a176a Typos fixed in Czech localisation 2023-07-05 18:44:24 +02:00
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
2101d8264c xVAR did some research here: https://discord.com/channels/449602562165833758/450065987006496768/979121835801202688
and because of that we decided to set the recv buffer to 512kB via linux kernel parameters.
We didn't had any problems on the official server so we wanted to bake that into code.
There is a calculator https://www.switch.ch/network/tools/tcp_throughput/?mss=1460&rtt=80&loss=1e-06&bw=10&rtt2=500&win=1024&Calculate=Calculate
that said for 10Mbits/ speed 16kB recv buffer and 500ms we only can expect effective 0.24 Mbits of actuall data speed.
Nothing mentioned increasing the send buffer, but it prob cant hurt from a server side or ?

 cat /proc/sys/net/core/wmem_default showed 212992
 cat /proc/sys/net/core/rmem_default showed 212992
 sysctl -w net.ipv4.tcp_wmem="4096 524288 4194304" was beeing used
 sysctl -w net.ipv4.tcp_wmem="4096 16384 4194304" was the default
2023-07-04 23:48:59 +02:00
884b881b68 Small reduction of craftable consumables costs 2023-07-04 19:43:34 +02:00
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
620c58fecc Merge branch 'bd/esperanto' into 'master'
Esperanto translation

See merge request veloren/veloren!3432
2023-07-03 23:34:36 +00:00
a7ff12f012 Esperanto translation 2023-07-03 23:34:35 +00:00
645d063dcd Merge branch 'sam/durability-tweaks' into 'master'
Durability tweaks

See merge request veloren/veloren!3985
2023-07-03 23:34:33 +00:00
7380b9b485 Merge branch 'wildlife_spawn_work' into 'master'
wildlife_spawn_work

See merge request veloren/veloren!3992
2023-07-03 23:21:56 +00:00
flo
3611fd2b3d wildlife_spawn_work 2023-07-03 23:21:56 +00:00
0b2ad222dc Update swedish translations 2023-07-03 21:10:37 +02:00
551209dd76 Merge branch 'fix-plugin-feature' into 'master'
Fix client without plugin feature

See merge request veloren/veloren!4008
2023-07-03 10:21:20 +00:00
3c5857527c fix client without plugin feature 2023-07-03 11:18:49 +02:00
2f6880bc5b Merge branch 'christof/remove_wasm32_cfg' into 'master'
upgrade wasmer, implement basic WASI, turn off login events for now

See merge request veloren/veloren!3991
2023-07-02 10:15:18 +00:00
e5dbf3ec2e Merge branch 'walpo/add-bulgarian-translation' into 'master'
i18n: add bulgarian (bg) translation

See merge request veloren/veloren!4005
2023-07-02 08:50:17 +00:00
9c0046f790 i18n: add bulgarian (bg) translation 2023-07-02 08:50:17 +00:00
1630660094 format 2023-07-01 21:40:07 +02:00