Merge branch 'master' of https://github.com/OSVR/OSVR-Unity into persistentSingleton

Author: DuFF14

.editorconfig

@@ -0,0 +1,21 @@
+# editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# A newline ending every file
+# Use 2 spaces as indentation
+# Trim trailing whitespace
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.cs]
+indent_style = tab
+
+[*.csproj]
+indent_size = 2

.gitattributes

@@ -0,0 +1,30 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Source files - keep them lf
+*.cs text eol=lf
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
+
+# cmake launcher templates
+*.cmd.in text eol=crlf
+*vcproj.user.in text eol=crlf
+*vcxproj.user.in text eol=crlf

.gitignore

@@ -187,3 +187,5 @@ FakesAssemblies/
 *.userprefs
 OSVR-Unity-Dist/
 *.unitypackage
+
+Managed-OSVR-Unity/

CONTRIBUTING.md

@@ -8,17 +8,20 @@ A few tips:
 
 The OSVR system consists of a number of repositories, many of which are in the [OSVR organization on GitHub][osvr-org].
 
-The `OSVR-Unity` repo consists of two parts: the Managed-OSVR bindings for using OSVR ClientKit from .NET-based languages, and the OSVR-Unity integration and sample code.
+The `OSVR-Unity` repo contains the code that integrates OSVR, via the [Managed-OSVR][] bindings (for using OSVR ClientKit from .NET-based languages), with the Unity game engine, as well as some sample code.
 
-- If you've got an issue to report, a bug fix, or a feature addition to those components: **yes**, you're in the right spot!
+[Managed-OSVR]: https://github.com/OSVR/Managed-OSVR
+
+- If you've got an issue to report, a bug fix, or a feature addition specific to the OSVR-Unity integration components: **yes**, you're in the right spot! (If you aren't sure if it's Unity-specific or in Managed-OSVR, it's fine to start here.)
+- If you're got something that's related to .NET but not Unity-specific: **you're close** - see the [Managed-OSVR][] repo for the non-Unity-specific OSVR .NET bindings.
 - If you have an issue, bug fix, or other contribution related to the OSVR server (which comes bundled with an OSVR-Unity binary snapshot) or one of the plugins: **you're close** - see the [OSVR-Core](https://github.com/osvr/OSVR-Core) repo for the server and its bundled plugins.
 - If you have a hardware or software issue related to OSVR but aren't sure exactly where it fits: **let us know with a support ticket at <http://support.osvr.com>**
 
 [osvr-org]: https://github.com/osvr
 
 ## Getting ready
 
-General "getting started" instructions can be found at <http://wiki.osvr.com>.
+General "getting started" instructions can be found at <http://osvr.github.io>.
 
 When making pull requests, please fork the project and create a topic branch off of the `master` branch.
 (This is what GitHub does by default if you start editing with your web browser.)
@@ -31,7 +34,7 @@ Avoid merging from master into your topic branch: if you need a change from mast
 
 Try to develop code that is portable (not particularly tied to a single operating system/compiler/etc) - OSVR runs on a number of platforms, and while we don't expect you to have all of them to test on, it's good to keep in mind.
 
-Note that the Managed-OSVR code should be entirely Unity-independent, so it can be used in other .NET-based applications. The reason for the specific version of the .NET framework it is using is for compatibility with the runtime used by Unity.
+Please note the compatible versions of Unity in the project README, and make sure that any change is either optional (and properly version-guarded) or works all the way back to the oldest version of Unity we support.
 
 If you're adding something reasonably testable, please also add a test.
 If you're touching code that already has tests, make sure they didn't break.