Search Unity

Unity's version control component has been upgraded to Plastic SCM.

Collaborate Preview Build Available Now - Exciting New Features!

Discussion in 'Unity Collaborate' started by unity-tuesday, Dec 1, 2016.

Thread Status:
Not open for further replies.
  1. unity-tuesday

    unity-tuesday

    Unity Technologies

    Joined:
    Aug 2, 2016
    Posts:
    42
    Thanks in large part to the fabulous feedback we've received from all of you over the course of the Collaborate closed beta, we've readied a Preview Build based off of Unity 5.5 that is available for download now and incorporates some fan favorites!

    You can download the Preview Build here. Please continue to share your feedback with us on these and other features!

    Partial Publish

    Many have requested the ability to publish certain assets instead of publishing everything at once when some things may not be ready.

    The partial commit feature allows you to right-click on a new or modified asset, set of assets, or a folder, then open the "Collaborate" menu. Within the menu, you can then select the "Publish" item. This will generate a pop-up window that will allow you to add commit comments, see a list of selected assets, and then choose to publish them.

    More Info

    Ignore Files

    This feature allows the exclusion of files and directories from Collaborate using the ".collabignore" file which is generated in the root of the project directory. It contains the files and directories ignored by default in Collaborate.

    To add your own ignore rules to ".collabignore":
    • Check out GitIgnore; we use the same rules! (https://git-scm.com/docs/gitignore)
    • Modify ".collabignore" files with your new rules.
    • Start the Unity Editor (restart the Editor if it's already running.) Your new exclusions will now be tracked.
    • Publish your ".collabignore" changes in Collaborate to share your exclusions with the rest of your team.
    Here are a few items to note:
    • For local edits to the ".collabignore" file to take effect, the Editor needs to be restarted.
    • Excluding a file already tracking in Collaborate will not erase existing file history.
    • Certain files and directories can never be excluded in Collaborate, including the ".collabignore" file, the Assets directory (although specific files or directories within the Assets directory can be ignored), the ProjectSettings directory, any "*.asset" files inside the ProjectSettings directory, and "ProjectVersion.txt" within the ProjectSettings directory.
    More Info

    Rollback

    Rolling back commits has been on many a wishlist, so here are the details!

    You can now roll back to a previous publish by opening up the Collaborate History window and clicking "Go back to..." on the change you want to revert to. Clicking "Go back to..." will replace all local project files with the files from the older version. These files will show up as "modified" in the Collab toolbar (Collab will show the "Publish" button), as would any new changes made to these files, and can therefore be pushed as a new revision for your project. This new behavior ensures that all versions are intact, even after a rollback, and can be accessed at any time in the development cycle.

    More Info

    "In Progress" Soft Locks

    Last but not least on the list, you can now see when teammates are making changes locally to a scene or a prefab. In the Assets window, you'll be able to see an indicator when changes are in progress by someone else, helping to avoid conflicts.

    upload_2016-12-2_14-3-32.png
     
    Last edited: Dec 2, 2016
    Gurg, Karsten, NoHumanDev and 2 others like this.
  2. Burntaces

    Burntaces

    Joined:
    Feb 23, 2016
    Posts:
    4
    Fantastic work! Thanks!
     
    unity-tuesday likes this.
  3. NoHumanDev

    NoHumanDev

    Joined:
    Sep 4, 2015
    Posts:
    2
    Really nice feature, thanks :)
    Do you know when it'll be in the stable release?
     
  4. quixotic

    quixotic

    Administrator

    Joined:
    Nov 7, 2013
    Posts:
    122
    Partial Publish, Ignore, and Rollback will be in 5.6 (they're currently in the 5.6 beta).

    In progress hasn't been slated for a release yet (more to do + need more feedback--so let us know what you think about it).
     
  5. rsodre

    rsodre

    Joined:
    May 9, 2012
    Posts:
    229
    @quixotic, don't you mean 5.5.1 instead of 5.6?

    I mean, are you going to release a collab beta build with the new features for every 5.5.x upgrade?
    Or we're stuck with this build or 5.6 beta until 5.6 comes out?
    Makes no sense.
     
    Last edited: Dec 28, 2016
  6. quixotic

    quixotic

    Administrator

    Joined:
    Nov 7, 2013
    Posts:
    122
    I did mean 5.6. 5.5.1 is a patch update---which will have some Collaborate bug fixes in it but no features. New features aren't let into patches, patches are for bug fixing features that were released in the base version.

    If you want these specific features than it's use this build or 5.6--we don't currently plan on cutting another preview build. It's pretty high cost (testing, integrating) for us to push out preview builds. For preview builds our goal is get something out, receive feedback, and make changes that will go into the next major release. The next time we'll make a preview build will be when we have features that are big enough to need deeper feedback.

    Longer term, we plan to make Collaborate able to update separate from the editor which will make things a lot easier. That's further out because some infrastructure changes are needed, and work that will be done by people outside of our team.
     
  7. pjburnhill

    pjburnhill

    Joined:
    Mar 2, 2016
    Posts:
    27
    Wow, excellent news. Been holding back on moving to Unity Collab, but once 5.6 comes out and these changes are included (and are stable), it looks like it would be a perfect time to switch!

    Just a quick question: If I use .collabignore to exclude some assets in the project, but back up these excluded assets via other means, would you foresee any issues arising using this workflow?

    Well done again, now I'll get on with trying this preview out!
     
  8. pjburnhill

    pjburnhill

    Joined:
    Mar 2, 2016
    Posts:
    27
    Also, on the preview page it states: How often should I check for new Preview builds? Every 2 weeks, you can find the latest on this page.

    Will these fortnightly builds be announced on the forum, including any changes made?
     
  9. DevinW

    DevinW

    Joined:
    Jun 19, 2014
    Posts:
    37
    Love the soft lock feature! Keep it up!
     
    Ryan-Unity likes this.
  10. pKallv

    pKallv

    Joined:
    Mar 2, 2014
    Posts:
    1,191
    Just want to say that I, as a single developer, find this function really useful.
     
  11. Zwilnik

    Zwilnik

    Joined:
    Jul 22, 2014
    Posts:
    62
    Is the new Unity 5.6 release now the one to switch to from the CollabPreview?
     
  12. Ryan-Unity

    Ryan-Unity

    Joined:
    Mar 23, 2016
    Posts:
    1,993
    Hi @Zwilnik! Yes, 5.6 include the latest fixes and features of Collaborate. Collaborate is still in Beta but please give this version a try and let us know what you think of the changes.
     
Thread Status:
Not open for further replies.