Merge branch 'develop' into 29-differential-revision
This commit is contained in:
Swann
commit
153ff5b129
@ -1,17 +1,2 @@
|
|||||||
image: python:latest
|
include:
|
||||||
|
- local: .gitlab/ci/build.gitlab-ci.yml
|
||||||
build:
|
|
||||||
script:
|
|
||||||
- git submodule init
|
|
||||||
- git submodule update
|
|
||||||
- cd multi_user/libs/replication
|
|
||||||
- rm -rf tests .git .gitignore
|
|
||||||
|
|
||||||
artifacts:
|
|
||||||
name: multi_user
|
|
||||||
paths:
|
|
||||||
- multi_user
|
|
||||||
|
|
||||||
only:
|
|
||||||
- master
|
|
||||||
- develop
|
|
||||||
|
|||||||
17
.gitlab/ci/build.gitlab-ci.yml
Normal file
17
.gitlab/ci/build.gitlab-ci.yml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
image: python:latest
|
||||||
|
|
||||||
|
build:
|
||||||
|
script:
|
||||||
|
- git submodule init
|
||||||
|
- git submodule update
|
||||||
|
- cd multi_user/libs/replication
|
||||||
|
- rm -rf tests .git .gitignore
|
||||||
|
|
||||||
|
artifacts:
|
||||||
|
name: multi_user
|
||||||
|
paths:
|
||||||
|
- multi_user
|
||||||
|
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
- develop
|
||||||
46
.gitlab/issue_templates/Bug.md
Normal file
46
.gitlab/issue_templates/Bug.md
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
<!---
|
||||||
|
Please read this!
|
||||||
|
|
||||||
|
Before opening a new issue, make sure to search for keywords in the issues
|
||||||
|
filtered by the "bug" label:
|
||||||
|
|
||||||
|
- https://gitlab.com/slumber/multi-user/-/issues?scope=all&utf8=✓&label_name[]=bug
|
||||||
|
|
||||||
|
and verify the issue you're about to submit isn't a duplicate.
|
||||||
|
--->
|
||||||
|
|
||||||
|
### Summary
|
||||||
|
|
||||||
|
(Summarize the bug encountered concisely)
|
||||||
|
|
||||||
|
* Addon version: (your addon-version)
|
||||||
|
* Blender version: (your blender version)
|
||||||
|
* OS: (your os windows/linux/mac)
|
||||||
|
|
||||||
|
|
||||||
|
### Steps to reproduce
|
||||||
|
|
||||||
|
(How one can reproduce the issue - this is very important)
|
||||||
|
|
||||||
|
### Example Project [optionnal]
|
||||||
|
(If possible, please create an example project that exhibits the problematic behavior, and link to it here in the bug report)
|
||||||
|
|
||||||
|
|
||||||
|
### What is the current *bug* behavior?
|
||||||
|
|
||||||
|
(What actually happens)
|
||||||
|
|
||||||
|
|
||||||
|
### Relevant logs and/or screenshots
|
||||||
|
|
||||||
|
(Paste any relevant logs - please use code blocks (```) to format console output,
|
||||||
|
logs, and code as it's tough to read otherwise.)
|
||||||
|
|
||||||
|
|
||||||
|
### Possible fixes [optionnal]
|
||||||
|
|
||||||
|
(If you can, link to the line of code that might be responsible for the problem)
|
||||||
|
|
||||||
|
|
||||||
|
/label ~bug
|
||||||
|
/cc @project-manager
|
||||||
43
README.md
43
README.md
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
> Enable real-time collaborative workflow inside blender
|
> Enable real-time collaborative workflow inside blender
|
||||||
|
|
||||||
|
<img src="https://i.imgur.com/X0B7O1Q.gif" width=600>
|
||||||
|
|
||||||
|
|
||||||
:warning: Under development, use it at your own risks. Currently tested on Windows platform. :warning:
|
:warning: Under development, use it at your own risks. Currently tested on Windows platform. :warning:
|
||||||
@ -25,22 +25,28 @@ See the [documentation](https://multi-user.readthedocs.io/en/latest/) for detail
|
|||||||
|
|
||||||
Currently, not all data-block are supported for replication over the wire. The following list summarizes the status for each ones.
|
Currently, not all data-block are supported for replication over the wire. The following list summarizes the status for each ones.
|
||||||
|
|
||||||
| Name | Status | Comment |
|
| Name | Status | Comment |
|
||||||
| ----------- | :----------------: | :--------------------------------: |
|
| ----------- | :----: | :-----------------------------------------------------------: |
|
||||||
| action | :exclamation: | Not stable |
|
| action | ❗ | Not stable |
|
||||||
| armature | :exclamation: | Not stable |
|
| armature | ❗ | Not stable |
|
||||||
| camera | :white_check_mark: | |
|
| camera | ✔️ | |
|
||||||
| collection | :white_check_mark: | |
|
| collection | ✔️ | |
|
||||||
| curve | :white_check_mark: | Nurbs surface don't load correctly |
|
| curve | ✔️ | Nurbs surface don't load correctly |
|
||||||
| gpencil | :white_check_mark: | |
|
| gpencil | ✔️ | |
|
||||||
| image | :exclamation: | Not stable yet |
|
| image | ❗ | Not stable yet |
|
||||||
| mesh | :white_check_mark: | |
|
| mesh | ✔️ | |
|
||||||
| material | :white_check_mark: | |
|
| material | ✔️ | |
|
||||||
| metaball | :white_check_mark: | |
|
| metaball | ✔️ | |
|
||||||
| object | :white_check_mark: | |
|
| object | ✔️ | |
|
||||||
| scene | :white_check_mark: | |
|
| scene | ✔️ | |
|
||||||
| world | :white_check_mark: | |
|
| world | ✔️ | |
|
||||||
| lightprobes | :white_check_mark: | |
|
| lightprobes | ✔️ | |
|
||||||
|
| particles | ❌ | [On-going](https://gitlab.com/slumber/multi-user/-/issues/24) |
|
||||||
|
| speakers | ❌ | [Planned](https://gitlab.com/slumber/multi-user/-/issues/65) |
|
||||||
|
| vse | ❌ | [Planned](https://gitlab.com/slumber/multi-user/-/issues/45) |
|
||||||
|
| physics | ❌ | [Planned](https://gitlab.com/slumber/multi-user/-/issues/45) |
|
||||||
|
| libraries | ❗ | Partial |
|
||||||
|
|
||||||
|
|
||||||
### Performance issues
|
### Performance issues
|
||||||
|
|
||||||
@ -52,8 +58,6 @@ I'm working on it.
|
|||||||
| Dependencies | Version | Needed |
|
| Dependencies | Version | Needed |
|
||||||
| ------------ | :-----: | -----: |
|
| ------------ | :-----: | -----: |
|
||||||
| ZeroMQ | latest | yes |
|
| ZeroMQ | latest | yes |
|
||||||
| msgpack | latest | yes |
|
|
||||||
| PyYAML | latest | yes |
|
|
||||||
| JsonDiff | latest | yes |
|
| JsonDiff | latest | yes |
|
||||||
|
|
||||||
|
|
||||||
@ -65,4 +69,3 @@ See [contributing section](https://multi-user.readthedocs.io/en/latest/ways_to_c
|
|||||||
|
|
||||||
See [license](LICENSE)
|
See [license](LICENSE)
|
||||||
|
|
||||||
[](https://multi-user.readthedocs.io/en/latest/?badge=latest)
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
bl_info = {
|
bl_info = {
|
||||||
"name": "Multi-User",
|
"name": "Multi-User",
|
||||||
"author": "Swann Martinez",
|
"author": "Swann Martinez",
|
||||||
"version": (0, 0, 2),
|
"version": (0, 0, 3),
|
||||||
"description": "Enable real-time collaborative workflow inside blender",
|
"description": "Enable real-time collaborative workflow inside blender",
|
||||||
"blender": (2, 80, 0),
|
"blender": (2, 80, 0),
|
||||||
"location": "3D View > Sidebar > Multi-User tab",
|
"location": "3D View > Sidebar > Multi-User tab",
|
||||||
@ -29,8 +29,6 @@ from .libs.replication.replication.constants import RP_COMMON
|
|||||||
# TODO: remove dependency as soon as replication will be installed as a module
|
# TODO: remove dependency as soon as replication will be installed as a module
|
||||||
DEPENDENCIES = {
|
DEPENDENCIES = {
|
||||||
("zmq","zmq"),
|
("zmq","zmq"),
|
||||||
("msgpack","msgpack"),
|
|
||||||
("yaml","pyyaml"),
|
|
||||||
("jsondiff","jsondiff")
|
("jsondiff","jsondiff")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user