Skip to content

Commit

Permalink
Merge branch '546-update-doc-and-readme' into 'master'
Browse files Browse the repository at this point in the history
Resolve "Update Doc and Readme"

Closes #546

See merge request blender/public-projects/mixer!282
  • Loading branch information
jatubi committed Jan 10, 2022
2 parents e68cf7b + 5347404 commit c512509
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 5 deletions.
33 changes: 28 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,37 @@
# Mixer
<img align="left" width="auto" height="auto" src="doc/images/Logo_90_A.png">

# Ubisoft Mixer - Blender Add-on

</br>

**Mixer is a Blender addon for real time collaboration in Blender. It allows multiple Blender users to work on the same scene at the same time and is developed by the R&D department of Ubisoft Animation Studio.**

<p align="center">
<a href="https://ubisoft-mixer.readthedocs.io" title="Consult the online documentation" target="_blank">
<img src="doc/images/Documentation.png" width="160" />
</a>
&nbsp;&nbsp;&nbsp;
<a href="https://github.com/ubisoft/mixer/releases/latest" title="Download latest version">
<img src="doc/images/Download.png" width="160" />
</a>
&nbsp;&nbsp;&nbsp;
<a href="https://github.com/ubisoft/mixer/issues" title="Report and follow issues">
<img src="doc/images/Issues.png" width="160" />
</a>
</p>


Mixer is a Blender addon for real time collaboration in Blender. It allows multiple Blender users to work on the same scene at the same time and is developed by the R&D department of Ubisoft Animation Studio.

![Mixer screenshot](docs/img/home_mixer.png)

**Disclaimer**: Although designed to be used in a production context it is still an experimental tool.
**Disclaimer**
>**This tool is currently supported for LTS version of Blender 2.93 and up to Blender 3.0**
>
>Although designed to be used in a production context it is still an experimental tool.
In spite of all our efforts to make it reliable, it may in some circumstances corrupt your Blender scenes data.
Be aware that neither Ubisoft nor Ubisoft employees can be taken as responsible in such cases. Use it at your own risks.

**This said, we will do our best to improve Mixer thanks to your feedback in order to provide a memorable creative collaborative experience.
>
>**This said, we will do our best to improve Mixer thanks to your feedback in order to provide a memorable creative collaborative experience.
Have fun !**

## Features
Expand Down
Binary file added doc/images/Documentation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/Download.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/Issues.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/Logo_90_A.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c512509

Please sign in to comment.