Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-06 17:12:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bump protocol

Browse source
This commit is contained in:
HifiExperiments 2024-10-18 19:10:23 -07:00
parent e288abcf4c
commit e52a7e4613
3 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/ZoneEntityItem.cpp.in
View file

@ -339,7 +339,7 @@ bool ZoneEntityItem::matchesJSONFilters(const QJsonObject& jsonFilters) const {
// If set match zones of interest to avatar mixer: // If set match zones of interest to avatar mixer:
if (jsonFilters.contains(AVATAR_PRIORITY_PROPERTY) && jsonFilters[AVATAR_PRIORITY_PROPERTY].toBool() if (jsonFilters.contains(AVATAR_PRIORITY_PROPERTY) && jsonFilters[AVATAR_PRIORITY_PROPERTY].toBool()
&& (_avatarPriority != COMPONENT_MODE_INHERIT || _screenshare != COMPONENT_MODE_INHERIT)) { && _avatarPriority != COMPONENT_MODE_INHERIT) {
return true; return true;
} }

8
libraries/entities/src/ZoneEntityItem.h.in
View file

@ -57,14 +57,6 @@ public:
const TonemappingPropertyGroup& getTonemappingProperties() const { return _tonemappingProperties; } const TonemappingPropertyGroup& getTonemappingProperties() const { return _tonemappingProperties; }
const AmbientOcclusionPropertyGroup& getAmbientOcclusionProperties() const { return _ambientOcclusionProperties; } const AmbientOcclusionPropertyGroup& getAmbientOcclusionProperties() const { return _ambientOcclusionProperties; }
/**
* @brief Backwards compatibility for screenshare and the like
* Doesn't do anything.
* @param value
*/
void ignoreUint32(uint32_t value) { /* nothing */ };
void setUserData(const QString& value) override; void setUserData(const QString& value) override;
bool keyLightPropertiesChanged() const { return _keyLightPropertiesChanged; } bool keyLightPropertiesChanged() const { return _keyLightPropertiesChanged; }

1
libraries/networking/src/udt/PacketHeaders.h
View file

@ -363,6 +363,7 @@ enum class EntityVersion : PacketVersion {
ModelLoadPriority, ModelLoadPriority,
PropertyCleanup, PropertyCleanup,
TextVerticalAlignment, TextVerticalAlignment,
RemoveScreenshare,
// Add new versions above here // Add new versions above here
NUM_PACKET_TYPE, NUM_PACKET_TYPE,