Merge branch 'main' into protocol-squad

decentraland · Oct 24, 2024 · 471b772 · 471b772
2 parents 8a6cf9b + ba19c4f
commit 471b772
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/proto/decentraland/kernel/comms/rfc4/comms.proto b/proto/decentraland/kernel/comms/rfc4/comms.proto
@@ -57,6 +57,8 @@ message Movement {
   bool is_falling = 14;
 
   bool is_stunned = 15;
+
+  float rotation_y = 16;
 }
 
 message MovementCompressed {

diff --git a/proto/decentraland/sdk/components/material.proto b/proto/decentraland/sdk/components/material.proto
@@ -22,14 +22,15 @@ message PBMaterial {
     optional float alpha_test = 2; // default = 0.5. range value: from 0 to 1
     optional bool cast_shadows = 3; // default =  true
     optional decentraland.common.Color4 diffuse_color = 4; // default = white;
+    optional decentraland.common.TextureUnion alpha_texture = 5; // default = null
   }
 
   message PbrMaterial {
     optional decentraland.common.TextureUnion texture = 1; // default = null
 
     optional float alpha_test = 2; // default = 0.5. range value: from 0 to 1
     optional bool cast_shadows = 3; // default =  true
-
+    // @deprecated Alpha textures are no longer supported on PBRMaterial and UnlitMaterial.alphaTexture should be used instead.
     optional decentraland.common.TextureUnion alpha_texture = 4; // default = null
     optional decentraland.common.TextureUnion emissive_texture = 5; // default = null
     optional decentraland.common.TextureUnion bump_texture = 6; // default = null

diff --git a/proto/decentraland/sdk/components/realm_info.proto b/proto/decentraland/sdk/components/realm_info.proto
@@ -11,4 +11,5 @@ message PBRealmInfo {
   string comms_adapter = 4;
   bool is_preview = 5;
   optional string room = 6;
+  optional bool is_connected_scene_room = 7;
 }