testss
This commit is contained in:
@@ -0,0 +1,86 @@
|
||||
* text=auto
|
||||
|
||||
# Unity files
|
||||
*.meta -text merge=unityyamlmerge diff
|
||||
*.unity -text merge=unityyamlmerge diff
|
||||
*.asset -text merge=unityyamlmerge diff
|
||||
*.prefab -text merge=unityyamlmerge diff
|
||||
*.mat -text merge=unityyamlmerge diff
|
||||
*.anim -text merge=unityyamlmerge diff
|
||||
*.controller -text merge=unityyamlmerge diff
|
||||
*.overrideController -text merge=unityyamlmerge diff
|
||||
*.physicMaterial -text merge=unityyamlmerge diff
|
||||
*.physicsMaterial2D -text merge=unityyamlmerge diff
|
||||
*.playable -text merge=unityyamlmerge diff
|
||||
*.mask -text merge=unityyamlmerge diff
|
||||
*.brush -text merge=unityyamlmerge diff
|
||||
*.flare -text merge=unityyamlmerge diff
|
||||
*.fontsettings -text merge=unityyamlmerge diff
|
||||
*.guiskin -text merge=unityyamlmerge diff
|
||||
*.giparams -text merge=unityyamlmerge diff
|
||||
*.renderTexture -text merge=unityyamlmerge diff
|
||||
*.spriteatlas -text merge=unityyamlmerge diff
|
||||
*.terrainlayer -text merge=unityyamlmerge diff
|
||||
*.mixer -text merge=unityyamlmerge diff
|
||||
*.shadervariants -text merge=unityyamlmerge diff
|
||||
|
||||
# Image formats
|
||||
*.psd filter=lfs diff=lfs merge=lfs -text
|
||||
*.jpg filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.gif filter=lfs diff=lfs merge=lfs -text
|
||||
*.bmp filter=lfs diff=lfs merge=lfs -text
|
||||
*.tga filter=lfs diff=lfs merge=lfs -text
|
||||
*.tiff filter=lfs diff=lfs merge=lfs -text
|
||||
*.tif filter=lfs diff=lfs merge=lfs -text
|
||||
*.iff filter=lfs diff=lfs merge=lfs -text
|
||||
*.pict filter=lfs diff=lfs merge=lfs -text
|
||||
*.dds filter=lfs diff=lfs merge=lfs -text
|
||||
*.xcf filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Audio formats
|
||||
*.mp3 filter=lfs diff=lfs merge=lfs -text
|
||||
*.ogg filter=lfs diff=lfs merge=lfs -text
|
||||
*.wav filter=lfs diff=lfs merge=lfs -text
|
||||
*.aiff filter=lfs diff=lfs merge=lfs -text
|
||||
*.aif filter=lfs diff=lfs merge=lfs -text
|
||||
*.mod filter=lfs diff=lfs merge=lfs -text
|
||||
*.it filter=lfs diff=lfs merge=lfs -text
|
||||
*.s3m filter=lfs diff=lfs merge=lfs -text
|
||||
*.xm filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Video formats
|
||||
*.mov filter=lfs diff=lfs merge=lfs -text
|
||||
*.avi filter=lfs diff=lfs merge=lfs -text
|
||||
*.asf filter=lfs diff=lfs merge=lfs -text
|
||||
*.mpg filter=lfs diff=lfs merge=lfs -text
|
||||
*.mpeg filter=lfs diff=lfs merge=lfs -text
|
||||
*.mp4 filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# 3D formats
|
||||
*.fbx filter=lfs diff=lfs merge=lfs -text
|
||||
*.obj filter=lfs diff=lfs merge=lfs -text
|
||||
*.max filter=lfs diff=lfs merge=lfs -text
|
||||
*.blend filter=lfs diff=lfs merge=lfs -text
|
||||
*.dae filter=lfs diff=lfs merge=lfs -text
|
||||
*.mb filter=lfs diff=lfs merge=lfs -text
|
||||
*.ma filter=lfs diff=lfs merge=lfs -text
|
||||
*.3ds filter=lfs diff=lfs merge=lfs -text
|
||||
*.dfx filter=lfs diff=lfs merge=lfs -text
|
||||
*.c4d filter=lfs diff=lfs merge=lfs -text
|
||||
*.lwo filter=lfs diff=lfs merge=lfs -text
|
||||
*.lwo2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.abc filter=lfs diff=lfs merge=lfs -text
|
||||
*.3dm filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Build
|
||||
*.dll filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdb filter=lfs diff=lfs merge=lfs -text
|
||||
*.mdb filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# Packaging
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.rar filter=lfs diff=lfs merge=lfs -text
|
||||
*.tar filter=lfs diff=lfs merge=lfs -text
|
||||
@@ -0,0 +1,50 @@
|
||||
[Ll]ibrary/
|
||||
[Tt]emp/
|
||||
[Oo]bj/
|
||||
[Bb]uild/
|
||||
[Bb]uilds/
|
||||
[Ll]ogs/
|
||||
|
||||
# Uncomment this line if you wish to ignore the asset store tools plugin
|
||||
# [Aa]ssets/AssetStoreTools*
|
||||
|
||||
# Visual Studio cache directory
|
||||
.vs/
|
||||
|
||||
# Gradle cache directory
|
||||
.gradle/
|
||||
|
||||
# Autogenerated VS/MD/Consulo/Rider/VSCode solution and project files
|
||||
ExportedObj/
|
||||
.consulo/
|
||||
.vscode/
|
||||
.idea/
|
||||
*.csproj
|
||||
*.unityproj
|
||||
*.sln
|
||||
*.suo
|
||||
*.tmp
|
||||
*.user
|
||||
*.userprefs
|
||||
*.pidb
|
||||
*.booproj
|
||||
*.svd
|
||||
*.pdb
|
||||
*.mdb
|
||||
*.opendb
|
||||
*.VC.db
|
||||
|
||||
# Unity3D generated meta files
|
||||
*.pidb.meta
|
||||
*.pdb.meta
|
||||
*.mdb.meta
|
||||
|
||||
# Unity3D generated file on crash reports
|
||||
sysinfo.txt
|
||||
|
||||
# Builds
|
||||
*.apk
|
||||
*.unitypackage
|
||||
|
||||
# Crashlytics generated file
|
||||
crashlytics-build.properties
|
||||
86
Library/PackageCache/com.unity.collab-proxy@1.3.9/.gitattributes
vendored
Normal file
86
Library/PackageCache/com.unity.collab-proxy@1.3.9/.gitattributes
vendored
Normal file
@@ -0,0 +1,86 @@
|
||||
* text=auto
|
||||
|
||||
# Unity files
|
||||
*.meta -text merge=unityyamlmerge diff
|
||||
*.unity -text merge=unityyamlmerge diff
|
||||
*.asset -text merge=unityyamlmerge diff
|
||||
*.prefab -text merge=unityyamlmerge diff
|
||||
*.mat -text merge=unityyamlmerge diff
|
||||
*.anim -text merge=unityyamlmerge diff
|
||||
*.controller -text merge=unityyamlmerge diff
|
||||
*.overrideController -text merge=unityyamlmerge diff
|
||||
*.physicMaterial -text merge=unityyamlmerge diff
|
||||
*.physicsMaterial2D -text merge=unityyamlmerge diff
|
||||
*.playable -text merge=unityyamlmerge diff
|
||||
*.mask -text merge=unityyamlmerge diff
|
||||
*.brush -text merge=unityyamlmerge diff
|
||||
*.flare -text merge=unityyamlmerge diff
|
||||
*.fontsettings -text merge=unityyamlmerge diff
|
||||
*.guiskin -text merge=unityyamlmerge diff
|
||||
*.giparams -text merge=unityyamlmerge diff
|
||||
*.renderTexture -text merge=unityyamlmerge diff
|
||||
*.spriteatlas -text merge=unityyamlmerge diff
|
||||
*.terrainlayer -text merge=unityyamlmerge diff
|
||||
*.mixer -text merge=unityyamlmerge diff
|
||||
*.shadervariants -text merge=unityyamlmerge diff
|
||||
# Image formats
|
||||
*.psd filter=lfs diff=lfs merge=lfs -text
|
||||
*.jpg filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.gif filter=lfs diff=lfs merge=lfs -text
|
||||
*.bmp filter=lfs diff=lfs merge=lfs -text
|
||||
*.tga filter=lfs diff=lfs merge=lfs -text
|
||||
*.tiff filter=lfs diff=lfs merge=lfs -text
|
||||
*.tif filter=lfs diff=lfs merge=lfs -text
|
||||
*.iff filter=lfs diff=lfs merge=lfs -text
|
||||
*.pict filter=lfs diff=lfs merge=lfs -text
|
||||
*.dds filter=lfs diff=lfs merge=lfs -text
|
||||
*.xcf filter=lfs diff=lfs merge=lfs -text
|
||||
# Audio formats
|
||||
*.mp3 filter=lfs diff=lfs merge=lfs -text
|
||||
*.ogg filter=lfs diff=lfs merge=lfs -text
|
||||
*.wav filter=lfs diff=lfs merge=lfs -text
|
||||
*.aiff filter=lfs diff=lfs merge=lfs -text
|
||||
*.aif filter=lfs diff=lfs merge=lfs -text
|
||||
*.mod filter=lfs diff=lfs merge=lfs -text
|
||||
*.it filter=lfs diff=lfs merge=lfs -text
|
||||
*.s3m filter=lfs diff=lfs merge=lfs -text
|
||||
*.xm filter=lfs diff=lfs merge=lfs -text
|
||||
# Video formats
|
||||
*.mov filter=lfs diff=lfs merge=lfs -text
|
||||
*.avi filter=lfs diff=lfs merge=lfs -text
|
||||
*.asf filter=lfs diff=lfs merge=lfs -text
|
||||
*.mpg filter=lfs diff=lfs merge=lfs -text
|
||||
*.mpeg filter=lfs diff=lfs merge=lfs -text
|
||||
*.mp4 filter=lfs diff=lfs merge=lfs -text
|
||||
# 3D formats
|
||||
*.fbx filter=lfs diff=lfs merge=lfs -text
|
||||
*.obj filter=lfs diff=lfs merge=lfs -text
|
||||
*.max filter=lfs diff=lfs merge=lfs -text
|
||||
*.blend filter=lfs diff=lfs merge=lfs -text
|
||||
*.dae filter=lfs diff=lfs merge=lfs -text
|
||||
*.mb filter=lfs diff=lfs merge=lfs -text
|
||||
*.ma filter=lfs diff=lfs merge=lfs -text
|
||||
*.3ds filter=lfs diff=lfs merge=lfs -text
|
||||
*.dfx filter=lfs diff=lfs merge=lfs -text
|
||||
*.c4d filter=lfs diff=lfs merge=lfs -text
|
||||
*.lwo filter=lfs diff=lfs merge=lfs -text
|
||||
*.lwo2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.abc filter=lfs diff=lfs merge=lfs -text
|
||||
*.3dm filter=lfs diff=lfs merge=lfs -text
|
||||
# Build
|
||||
*.dll filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdb filter=lfs diff=lfs merge=lfs -text
|
||||
*.mdb filter=lfs diff=lfs merge=lfs -text
|
||||
# Packaging
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.rar filter=lfs diff=lfs merge=lfs -text
|
||||
*.tar filter=lfs diff=lfs merge=lfs -text
|
||||
# Collapse Unity-generated files on GitHub
|
||||
*.asset linguist-generated
|
||||
*.mat linguist-generated
|
||||
*.meta linguist-generated
|
||||
*.prefab linguist-generated
|
||||
*.unity linguist-generated
|
||||
@@ -0,0 +1,84 @@
|
||||
# Changelog
|
||||
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
|
||||
### 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.
|
||||
|
||||
## [1.2.16] - 2019-02-11
|
||||
### Fixed
|
||||
- Update stylesheet to pass USS validation
|
||||
|
||||
## [1.2.15] - 2018-11-16
|
||||
### Changed
|
||||
- Added support for non-experimental UIElements.
|
||||
|
||||
## [1.2.11] - 2018-09-04
|
||||
### Fixed
|
||||
- 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.
|
||||
|
||||
## [1.2.7] - 2018-08-07
|
||||
### Fixed
|
||||
- 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.
|
||||
|
||||
## [1.2.5] - 2018-05-21
|
||||
This is the first release of *Unity Package CollabProxy*.
|
||||
|
||||
### Added
|
||||
- Collab history and toolbar windows
|
||||
- Collab view and presenter classes
|
||||
- Collab Editor tests for view and presenter
|
||||
@@ -0,0 +1,10 @@
|
||||
# Icons
|
||||
This directory contains the icons for the Collaborate UI.
|
||||
Dark and light theme icons are prefixed with `-dark` and `-light` respectively.
|
||||
HDPI icons are prefixed with `@2x` for 32x32px for two times the width and height of the normal 16x16px.
|
||||
Individual icon's `Texture Type` should be set as `Editor GUI and Legacy GUI` in the Unity Editor to ensure scaling is done correctly and alpha is respected.
|
||||
|
||||
## Icon colours
|
||||
The basic colours of icons in Collaborate are as follows:\
|
||||
Dark Theme: #C4C4C4 100% alpha\
|
||||
Light Theme: #555555 100% alpha
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user