@dcl/protocol 1.0.0-22483842997.commit-1c3d55b → 1.0.0-22576258588.commit-8e30970

package/out-ts/decentraland/sdk/components/raycast.gen.ts

@@ -47,6 +47,41 @@ export function raycastQueryTypeToJSON(object: RaycastQueryType): string {
   }
 }
 
+export enum RaycastShape {
+  /** RS_RAY - cast a point, get collisions along a ray */
+  RS_RAY = 0,
+  /** RS_AVATAR - cast the avatar collider shape, get collisions from sweeping the shape */
+  RS_AVATAR = 1,
+  UNRECOGNIZED = -1,
+}
+
+export function raycastShapeFromJSON(object: any): RaycastShape {
+  switch (object) {
+    case 0:
+    case "RS_RAY":
+      return RaycastShape.RS_RAY;
+    case 1:
+    case "RS_AVATAR":
+      return RaycastShape.RS_AVATAR;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return RaycastShape.UNRECOGNIZED;
+  }
+}
+
+export function raycastShapeToJSON(object: RaycastShape): string {
+  switch (object) {
+    case RaycastShape.RS_RAY:
+      return "RS_RAY";
+    case RaycastShape.RS_AVATAR:
+      return "RS_AVATAR";
+    case RaycastShape.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
 /**
  * The PBRaycast component and PBRaycastResult are defined in https://adr.decentraland.org/adr/ADR-200
  *
@@ -81,7 +116,15 @@ export interface PBRaycast {
     | boolean
     | undefined;
   /** Collision mask, by default CL_POINTER | CL_PHYSICS */
-  collisionMask?: number | undefined;
+  collisionMask?:
+    | number
+    | undefined;
+  /** shape to cast, default ray */
+  shape?:
+    | RaycastShape
+    | undefined;
+  /** include hits with entities from other scenes */
+  includeWorld?: boolean | undefined;
 }
 
 function createBasePBRaycast(): PBRaycast {
@@ -93,6 +136,8 @@ function createBasePBRaycast(): PBRaycast {
     queryType: 0,
     continuous: undefined,
     collisionMask: undefined,
+    shape: undefined,
+    includeWorld: undefined,
   };
 }
 
@@ -130,6 +175,12 @@ export namespace PBRaycast {
     if (message.collisionMask !== undefined) {
       writer.uint32(72).uint32(message.collisionMask);
     }
+    if (message.shape !== undefined) {
+      writer.uint32(88).int32(message.shape);
+    }
+    if (message.includeWorld !== undefined) {
+      writer.uint32(96).bool(message.includeWorld);
+    }
     return writer;
   }
 
@@ -210,6 +261,20 @@ export namespace PBRaycast {
 
           message.collisionMask = reader.uint32();
           continue;
+        case 11:
+          if (tag !== 88) {
+            break;
+          }
+
+          message.shape = reader.int32() as any;
+          continue;
+        case 12:
+          if (tag !== 96) {
+            break;
+          }
+
+          message.includeWorld = reader.bool();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -236,6 +301,8 @@ export namespace PBRaycast {
       queryType: isSet(object.queryType) ? raycastQueryTypeFromJSON(object.queryType) : 0,
       continuous: isSet(object.continuous) ? Boolean(object.continuous) : undefined,
       collisionMask: isSet(object.collisionMask) ? Number(object.collisionMask) : undefined,
+      shape: isSet(object.shape) ? raycastShapeFromJSON(object.shape) : undefined,
+      includeWorld: isSet(object.includeWorld) ? Boolean(object.includeWorld) : undefined,
     };
   }
 
@@ -261,6 +328,9 @@ export namespace PBRaycast {
     message.queryType !== undefined && (obj.queryType = raycastQueryTypeToJSON(message.queryType));
     message.continuous !== undefined && (obj.continuous = message.continuous);
     message.collisionMask !== undefined && (obj.collisionMask = Math.round(message.collisionMask));
+    message.shape !== undefined &&
+      (obj.shape = message.shape !== undefined ? raycastShapeToJSON(message.shape) : undefined);
+    message.includeWorld !== undefined && (obj.includeWorld = message.includeWorld);
     return obj;
   }
 
@@ -312,6 +382,8 @@ export namespace PBRaycast {
     message.queryType = object.queryType ?? 0;
     message.continuous = object.continuous ?? undefined;
     message.collisionMask = object.collisionMask ?? undefined;
+    message.shape = object.shape ?? undefined;
+    message.includeWorld = object.includeWorld ?? undefined;
     return message;
   }
 }

package/out-ts/decentraland/sdk/components/ui_text.gen.ts

@@ -65,7 +65,15 @@ export interface PBUiText {
     | number
     | undefined;
   /** wrap text when the border is reached (default: TW_WRAP) */
-  textWrap?: TextWrap | undefined;
+  textWrap?:
+    | TextWrap
+    | undefined;
+  /** width of the outline (default: 0) */
+  outlineWidth?:
+    | number
+    | undefined;
+  /** RGBA color of the outline (default: opaque black) */
+  outlineColor?: Color4 | undefined;
 }
 
 function createBasePBUiText(): PBUiText {
@@ -76,6 +84,8 @@ function createBasePBUiText(): PBUiText {
     font: undefined,
     fontSize: undefined,
     textWrap: undefined,
+    outlineWidth: undefined,
+    outlineColor: undefined,
   };
 }
 
@@ -99,6 +109,12 @@ export namespace PBUiText {
     if (message.textWrap !== undefined) {
       writer.uint32(48).int32(message.textWrap);
     }
+    if (message.outlineWidth !== undefined) {
+      writer.uint32(61).float(message.outlineWidth);
+    }
+    if (message.outlineColor !== undefined) {
+      Color4.encode(message.outlineColor, writer.uint32(66).fork()).ldelim();
+    }
     return writer;
   }
 
@@ -151,6 +167,20 @@ export namespace PBUiText {
 
           message.textWrap = reader.int32() as any;
           continue;
+        case 7:
+          if (tag !== 61) {
+            break;
+          }
+
+          message.outlineWidth = reader.float();
+          continue;
+        case 8:
+          if (tag !== 66) {
+            break;
+          }
+
+          message.outlineColor = Color4.decode(reader, reader.uint32());
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -168,6 +198,8 @@ export namespace PBUiText {
       font: isSet(object.font) ? fontFromJSON(object.font) : undefined,
       fontSize: isSet(object.fontSize) ? Number(object.fontSize) : undefined,
       textWrap: isSet(object.textWrap) ? textWrapFromJSON(object.textWrap) : undefined,
+      outlineWidth: isSet(object.outlineWidth) ? Number(object.outlineWidth) : undefined,
+      outlineColor: isSet(object.outlineColor) ? Color4.fromJSON(object.outlineColor) : undefined,
     };
   }
 
@@ -181,6 +213,9 @@ export namespace PBUiText {
     message.fontSize !== undefined && (obj.fontSize = Math.round(message.fontSize));
     message.textWrap !== undefined &&
       (obj.textWrap = message.textWrap !== undefined ? textWrapToJSON(message.textWrap) : undefined);
+    message.outlineWidth !== undefined && (obj.outlineWidth = message.outlineWidth);
+    message.outlineColor !== undefined &&
+      (obj.outlineColor = message.outlineColor ? Color4.toJSON(message.outlineColor) : undefined);
     return obj;
   }
 
@@ -198,6 +233,10 @@ export namespace PBUiText {
     message.font = object.font ?? undefined;
     message.fontSize = object.fontSize ?? undefined;
     message.textWrap = object.textWrap ?? undefined;
+    message.outlineWidth = object.outlineWidth ?? undefined;
+    message.outlineColor = (object.outlineColor !== undefined && object.outlineColor !== null)
+      ? Color4.fromPartial(object.outlineColor)
+      : undefined;
     return message;
   }
 }

package/out-ts/decentraland/sdk/components/ui_transform.gen.ts

@@ -1,6 +1,7 @@
 /* eslint-disable */
 import _m0 from "protobufjs/minimal";
 import { Color4 } from "../../common/colors.gen";
+import { Vector2 } from "../../common/vectors.gen";
 
 export const protobufPackage = "decentraland.sdk.components";
 
@@ -472,6 +473,55 @@ export function pointerFilterModeToJSON(object: PointerFilterMode): string {
   }
 }
 
+export enum ShowScrollBar {
+  SSB_BOTH = 0,
+  SSB_ONLY_VERTICAL = 1,
+  SSB_ONLY_HORIZONTAL = 2,
+  SSB_HIDDEN = 3,
+  UNRECOGNIZED = -1,
+}
+
+export function showScrollBarFromJSON(object: any): ShowScrollBar {
+  switch (object) {
+    case 0:
+    case "SSB_BOTH":
+      return ShowScrollBar.SSB_BOTH;
+    case 1:
+    case "SSB_ONLY_VERTICAL":
+      return ShowScrollBar.SSB_ONLY_VERTICAL;
+    case 2:
+    case "SSB_ONLY_HORIZONTAL":
+      return ShowScrollBar.SSB_ONLY_HORIZONTAL;
+    case 3:
+    case "SSB_HIDDEN":
+      return ShowScrollBar.SSB_HIDDEN;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return ShowScrollBar.UNRECOGNIZED;
+  }
+}
+
+export function showScrollBarToJSON(object: ShowScrollBar): string {
+  switch (object) {
+    case ShowScrollBar.SSB_BOTH:
+      return "SSB_BOTH";
+    case ShowScrollBar.SSB_ONLY_VERTICAL:
+      return "SSB_ONLY_VERTICAL";
+    case ShowScrollBar.SSB_ONLY_HORIZONTAL:
+      return "SSB_ONLY_HORIZONTAL";
+    case ShowScrollBar.SSB_HIDDEN:
+      return "SSB_HIDDEN";
+    case ShowScrollBar.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
+export interface ScrollPositionValue {
+  value?: { $case: "position"; position: Vector2 } | { $case: "reference"; reference: string } | undefined;
+}
+
 export interface PBUiTransform {
   parent: number;
   rightOf: number;
@@ -616,10 +666,105 @@ export interface PBUiTransform {
   opacity?:
     | number
     | undefined;
+  /** reference for scroll_position. default empty */
+  elementId?:
+    | string
+    | undefined;
+  /** default position=(0,0) */
+  scrollPosition?:
+    | ScrollPositionValue
+    | undefined;
+  /** default ShowScrollBar.SSB_BOTH */
+  scrollVisible?:
+    | ShowScrollBar
+    | undefined;
   /** default: 0 — controls render stacking order. Higher values appear in front of lower values. */
   zIndex?: number | undefined;
 }
 
+function createBaseScrollPositionValue(): ScrollPositionValue {
+  return { value: undefined };
+}
+
+export namespace ScrollPositionValue {
+  export function encode(message: ScrollPositionValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    switch (message.value?.$case) {
+      case "position":
+        Vector2.encode(message.value.position, writer.uint32(10).fork()).ldelim();
+        break;
+      case "reference":
+        writer.uint32(18).string(message.value.reference);
+        break;
+    }
+    return writer;
+  }
+
+  export function decode(input: _m0.Reader | Uint8Array, length?: number): ScrollPositionValue {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseScrollPositionValue();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.value = { $case: "position", position: Vector2.decode(reader, reader.uint32()) };
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.value = { $case: "reference", reference: reader.string() };
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  }
+
+  export function fromJSON(object: any): ScrollPositionValue {
+    return {
+      value: isSet(object.position)
+        ? { $case: "position", position: Vector2.fromJSON(object.position) }
+        : isSet(object.reference)
+        ? { $case: "reference", reference: String(object.reference) }
+        : undefined,
+    };
+  }
+
+  export function toJSON(message: ScrollPositionValue): unknown {
+    const obj: any = {};
+    message.value?.$case === "position" &&
+      (obj.position = message.value?.position ? Vector2.toJSON(message.value?.position) : undefined);
+    message.value?.$case === "reference" && (obj.reference = message.value?.reference);
+    return obj;
+  }
+
+  export function create<I extends Exact<DeepPartial<ScrollPositionValue>, I>>(base?: I): ScrollPositionValue {
+    return ScrollPositionValue.fromPartial(base ?? {});
+  }
+
+  export function fromPartial<I extends Exact<DeepPartial<ScrollPositionValue>, I>>(object: I): ScrollPositionValue {
+    const message = createBaseScrollPositionValue();
+    if (object.value?.$case === "position" && object.value?.position !== undefined && object.value?.position !== null) {
+      message.value = { $case: "position", position: Vector2.fromPartial(object.value.position) };
+    }
+    if (
+      object.value?.$case === "reference" && object.value?.reference !== undefined && object.value?.reference !== null
+    ) {
+      message.value = { $case: "reference", reference: object.value.reference };
+    }
+    return message;
+  }
+}
+
 function createBasePBUiTransform(): PBUiTransform {
   return {
     parent: 0,
@@ -695,6 +840,9 @@ function createBasePBUiTransform(): PBUiTransform {
     borderLeftColor: undefined,
     borderRightColor: undefined,
     opacity: undefined,
+    elementId: undefined,
+    scrollPosition: undefined,
+    scrollVisible: undefined,
     zIndex: undefined,
   };
 }
@@ -920,6 +1068,15 @@ export namespace PBUiTransform {
     if (message.opacity !== undefined) {
       writer.uint32(589).float(message.opacity);
     }
+    if (message.elementId !== undefined) {
+      writer.uint32(594).string(message.elementId);
+    }
+    if (message.scrollPosition !== undefined) {
+      ScrollPositionValue.encode(message.scrollPosition, writer.uint32(602).fork()).ldelim();
+    }
+    if (message.scrollVisible !== undefined) {
+      writer.uint32(608).int32(message.scrollVisible);
+    }
     if (message.zIndex !== undefined) {
       writer.uint32(616).int32(message.zIndex);
     }
@@ -1444,6 +1601,27 @@ export namespace PBUiTransform {
 
           message.opacity = reader.float();
           continue;
+        case 74:
+          if (tag !== 594) {
+            break;
+          }
+
+          message.elementId = reader.string();
+          continue;
+        case 75:
+          if (tag !== 602) {
+            break;
+          }
+
+          message.scrollPosition = ScrollPositionValue.decode(reader, reader.uint32());
+          continue;
+        case 76:
+          if (tag !== 608) {
+            break;
+          }
+
+          message.scrollVisible = reader.int32() as any;
+          continue;
         case 77:
           if (tag !== 616) {
             break;
@@ -1549,6 +1727,9 @@ export namespace PBUiTransform {
       borderLeftColor: isSet(object.borderLeftColor) ? Color4.fromJSON(object.borderLeftColor) : undefined,
       borderRightColor: isSet(object.borderRightColor) ? Color4.fromJSON(object.borderRightColor) : undefined,
       opacity: isSet(object.opacity) ? Number(object.opacity) : undefined,
+      elementId: isSet(object.elementId) ? String(object.elementId) : undefined,
+      scrollPosition: isSet(object.scrollPosition) ? ScrollPositionValue.fromJSON(object.scrollPosition) : undefined,
+      scrollVisible: isSet(object.scrollVisible) ? showScrollBarFromJSON(object.scrollVisible) : undefined,
       zIndex: isSet(object.zIndex) ? Number(object.zIndex) : undefined,
     };
   }
@@ -1662,6 +1843,13 @@ export namespace PBUiTransform {
     message.borderRightColor !== undefined &&
       (obj.borderRightColor = message.borderRightColor ? Color4.toJSON(message.borderRightColor) : undefined);
     message.opacity !== undefined && (obj.opacity = message.opacity);
+    message.elementId !== undefined && (obj.elementId = message.elementId);
+    message.scrollPosition !== undefined &&
+      (obj.scrollPosition = message.scrollPosition ? ScrollPositionValue.toJSON(message.scrollPosition) : undefined);
+    message.scrollVisible !== undefined &&
+      (obj.scrollVisible = message.scrollVisible !== undefined
+        ? showScrollBarToJSON(message.scrollVisible)
+        : undefined);
     message.zIndex !== undefined && (obj.zIndex = Math.round(message.zIndex));
     return obj;
   }
@@ -1753,6 +1941,11 @@ export namespace PBUiTransform {
       ? Color4.fromPartial(object.borderRightColor)
       : undefined;
     message.opacity = object.opacity ?? undefined;
+    message.elementId = object.elementId ?? undefined;
+    message.scrollPosition = (object.scrollPosition !== undefined && object.scrollPosition !== null)
+      ? ScrollPositionValue.fromPartial(object.scrollPosition)
+      : undefined;
+    message.scrollVisible = object.scrollVisible ?? undefined;
     message.zIndex = object.zIndex ?? undefined;
     return message;
   }

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@dcl/protocol",
-  "version": "1.0.0-22483842997.commit-1c3d55b",
+  "version": "1.0.0-22576258588.commit-8e30970",
   "description": "",
-  "repository": "decentraland/protocol.git",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/decentraland/protocol.git"
+  },
   "homepage": "https://github.com/decentraland/protocol#readme",
   "bugs": "https://github.com/decentraland/protocol/issues",
   "keywords": [],
@@ -13,7 +16,7 @@
     "test": "./scripts/check-proto-compabitility.sh"
   },
   "devDependencies": {
-    "@protobuf-ts/protoc": "^2.11.0",
+    "@protobuf-ts/protoc": "^2.8.1",
     "proto-compatibility-tool": "^1.1.2-20220925163655.commit-25bd040",
     "typescript": "^5.0.4"
   },
@@ -30,5 +33,5 @@
     "out-js",
     "public"
   ],
-  "commit": "1c3d55b3b8d342af220eb1d7fc7e1ed3ebe25161"
+  "commit": "8e3097024cd83ae7dfb871b588f765e2c470798d"
 }

package/proto/decentraland/common/texture.proto

@@ -36,10 +36,17 @@ message VideoTexture {
   optional TextureFilterMode filter_mode = 3; // default = FilterMode.Bilinear
 }
 
+message UiCanvasTexture {
+  uint32 ui_canvas_entity = 1;
+  optional TextureWrapMode wrap_mode = 2; // default = TextureWrapMode.Clamp
+  optional TextureFilterMode filter_mode = 3; // default = FilterMode.Bilinear
+}
+
 message TextureUnion {
   oneof tex {
     Texture texture = 1; // default = null
     AvatarTexture avatar_texture = 2; // default = null
     VideoTexture video_texture = 3; // default = null
+    UiCanvasTexture ui_texture = 4;
   }
-}
+}

package/proto/decentraland/kernel/apis/restricted_actions.proto

@@ -54,6 +54,19 @@ message MovePlayerToResponse {
 
 message TeleportToResponse { }
 
+message SetUiFocusRequest {
+  string element_id = 1;
+}
+
+message ClearUiFocusRequest { }
+
+message GetUiFocusRequest { }
+
+message UiFocusResponse { 
+  // the element that is/was focussed
+  optional string element_id = 1;
+}
+
 message CopyToClipboardRequest {
   string text = 1;
 }
@@ -88,6 +101,15 @@ service RestrictedActionsService {
   // TriggerSceneEmote will trigger an scene emote file in this current user
   rpc TriggerSceneEmote(TriggerSceneEmoteRequest) returns (SuccessResponse) {}
 
+  // Sets the focus to a specific UI element
+  rpc SetUiFocus(SetUiFocusRequest) returns (UiFocusResponse) {}
+
+  // Clears the focus from any currently focused textentry or dropdown
+  rpc ClearUiFocus(SetUiFocusRequest) returns (UiFocusResponse) {}
+
+  // Returns the element_id of any currently focused textentry or dropdown
+  rpc GetUiFocus(GetUiFocusRequest) returns (UiFocusResponse) {}
+
   // CopyToClipboard copies the provided text into the clipboard
   rpc CopyToClipboard(CopyToClipboardRequest) returns (EmptyResponse) {}
 }

package/proto/decentraland/kernel/comms/rfc4/comms.proto

@@ -18,7 +18,6 @@ message Packet {
     PlayerEmote player_emote = 9;
     SceneEmote scene_emote = 10;
     MovementCompressed movement_compressed = 12;
-	LookAtPosition look_at_position = 13;
   }
   uint32 protocol_version = 11;
 }
@@ -61,41 +60,17 @@ message Movement {
   // interpolation
   bool is_instant = 17;
   bool is_emoting = 18;
-  // head-sync (enabled flags + world-space yaw and pitch angles, in degrees)
-  bool head_ik_yaw_enabled = 19;
-  bool head_ik_pitch_enabled = 20;
-  float head_yaw = 21;
-  float head_pitch = 22;
 }
 
 message MovementCompressed {
   int32 temporal_data = 1; // bit-compressed: timestamp + animations 
   int64 movement_data = 2; // bit-compressed: position + velocity 
-  int32 head_sync_data = 3; // bit-compressed: enabled flags + yaw + pitch
 }
 
 message PlayerEmote {
   uint32 incremental_id = 1;
   string urn = 2;
   float timestamp = 3;
-  optional bool is_stopping = 4; // true means the emote has been stopped in the sender's client
-  optional bool is_repeating = 5; // true when it is not the first time the looping animation plays
-  optional int32 interaction_id = 6; // identifies an interaction univocaly, established when the start animation is triggered
-  optional int32 social_emote_outcome = 7; // -1 means it does not use an outcome animation
-  optional bool is_reacting = 8; // to a social emote started by other user
-  optional string social_emote_initiator = 9; // wallet address of the user that initiated social emote
-  optional string target_avatar = 10; // wallet address of the user whose avatar is the target of a directed emote
-}
-
-// Message sent to force an avatar to look at a position
-message LookAtPosition
-{
-  float timestamp = 1;
-  // world position
-  float position_x = 2;
-  float position_y = 3;
-  float position_z = 4;
-  string target_avatar_wallet_address = 5;
 }
 
 message SceneEmote {
@@ -128,10 +103,6 @@ message ProfileResponse {
 message Chat {
   string message = 1;
   double timestamp = 2;
-
-  // Extension: optional forwarded_from to identify the original sender when
-  // messages are forwarded through an SFU
-  optional string forwarded_from = 3;
 }
 
 message Scene {

package/proto/decentraland/sdk/components/avatar_equipped_data.proto

@@ -10,4 +10,5 @@ option (common.ecs_component_id) = 1091;
 message PBAvatarEquippedData {
   repeated string wearable_urns = 1;
   repeated string emote_urns = 2;
-}
+  repeated string force_render = 3; // slots that will render even if hidden
+}

package/proto/decentraland/sdk/components/avatar_modifier_area.proto

@@ -23,6 +23,8 @@ message PBAvatarModifierArea {
   decentraland.common.Vector3 area = 1;      // the 3D size of the region
   repeated string exclude_ids = 2;           // user IDs that can enter and remain unaffected
   repeated AvatarModifierType modifiers = 3; // list of modifiers to apply
+  optional AvatarMovementSettings movement_settings = 4;
+  optional bool use_collider_range = 5;      // if true, the player will be considered inside the area when they are within 0.3m of the area. default true
 }
 
 // AvatarModifierType is an effect that should be applied to avatars inside the region.
@@ -30,3 +32,22 @@ enum AvatarModifierType {
   AMT_HIDE_AVATARS = 0;      // avatars are invisible
   AMT_DISABLE_PASSPORTS = 1; // selecting (e.g. clicking) an avatar will not bring up their profile.
 }
+
+message AvatarMovementSettings {
+  optional AvatarControlType control_mode = 1;
+  // if not explicitly set, the following properties default to user's preference settings
+  optional float run_speed = 2;              // speed the player moves at, in m/s
+  optional float friction = 3;               // how fast the player gets up to speed or comes to rest. higher = more responsive
+  optional float gravity = 4;                // how fast the player accelerates vertically when not on a solid surface, in m/s. should normally be negative
+  optional float jump_height = 5;            // how high the player can jump, in meters. should normally be positive. gravity must have the same sign for jumping to be possible
+  optional float max_fall_speed = 6;         // max fall speed in m/s. should normally be negative
+  optional float turn_speed = 7;             // speed the player turns in tank mode, in radians/s
+  optional float walk_speed = 8;             // speed the player walks at, in m/s
+  optional bool allow_weighted_movement = 9; // whether to allow player to move at a slower speed (e.g. with a walk-key or when using a gamepad/joystick). defaults to true  
+}
+
+enum AvatarControlType {
+  CCT_NONE = 0;     // avatar cannot move
+  CCT_RELATIVE = 1; // avatar moves relative to the camera origin
+  CCT_TANK = 2;     // avatar moves like a tank: left/right rotate the player, forward/backward advance/retreat the player
+}