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
Imbris
e8361d5abf
Merge branch 'imbris/sync-toggle' into 'master'
...
Add field to Presence to control when an entity is synced to other clients
See merge request veloren/veloren!3972
2023-08-16 00:10:35 +00:00
Joshua Barretto
7497ef93c8
Merge branch 'coastal_town_fence_fix' into 'master'
...
coastal town fence fix
See merge request veloren/veloren!4070
2023-08-15 22:34:38 +00:00
flo
36c0096f6a
coastal town fence fix
2023-08-15 22:34:38 +00:00
Joshua Barretto
38c986fa59
Merge branch 'TelepathicWalrus/stay_follow_pets' into 'master'
...
Add stay/follow option for pets
See merge request veloren/veloren!3906
2023-08-15 10:19:58 +00:00
Joshua Barretto
4b5dd58c2e
Merge branch 'treant_sapling_disable_flee' into 'master'
...
treant_sapling: disable flee
See merge request veloren/veloren!4074
2023-08-15 09:53:29 +00:00
flo
9a50a2452e
treant_sapling: disable flee
2023-08-15 09:53:28 +00:00
Maxicarlos08
2446ec8940
added changelog entry
2023-08-15 11:11:20 +02:00
Maxicarlos08
13dbf679c5
review
2023-08-15 11:10:54 +02:00
Michal Sroczynski
b7c56c9057
Hud fix
2023-08-15 11:10:54 +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
2cb8e2ca84
Update code quality
2023-08-15 11:10:53 +02:00
Joshua Barretto
62d998252d
sync
2023-08-15 11:10:53 +02:00
TelepathicWalrus
6adca217fe
Clean code
2023-08-15 11:10:53 +02:00
TelepathicWalrus
6a080c242c
Add server side check to stop stay when mounted
...
Add filter to allow telling other pets to stay when mounted
2023-08-15 11:10:53 +02:00
TelepathicWalrus
0648ba1bc6
Clean Code
...
Remove option to mount if pet is told to stay
2023-08-15 11:10:53 +02:00
TelepathicWalrus
25f1f8f6cb
Changed to .filter and .min_by_key for iterator
2023-08-15 11:10:53 +02:00
TelepathicWalrus
5894913ede
Changed mod.rs to use CachedSpatialGrid
2023-08-15 11:10:53 +02:00
TelepathicWalrus
d6496c999d
Removed is_stay variable
...
Added server side owner and distance checks
2023-08-15 11:10:53 +02:00
TelepathicWalrus
d9d364fe79
Add stay position to PetState
...
Pets will now stay within 10 voxels of where they were told to stay
Added MAX_STAY_DISTANCE constant
Fixed being able to tell pet to stay when mounted
2023-08-15 11:10:53 +02:00
TelepathicWalrus
9597810e3d
Remove is_stay function
...
Clean code
2023-08-15 11:10:53 +02:00
TelepathicWalrus
6f0997705f
Clean code
2023-08-15 11:10:53 +02:00
TelepathicWalrus
e611d695b1
Add stay/follow option for pets
2023-08-15 11:10:52 +02:00
Imbris
aba0c23bc7
Make sync_me based of PresenceKind rather than being an independent
...
field.
2023-08-11 20:09:55 -04:00
Imbris
ecb27deeae
When sync_me is false avoid:
...
* Logging a warning when deleting the entity and it is not in any
Region.
* Searching every single region for an entity that is in none of them.
Also:
* Add workaround for bug in specs where deleting any entity clears the
components before checking that the generation is correct (surprised
that we haven't encounted bugs from this yet).
* Properly update `tracked_entities` inside `RegionMap` when deleting
an entity. Previously, we just relied on this being updated in
`RegionMap::tick` by the absence of the `Pos` component at that index.
However, this means if a new entity is created at that index after
deletion and before calling `RegionMap::tick`, then this can be
interpreted as an entity moving between regions rather than one being
deleted and another created. It seems like this could lead to
synchronization bugs like not creating the new entity on the client
(although I haven't noticed this before, I think maybe we use newly
inserted `Uid`s to detect new entities rather than the region system?).
I think it could at least lead to sending redundant messages to
synchronize the new entity.
2023-08-11 20:09:55 -04:00
Imbris
cdca700297
Properly check conditions for when the client's physics components should be synced
2023-08-11 20:09:55 -04:00
Imbris
396c08e7ee
Also make sure physics components are synced
2023-08-11 20:09:55 -04:00
Imbris
997babca18
Always sync components for a client's entity even if it has no position
...
or has sync_me false in `Presence`.
2023-08-11 20:09:55 -04:00
Imbris
ba7d7481d7
Move RegionMap insertion into ecs and ticking from common into server
...
Since it now needs Presence component to be available and we don't use
the RegionMap on the client.
2023-08-11 20:09:55 -04:00
Imbris
a01f75b38d
Add sync_me parameter to Presence that must be set to true for
...
entities with the `Presence` component to be synced to other clients.
2023-08-11 20:09:55 -04:00
Isse
c6e9d3a202
Merge branch 'neutralmodder/zoom-keybind' into 'master'
...
Add keybinding for zooming the camera
See merge request veloren/veloren!4050
2023-08-10 16:55:09 +00:00
Youser Nayme
5ef300c72c
Add keybinding for zooming the camera
2023-08-10 16:55:09 +00:00
Isse
02e67a0f4a
Merge branch 'qsto/new_backpack' into 'master'
...
Reliable leather pack
See merge request veloren/veloren!4066
2023-08-09 20:44:52 +00:00
Michał
97725a3147
Reliable leather pack
2023-08-09 20:44:51 +00:00
Isse
ea89f27658
Merge branch 'qsto/desert_hum_fix' into 'master'
...
Desert hum fix
See merge request veloren/veloren!4065
2023-08-09 15:53:17 +00:00
Michał
5762e62704
Desert hum fix
2023-08-09 15:53:16 +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
b3899d6966
Merge branch 'isse/usable-shovel' into 'master'
...
Usable shovel
See merge request veloren/veloren!4060
2023-08-08 18:45:10 +00:00
Isse
d74a743d4f
update shovel voxel files to fit animations better
2023-08-08 20:44:37 +02:00
Isse
ba1cee4fd2
more animation
2023-08-06 21:39:38 +02:00
DaforLynx
3ddc3f5f72
Merge branch 'DaforLynx/repair_sfx' into 'master'
...
Play sfx on successful repair
See merge request veloren/veloren!4062
2023-08-05 18:49:49 +00:00
DaforLynx
16f53d33ed
Play sfx on successful repair
2023-08-05 18:49:49 +00:00
Isse
98385b3b15
animation
2023-08-04 13:59:22 +02:00
Marcel
aaaa8c13b0
Merge branch 'xMAC94x/fix_gittag_ci_step' into 'master'
...
try to fix gittag job
See merge request veloren/veloren!4042
2023-08-04 09:23:43 +00:00
flo666
db6ebcd685
remove shovel outcome trigger from combomelee state
2023-08-03 23:00:32 +02:00
flo666
607af6f227
shovel sfx & particles
2023-08-03 21:52:55 +02:00
Isse
b06960ce1c
fix interaction_text
2023-08-03 20:56:26 +02:00
flo666
5f7895ffa0
wyverns: parallel loot drops - All()
2023-08-03 20:11:51 +02:00
