Skip to content

Commit

Permalink
Merge branch 'main' into feat/tweens
Browse files Browse the repository at this point in the history
  • Loading branch information
gonpombo8 authored Sep 26, 2023
2 parents 19efa67 + a9a962a commit 12b9f86
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 240 deletions.
12 changes: 1 addition & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ protoc \
--dcl_ts_proto_out="$(pwd)/out-ts" \
-I="$(pwd)/node_modules/@dcl/protocol/public" \
-I="$(pwd)/node_modules/@dcl/protocol/proto" \
"$(pwd)/node_modules/@dcl/protocol/public/bff-services.proto"
"$(pwd)/node_modules/@dcl/protocol/public/sdk-components.proto"
```

# Style Guidelines
Expand Down Expand Up @@ -64,16 +64,6 @@ Some guidelines and testing before merge:
Repositories: [kernel](https://github.com/decentraland/kernel/), [js-sdk-toolchain](https://github.com/decentraland/js-sdk-toolchain/) and [scene-runtime](https://github.com/decentraland/scene-runtime/)
In this case, there is no problem with when each PR is merged. It's recommendable to merge first the rpc server-side (in this case, Kernel), second the `scene-runtime` (and this would require a second update from `kernel`) and last the `js-sdk-toolchain`.

## Renderer protocol (RPC)

Repositories: [kernel](https://github.com/decentraland/kernel/) and [unity-renderer](https://github.com/decentraland/unity-renderer/)

TODO

## BFF

TODO

## Comms

TODO
39 changes: 0 additions & 39 deletions proto/decentraland/bff/authentication_service.proto

This file was deleted.

33 changes: 0 additions & 33 deletions proto/decentraland/bff/comms_director_service.proto

This file was deleted.

25 changes: 0 additions & 25 deletions proto/decentraland/bff/comms_service.proto

This file was deleted.

81 changes: 0 additions & 81 deletions proto/decentraland/bff/http_endpoints.proto

This file was deleted.

34 changes: 0 additions & 34 deletions proto/decentraland/bff/topics_service.proto

This file was deleted.

2 changes: 1 addition & 1 deletion proto/decentraland/sdk/components/animator.proto
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ message PBAnimator {

// AnimationState indicates the status and configuration of one available animation.
message PBAnimationState {
string name = 1; // the identifier for this animation, to use in scene code
reserved 1; // deprecated `name` prop
string clip = 2; // the animation path in the `files` array of the scene manifest
optional bool playing = 3; // whether this animation is currently playing
optional float weight = 4; // the "weight" of this animation (see below, default: 1.0)
Expand Down
16 changes: 0 additions & 16 deletions public/bff-services.proto

This file was deleted.

0 comments on commit 12b9f86

Please sign in to comment.