Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
## [1.4.9] - 2021-06-03
### Unreleased
- The Version Control package will be expanding to include both Collaborate and Plastic SCM version control interfaces. This release is preparing for that move and contains no new functionality or bug fixes for Collaborate.
### Changed
- Collaborate Package renamed to Version Control with changes to package display name and description.
- Updating license to better conform with expected customer usage.
- Updated documentation file to meet standards.
- Updated third-party usage.
  • Loading branch information
Unity Technologies committed Jun 3, 2021
1 parent 9571b1e commit fa5090e
Show file tree
Hide file tree
Showing 1,474 changed files with 69,156 additions and 29,212 deletions.
86 changes: 0 additions & 86 deletions .Resources/.collabattributes

This file was deleted.

50 changes: 0 additions & 50 deletions .Resources/.collabignore

This file was deleted.

70 changes: 13 additions & 57 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,76 +4,32 @@ All notable changes to this package will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [1.3.9] - 2020-07-13
### Fixed
- Unnecessary use of texture compression in icons that slowed down platform switching
- Update publish button state when selected changes update
- Use colorized icons when changes are available.

## [1.3.8] - 2020-06-08
### Fixed
- Fix incorrect priority of error messages
- Fix Collab button being stuck in inprogress state
- Fix error when partially publishing without the window open

## [1.3.7] - 2020-01-30
### Changed
- Bulk revert is now supported.
- Collab is blocked in play mode.
## Fixed
- Fixed services window's links to open Collab.

## [1.3.6] - 2020-01-21
### Fixed
- Fixed compile errors when removing the NUnit package by removing unnecessary references.

## [1.3.5] - 2020-01-08
### Fixed
- Fix "accept mine" / "accept remote" icon swap in conflicts view.

## [1.3.4] - 2019-12-16
## [1.4.9] - 2021-06-03
### Unreleased
- The Version Control package will be expanding to include both Collaborate and Plastic SCM version control interfaces. This release is preparing for that move and contains no new functionality or bug fixes for Collaborate.
### Changed
- Window state is no longer restored after the window is closed and opened.
### Fixed
- History tab failing to load on startup if it is left open in the previous session.
- Progress bar percentage not matching the bar.
- History list correctly updates after a new revision is published.
- UI instabilities when restoring or going back to a revision with a different package manifest.
- Improve handling of changes to the project id.

## [1.3.3] - 2019-12-10
### Changed
- Disable UI test cases that can be unstable.

## [1.3.2] - 2019-12-05
### Changed
- Update UX to UIElements.
- Increased minimum supported version to 2020.1.
- Update Documentation to required standards.
- Collaborate Package renamed to Version Control with changes to package display name and description.
- Updating license to better conform with expected customer usage.
- Updated documentation file to meet standards.
- Updated third-party usage.

## [1.2.16] - 2019-02-11
### Fixed
- Update stylesheet to pass USS validation
Update stylesheet to pass USS validation

## [1.2.15] - 2018-11-16
### Changed
- Added support for non-experimental UIElements.
Added support for non-experimental UIElements.

## [1.2.11] - 2018-09-04
### Fixed
- Made some performance improvements to reduce impact on ReloadAssemblies.
Made some performance improvements to reduce impact on ReloadAssemblies.

## [1.2.9] - 2018-08-13
### Fixed
- Test issues for the Collab History Window are now fixed.
Test issues for the Collab History Window are now fixed.

## [1.2.7] - 2018-08-07
### Fixed
- Toolbar drop-down will no longer show up when package is uninstalled.
Toolbar drop-down will no longer show up when package is uninstalled.

## [1.2.6] - 2018-06-15
### Fixed
- Fixed an issue where Collab's History window wouldn't load properly.
Fixed an issue where Collab's History window wouldn't load properly.

## [1.2.5] - 2018-05-21
This is the first release of *Unity Package CollabProxy*.
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

77 changes: 77 additions & 0 deletions CollabProxy.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LangVersion>4</LangVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<RootNamespace>
</RootNamespace>
<ProjectGuid>{9BAA6606-FD4E-62AB-0D42-D5FD19DEB501}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>Unity.CollabProxy.Editor</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<BaseDirectory>.</BaseDirectory>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_2_0;UNITY_2018_2;UNITY_2018;PLATFORM_ARCH_64;UNITY_64;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_UNLOCKED_DIAGNOSTIC_SWITCHES;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_OSX;PLATFORM_STANDALONE;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_SPATIALTRACKING;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0_SUBSET;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_UNITY_COLLECTIONS_CHECKS;UNITY_TEAM_LICENSE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Compile Include="Editor\Collab\CollabAnalytics.cs" />
<Compile Include="Editor\Collab\CollabHistoryWindow.cs" />
<Compile Include="Editor\Collab\CollabToolbarWindow.cs" />
<Compile Include="Editor\Collab\Presenters\CollabHistoryPresenter.cs" />
<Compile Include="Editor\Collab\CollabToolbarButton.cs" />
<Compile Include="Editor\Collab\Views\BuildStatusButton.cs" />
<Compile Include="Editor\Collab\Views\CollabHistoryDropDown.cs" />
<Compile Include="Editor\Collab\Views\CollabHistoryDropDownItem.cs" />
<Compile Include="Editor\Collab\Views\CollabHistoryItem.cs" />
<Compile Include="Editor\Collab\Views\CollabHistoryItemFactory.cs" />
<Compile Include="Editor\Collab\Views\CollabHistoryRevisionLine.cs" />
<Compile Include="Editor\Collab\Views\HistoryProgressSpinner.cs" />
<Compile Include="Editor\Collab\Views\ICollabHistoryItemFactory.cs" />
<Compile Include="Editor\Collab\Views\PagedListView.cs" />
<Compile Include="Editor\Collab\Views\StatusView.cs" />
<Compile Include="Editor\Collab\Bootstrap.cs" />
<None Include="Editor\Unity.CollabProxy.Editor.asmdef" />
</ItemGroup>
<ItemGroup>
<Reference Include="UnityEditor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>EditorLib\UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>EditorLib\UnityEngine.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AfterBuild">
<ItemGroup>
<PackageStructure Include="proto.com.unity.collab-proxy\**\*.*" />
<SourceFiles Include="Editor\**\*.*" />
</ItemGroup>
<Copy SourceFiles="@(PackageStructure)" DestinationFolder="build\install\com.unity.collab-proxy\%(RecursiveDir)" />
<Copy SourceFiles="@(SourceFiles)" DestinationFolder="build\install\com.unity.collab-proxy\Editor\%(RecursiveDir)" />
</Target>
</Project>
7 changes: 7 additions & 0 deletions CollabProxy.csproj.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions CollabProxy.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CollabProxy", "CollabProxy.csproj", "{9BAA6606-FD4E-62AB-0D42-D5FD19DEB501}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9BAA6606-FD4E-62AB-0D42-D5FD19DEB501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9BAA6606-FD4E-62AB-0D42-D5FD19DEB501}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9BAA6606-FD4E-62AB-0D42-D5FD19DEB501}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9BAA6606-FD4E-62AB-0D42-D5FD19DEB501}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
7 changes: 7 additions & 0 deletions CollabProxy.sln.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Unity.CollabProxy.Dependencies</id>
<version>1.1.0-experimental</version>
<authors>Rohit Garg</authors>
<description>Dependencies for the CollabProxy package</description>
</metadata>
</package>
7 changes: 7 additions & 0 deletions DEPENDENCIES.md.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed Documentation~/images/example.png
Binary file not shown.
6 changes: 6 additions & 0 deletions Documentation~/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# About Version Control
The Version Control package provides an in-editor interface for teams to work with Collaborate and Plastic SCM (coming soon).
## Collaborate
Collaborate makes it easy for teams to save, share, and sync their Unity projects with others, regardless of location. It is cloud enabled and built directly into Unity. Please refer to the online documentation for Unity Collaborate [here.](https://docs.unity3d.com/Manual/UnityCollaborate.html)
## Plastic SCM
Plastic SCM Plugin for Unity (beta) is a free Unity plugin that gives you the ability to use Plastic SCM, a leading version control solution, directly in Unity. It is currently available on the Unity Asset Store but will be moving to this package in an upcoming release.
5 changes: 0 additions & 5 deletions Documentation~/unity-cloud-collaborate.md

This file was deleted.

2 changes: 1 addition & 1 deletion Editor.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions Editor/Assets/Icons.meta

This file was deleted.

Loading

0 comments on commit fa5090e

Please sign in to comment.