Skip to content

Commit

Permalink
merged
Browse files Browse the repository at this point in the history
  • Loading branch information
BamdaXP committed Jun 3, 2018
2 parents 10895b0 + cb45ed1 commit f468f82
Show file tree
Hide file tree
Showing 270 changed files with 100,708 additions and 245 deletions.
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,12 @@ sysinfo.txt

# Builds
*.apk
*.unitypackage
<<<<<<< HEAD
<<<<<<< HEAD
*.unitypackage
=======
*.unitypackage
>>>>>>> 1bb052bf59696860b5d98a21c6179cee70f92cdb
=======
*.unitypackage
>>>>>>> 1bb052bf59696860b5d98a21c6179cee70f92cdb
Binary file added 1.exe
Binary file not shown.
Binary file added 1_Data/Managed/Assembly-CSharp.dll
Binary file not shown.
Binary file added 1_Data/Managed/Mono.Security.dll
Binary file not shown.
Binary file not shown.
Binary file added 1_Data/Managed/Sirenix.Serialization.Config.dll
Binary file not shown.
Binary file added 1_Data/Managed/Sirenix.Serialization.dll
Binary file not shown.
Binary file added 1_Data/Managed/Sirenix.Utilities.dll
Binary file not shown.
Binary file added 1_Data/Managed/System.Core.dll
Binary file not shown.
Binary file added 1_Data/Managed/System.dll
Binary file not shown.
Binary file not shown.
Binary file added 1_Data/Managed/UnityEngine.AIModule.dll
Binary file not shown.
1,361 changes: 1,361 additions & 0 deletions 1_Data/Managed/UnityEngine.AIModule.xml

Large diffs are not rendered by default.

Binary file added 1_Data/Managed/UnityEngine.ARModule.dll
Binary file not shown.
59 changes: 59 additions & 0 deletions 1_Data/Managed/UnityEngine.ARModule.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<doc>
<members>
<assembly>
<name>UnityEngine.ARModule</name>
</assembly>
<member name="T:UnityEngine.XR.ARBackgroundRenderer">
<summary>
<para>Class used to override a camera's default background rendering path to instead render a given Texture and/or Material. This will typically be used with images from the color camera for rendering the AR background on mobile devices.</para>
</summary>
</member>
<member name="P:UnityEngine.XR.ARBackgroundRenderer.backgroundMaterial">
<summary>
<para>The Material used for AR rendering.</para>
</summary>
</member>
<member name="?:UnityEngine.XR.ARBackgroundRenderer.backgroundRendererChanged(System.Action)">
<summary>
<para>Called when any of the public properties of this class have been changed.</para>
</summary>
<param name="value"></param>
</member>
<member name="P:UnityEngine.XR.ARBackgroundRenderer.backgroundTexture">
<summary>
<para>An optional Texture used for AR rendering. If this property is not set then the texture set in XR.ARBackgroundRenderer._backgroundMaterial as "_MainTex" is used.</para>
</summary>
</member>
<member name="P:UnityEngine.XR.ARBackgroundRenderer.camera">
<summary>
<para>An optional Camera whose background rendering will be overridden by this class. If this property is not set then the main Camera in the scene is used.</para>
</summary>
</member>
<member name="P:UnityEngine.XR.ARBackgroundRenderer.mode">
<summary>
<para>When set to XR.ARRenderMode.StandardBackground (default) the camera is not overridden to display the background image. Setting this property to XR.ARRenderMode.MaterialAsBackground will render the texture specified by XR.ARBackgroundRenderer._backgroundMaterial and or XR.ARBackgroundRenderer._backgroundTexture as the background.</para>
</summary>
</member>
<member name="M:UnityEngine.XR.ARBackgroundRenderer.DisableARBackgroundRendering">
<summary>
<para>Disables AR background rendering. This method is called internally but can be overridden by users who wish to subclass XR.ARBackgroundRenderer to customize handling of AR background rendering.</para>
</summary>
</member>
<member name="T:UnityEngine.XR.ARRenderMode">
<summary>
<para>Enumeration describing the AR rendering mode used with XR.ARBackgroundRenderer.</para>
</summary>
</member>
<member name="F:UnityEngine.XR.ARRenderMode.MaterialAsBackground">
<summary>
<para>The material associated with XR.ARBackgroundRenderer is being rendered as the background.</para>
</summary>
</member>
<member name="F:UnityEngine.XR.ARRenderMode.StandardBackground">
<summary>
<para>The standard background is rendered. (Skybox, Solid Color, etc.)</para>
</summary>
</member>
</members>
</doc>
Binary file not shown.
24 changes: 24 additions & 0 deletions 1_Data/Managed/UnityEngine.AccessibilityModule.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<doc>
<members>
<assembly>
<name>UnityEngine.AccessibilityModule</name>
</assembly>
<member name="T:UnityEngine.Accessibility.VisionUtility">
<summary>
<para>A class containing methods to assist with accessibility for users with different vision capabilities.</para>
</summary>
</member>
<member name="M:UnityEngine.Accessibility.VisionUtility.GetColorBlindSafePalette(UnityEngine.Color[],System.Single,System.Single)">
<summary>
<para>Gets a palette of colors that should be distinguishable for normal vision, deuteranopia, protanopia, and tritanopia.</para>
</summary>
<param name="palette">An array of colors to populate with a palette.</param>
<param name="minimumLuminance">Minimum allowable perceived luminance from 0 to 1. A value of 0.2 or greater is recommended for dark backgrounds.</param>
<param name="maximumLuminance">Maximum allowable perceived luminance from 0 to 1. A value of 0.8 or less is recommended for light backgrounds.</param>
<returns>
<para>The number of unambiguous colors in the palette.</para>
</returns>
</member>
</members>
</doc>
Binary file added 1_Data/Managed/UnityEngine.AnimationModule.dll
Binary file not shown.
Loading

0 comments on commit f468f82

Please sign in to comment.