Marcel Märtens
675d3aefd3
add some conservative recv and send buffer size, to handle slow acks
2022-05-28 18:54:42 +02:00
Ben Wallis
ae54307080
Merge branch 'xvar/loot-ownership' into 'master'
...
Added loot ownership
See merge request veloren/veloren!3388
2022-05-28 12:06:49 +00:00
Ben Wallis
34f580dfaa
Introduced loot ownership rules to combat loot stealing by players
...
* Added `LootOwner` component used to indicate that an `ItemDrop` entity is owned by another entity
* A loot winner is now calculated after EXP allocation using the EXP per entity for weighted chance distribution
* Used existing Inventory Full overitem text to show "Owned by {player} for {seconds}secs" when a pickup fails due to a loot ownership check
* Updated agent code to take into account loot ownership when searching for `ItemDrop` targets to pick up
* Added `loot` ECS system to clear expired loot ownerships
2022-05-28 12:06:49 +00:00
Isse
bba81c65d9
Merge branch 'christof/skiing' into 'master'
...
Skiing and ice skating
See merge request veloren/veloren!3106
2022-05-27 17:19:52 +00:00
Christof Petig
2bf8e1865f
Skiing and ice skating
2022-05-27 17:19:52 +00:00
Samuel Keiffer
70d82a72ff
Merge branch 'Arjen/non-humanoid-pickup-food' into 'master'
...
Non-humanoid picking up consumables when hungry
See merge request veloren/veloren!3403
2022-05-27 16:57:53 +00:00
StereoJunkie
3015b4a29d
Non-humanoid picking up consumables when hungry
2022-05-27 16:57:53 +00:00
Imbris
ca1a27bd11
Merge branch 'imbris/update-tracy' into 'master'
...
Update tracy
See merge request veloren/veloren!3400
2022-05-27 02:50:24 +00:00
Imbris
5cf899c4fe
Plot fixes in client and dynamic name fix in voxygen (tracy update)
2022-05-26 22:19:11 -04:00
Samuel Keiffer
8b7f08e8ab
Merge branch 'makselord/ingots' into 'master'
...
fixed silver, gold, copper, tin ingots not showing correctly in crafting
See merge request veloren/veloren!3402
2022-05-26 22:13:33 +00:00
Makselord
5c8c88b786
fixed silver, gold, copper, tin ingots not showing correctly in crafting
2022-05-26 17:08:39 -04:00
Joshua Barretto
3b6e6be947
Merge branch 'zesterer/fix-climbing' into 'master'
...
Fixed climbing
See merge request veloren/veloren!3401
2022-05-26 09:34:10 +00:00
Joshua Barretto
4eb781cdf7
Fixed climbing
2022-05-26 10:08:41 +01:00
Imbris
a366fc4512
Update tracy
2022-05-26 00:04:03 -04:00
Marcel
fb6a8e0360
Merge branch 'xMAC94x/network_error' into 'master'
...
Pass network errors through the stack to display them in logs
See merge request veloren/veloren!3385
2022-05-25 22:12:42 +00:00
Marcel
5c2eda64da
Merge branch 'christof/MR3316_reworked' into 'master'
...
MR3316 "Draft: Updated translations" without the directory movement and squashed
See merge request veloren/veloren!3391
2022-05-24 22:10:22 +00:00
Christof Petig
2e6e864672
fix missing comma at line ends
2022-05-24 23:31:20 +02:00
Samuel Keiffer
b9c324a183
Merge branch 'tame_and_mount_special_casing' into 'master'
...
Special case taming and mounting.
See merge request veloren/veloren!3354
2022-05-24 02:09:45 +00:00
N A
d84a26dfd8
Special case taming and mounting.
2022-05-24 02:09:45 +00:00
Justin Shipsey
1b5c4b0749
Merge branch 'Corvella/bow_zoom_toggle' into 'master'
...
Add a setting to toggle zooming in when charging bow
See merge request veloren/veloren!3396
2022-05-23 23:09:47 +00:00
Corvella
a9622fe28e
Add a setting to toggle zooming in when charging bow
2022-05-23 23:09:47 +00:00
Marcel
d50b960592
Merge branch 'Corvella/hitboxes' into 'master'
...
Hitbox improvements
See merge request veloren/veloren!3395
2022-05-23 09:18:11 +00:00
Corvella
42af9b8e15
Hitbox improvements
2022-05-23 09:18:10 +00:00
Marcel Märtens
fc735f509e
fix a unrelated clippy issue that came up suddenly
2022-05-23 09:20:54 +02:00
Marcel Märtens
e194a2e334
export unterlying errors via network crate, to generate more detailed logs
2022-05-23 02:00:56 +02:00
Joshua Barretto
8e0295ff47
Merge branch 'dawn-vs-dusk' into 'master'
...
Split sky shader's twilight into dawn and dusk
See merge request veloren/veloren!3390
2022-05-22 21:55:52 +00:00
Stanisław Grupiński
5ac9c720a1
MR3316 "Draft: Updated translations" without the directory movement and squashed:
...
Renewed Polish translations
Added spaces and change sequences so code fits to English version
2022-05-22 23:01:40 +02:00
Joshua Barretto
e1bd2c1f0c
Merge branch 'zesterer-master-patch-64170' into 'master'
...
Fixed frozen character when wall-run into water horizontally
See merge request veloren/veloren!3389
2022-05-22 18:59:29 +00:00
Hugo Peixoto
fe11d6d5bc
Split sky shader's twilight into dawn and dusk
...
Instead of having the same color profiles for the sky's color, light,
and halo, we now have the ability to define different values for dawn
and dusk.
The dusk values were unchanged and the dawn values are similar, but with
less red. These should probably be tweaked a bit more.
2022-05-22 19:54:44 +01:00
Joshua Barretto
d18483756b
Fixed frozen character when wall-run into water horizontally
2022-05-22 19:37:52 +01:00
Marcel
34c12092cc
Merge branch 'Samuellm93-master-patch-97383' into 'master'
...
Update common.ron pt_BR. Added some variables and edited a few.
See merge request veloren/veloren!3387
2022-05-22 13:11:57 +00:00
Ben Wallis
4327c083a8
Merge branch 'Eurydia/added-th_TH' into 'master'
...
Add Thai translation
See merge request veloren/veloren!3386
2022-05-22 10:06:37 +00:00
Euryn
88eaef3145
Add Thai translation
2022-05-22 10:06:36 +00:00
Samuel Lopes Mastrofrancisco
75d109ef6e
Update common.ron pt_BR. Added some variables and edited a few.
2022-05-21 00:11:04 +00:00
Samuel Keiffer
813a493f9a
Merge branch 'Chaseowski/Balance' into 'master'
...
Multiple Balance Tweaks & Miscellaneous Changes
See merge request veloren/veloren!3372
2022-05-19 22:46:31 +00:00
Chase Rozon
7dcee3eb23
Multiple Balance Tweaks & Miscellaneous Changes
2022-05-19 22:46:31 +00:00
Samuel Keiffer
dc9fe8932b
Merge branch 'NPC_item_pickup' into 'master'
...
NPC itemdrop picking up
See merge request veloren/veloren!3308
2022-05-19 22:06:44 +00:00
N A
1f82dab948
NPC itemdrop picking up
2022-05-19 22:06:44 +00:00
Samuel Keiffer
faa4c85cbb
Merge branch 'modular-fixes' into 'master'
...
Tweaks for this week
See merge request veloren/veloren!3383
2022-05-19 19:35:32 +00:00
Youssef Fahmy
080d8ef8b1
Tweaks for this week
2022-05-19 19:35:31 +00:00
Imbris
73244893cc
Merge branch 'update-it_IT' into 'master'
...
Updated the italian translation
See merge request veloren/veloren!3359
2022-05-19 03:51:44 +00:00
Imbris
50c34e56ce
Merge branch 'chucksys/chat-opacity-text' into 'master'
...
Add chat window opacity value alongside slider
See merge request veloren/veloren!3377
2022-05-19 03:48:20 +00:00
Samuel Keiffer
3f60629c54
Merge branch 'sam/item-key-rework' into 'master'
...
Simplified item key
Closes #1549
See merge request veloren/veloren!3382
2022-05-19 03:48:17 +00:00
Sam
bbe22d6807
Fixed bins (no assets)
2022-05-18 16:44:09 -04:00
Sam
aeca67443b
Simplified item key (assets)
2022-05-18 16:28:10 -04:00
Sam
534c7dc8b9
Simplified item key (no assets)
2022-05-18 16:28:06 -04:00
Samuel Keiffer
c3377547c3
Merge branch 'modular-weapons' into 'master'
...
Modular weapons
Closes #1255
See merge request veloren/veloren!2708
2022-05-18 00:42:03 +00:00
Sam
94d05b4ddf
Changelog
2022-05-17 19:57:16 -04:00
Sam
ed9bb7adae
Added comments to persistence code
2022-05-17 19:05:43 -04:00
Sam
46fe8604b7
Added search filtering to modular entries in crafting UI
2022-05-16 15:11:46 -04:00
