Skip to content

Commit f5517d5

Browse files
64bitpandas64bitpandas
committed
Merge branch 'develop'
2 parents 076aa1a + c940f0e commit f5517d5

File tree

932 files changed

+400200
-4484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

932 files changed

+400200
-4484
lines changed

‎Assembly-CSharp-Editor-firstpass.csproj‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<BaseDirectory>Assets</BaseDirectory>
16-
<LangVersion>default</LangVersion>
17-
</PropertyGroup>
16+
</PropertyGroup>
1817
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1918
<DebugSymbols>true</DebugSymbols>
2019
<DebugType>full</DebugType>
@@ -24,65 +23,65 @@
2423
<ErrorReport>prompt</ErrorReport>
2524
<WarningLevel>4</WarningLevel>
2625
<NoWarn>0169</NoWarn>
27-
<LangVersion>default</LangVersion>
28-
</PropertyGroup>
26+
</PropertyGroup>
2927
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3028
<DebugType>pdbonly</DebugType>
3129
<Optimize>true</Optimize>
3230
<OutputPath>Temp\bin\Release\</OutputPath>
3331
<ErrorReport>prompt</ErrorReport>
3432
<WarningLevel>4</WarningLevel>
3533
<NoWarn>0169</NoWarn>
36-
<LangVersion>default</LangVersion>
37-
</PropertyGroup>
34+
</PropertyGroup>
3835
<ItemGroup>
3936
<Reference Include="System" />
4037
<Reference Include="System.XML" />
4138
<Reference Include="System.Core" />
4239
<Reference Include="System.Xml.Linq" />
4340
<Reference Include="UnityEngine">
44-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/Managed/UnityEngine.dll</HintPath>
41+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/Managed/UnityEngine.dll</HintPath>
4542
</Reference>
4643
<Reference Include="UnityEditor">
47-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/Managed/UnityEditor.dll</HintPath>
44+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/Managed/UnityEditor.dll</HintPath>
4845
</Reference>
4946
</ItemGroup>
5047
<ItemGroup>
5148
<Compile Include="Assets\Plugins\VSCode\Plugins\Editor\VSCode.cs" />
5249
<None Include="Assets\Plugins\Photon3Unity3D.xml" />
5350
<None Include="Assets\Plugins\release_history.txt" />
5451
<None Include="Assets\Plugins\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
52+
<None Include="Assets\Networking\Resources\Animations\Raw Mocap Data\Animations\_CompleteAnimationList.txt" />
5553
<None Include="Assets\Networking\Photon Unity Networking\readme.txt" />
5654
<None Include="Assets\Networking\Photon Unity Networking\changelog.txt" />
55+
<None Include="Assets\list.txt" />
5756
<Reference Include="UnityEditor.Advertisements">
58-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
57+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
5958
</Reference>
6059
<Reference Include="nunit.framework">
61-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/nunit.framework.dll</HintPath>
60+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/nunit.framework.dll</HintPath>
6261
</Reference>
6362
<Reference Include="UnityEditor.EditorTestsRunner">
64-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/UnityEditor.EditorTestsRunner.dll</HintPath>
63+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/UnityEditor.EditorTestsRunner.dll</HintPath>
6564
</Reference>
6665
<Reference Include="UnityEngine.UI">
67-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
66+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
6867
</Reference>
6968
<Reference Include="UnityEditor.UI">
70-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
69+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
7170
</Reference>
7271
<Reference Include="UnityEngine.Networking">
73-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
72+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
7473
</Reference>
7574
<Reference Include="UnityEditor.Networking">
76-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
75+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
7776
</Reference>
7877
<Reference Include="UnityEditor.TreeEditor">
79-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
78+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
8079
</Reference>
8180
<Reference Include="UnityEngine.Analytics">
82-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
81+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
8382
</Reference>
8483
<Reference Include="UnityEngine.Purchasing">
85-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
84+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
8685
</Reference>
8786
<Reference Include="Newtonsoft.Json">
8887
<HintPath>C:/Users/BenCu/Documents/unity-game/Assets/Networking/Photon Unity Networking/Editor/PhotonNetwork/Newtonsoft.Json.dll</HintPath>
@@ -94,16 +93,16 @@
9493
<HintPath>C:/Users/BenCu/Documents/unity-game/Assets/Plugins/WebSocket/websocket-sharp.dll</HintPath>
9594
</Reference>
9695
<Reference Include="UnityEditor.Graphs">
97-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
96+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
9897
</Reference>
9998
<Reference Include="UnityEditor.LinuxStandalone.Extensions">
100-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll</HintPath>
99+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll</HintPath>
101100
</Reference>
102101
<Reference Include="UnityEditor.WindowsStandalone.Extensions">
103-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
102+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
104103
</Reference>
105104
<Reference Include="UnityEditor.OSXStandalone.Extensions">
106-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
105+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
107106
</Reference>
108107
</ItemGroup>
109108
<ItemGroup>
@@ -118,4 +117,5 @@
118117
<Target Name="AfterBuild">
119118
</Target>
120119
-->
120+
121121
</Project>

‎Assembly-CSharp-Editor.csproj‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<BaseDirectory>Assets</BaseDirectory>
16-
<LangVersion>default</LangVersion>
17-
</PropertyGroup>
16+
</PropertyGroup>
1817
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1918
<DebugSymbols>true</DebugSymbols>
2019
<DebugType>full</DebugType>
@@ -24,27 +23,25 @@
2423
<ErrorReport>prompt</ErrorReport>
2524
<WarningLevel>4</WarningLevel>
2625
<NoWarn>0169</NoWarn>
27-
<LangVersion>default</LangVersion>
28-
</PropertyGroup>
26+
</PropertyGroup>
2927
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3028
<DebugType>pdbonly</DebugType>
3129
<Optimize>true</Optimize>
3230
<OutputPath>Temp\bin\Release\</OutputPath>
3331
<ErrorReport>prompt</ErrorReport>
3432
<WarningLevel>4</WarningLevel>
3533
<NoWarn>0169</NoWarn>
36-
<LangVersion>default</LangVersion>
37-
</PropertyGroup>
34+
</PropertyGroup>
3835
<ItemGroup>
3936
<Reference Include="System" />
4037
<Reference Include="System.XML" />
4138
<Reference Include="System.Core" />
4239
<Reference Include="System.Xml.Linq" />
4340
<Reference Include="UnityEngine">
44-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/Managed/UnityEngine.dll</HintPath>
41+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/Managed/UnityEngine.dll</HintPath>
4542
</Reference>
4643
<Reference Include="UnityEditor">
47-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/Managed/UnityEditor.dll</HintPath>
44+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/Managed/UnityEditor.dll</HintPath>
4845
</Reference>
4946
</ItemGroup>
5047
<ItemGroup>
@@ -59,44 +56,45 @@
5956
<Compile Include="Assets\Networking\Photon Unity Networking\Editor\PhotonNetwork\PunSceneSettings.cs" />
6057
<Compile Include="Assets\Networking\Photon Unity Networking\Editor\PhotonNetwork\ReorderableListResources.cs" />
6158
<Compile Include="Assets\Networking\Photon Unity Networking\Editor\PhotonNetwork\ServerSettingsInspector.cs" />
62-
<Compile Include="Assets\Networking\Photon Unity Networking\Editor\PhotonNetwork\Views\PhotonAnimatorViewEditor.cs" />
6359
<Compile Include="Assets\Networking\Photon Unity Networking\Editor\PhotonNetwork\Views\PhotonRigidbody2DViewEditor.cs" />
6460
<Compile Include="Assets\Networking\Photon Unity Networking\Editor\PhotonNetwork\Views\PhotonRigidbodyViewEditor.cs" />
6561
<Compile Include="Assets\Networking\Photon Unity Networking\Editor\PhotonNetwork\Views\PhotonTransformViewEditor.cs" />
6662
<None Include="Assets\Plugins\Photon3Unity3D.xml" />
6763
<None Include="Assets\Plugins\release_history.txt" />
6864
<None Include="Assets\Plugins\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
65+
<None Include="Assets\Networking\Resources\Animations\Raw Mocap Data\Animations\_CompleteAnimationList.txt" />
6966
<None Include="Assets\Networking\Photon Unity Networking\readme.txt" />
7067
<None Include="Assets\Networking\Photon Unity Networking\changelog.txt" />
68+
<None Include="Assets\list.txt" />
7169
<Reference Include="UnityEditor.Advertisements">
72-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
70+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
7371
</Reference>
7472
<Reference Include="nunit.framework">
75-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/nunit.framework.dll</HintPath>
73+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/nunit.framework.dll</HintPath>
7674
</Reference>
7775
<Reference Include="UnityEditor.EditorTestsRunner">
78-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/UnityEditor.EditorTestsRunner.dll</HintPath>
76+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/UnityEditor.EditorTestsRunner.dll</HintPath>
7977
</Reference>
8078
<Reference Include="UnityEngine.UI">
81-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
79+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
8280
</Reference>
8381
<Reference Include="UnityEditor.UI">
84-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
82+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
8583
</Reference>
8684
<Reference Include="UnityEngine.Networking">
87-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
85+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
8886
</Reference>
8987
<Reference Include="UnityEditor.Networking">
90-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
88+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
9189
</Reference>
9290
<Reference Include="UnityEditor.TreeEditor">
93-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
91+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
9492
</Reference>
9593
<Reference Include="UnityEngine.Analytics">
96-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
94+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
9795
</Reference>
9896
<Reference Include="UnityEngine.Purchasing">
99-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
97+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
10098
</Reference>
10199
<Reference Include="Newtonsoft.Json">
102100
<HintPath>C:/Users/BenCu/Documents/unity-game/Assets/Networking/Photon Unity Networking/Editor/PhotonNetwork/Newtonsoft.Json.dll</HintPath>
@@ -108,23 +106,21 @@
108106
<HintPath>C:/Users/BenCu/Documents/unity-game/Assets/Plugins/WebSocket/websocket-sharp.dll</HintPath>
109107
</Reference>
110108
<Reference Include="UnityEditor.Graphs">
111-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
109+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
112110
</Reference>
113111
<Reference Include="UnityEditor.LinuxStandalone.Extensions">
114-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll</HintPath>
112+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll</HintPath>
115113
</Reference>
116114
<Reference Include="UnityEditor.WindowsStandalone.Extensions">
117-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
115+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
118116
</Reference>
119117
<Reference Include="UnityEditor.OSXStandalone.Extensions">
120-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
118+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
121119
</Reference>
122120
</ItemGroup>
123121
<ItemGroup>
124122
<ProjectReference Include="Assembly-CSharp-firstpass.csproj">
125123
<Project>{2519C5CC-BAC2-7AAC-AFA9-7A11A8EB22A4}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
126-
<ProjectReference Include="Assembly-CSharp.csproj">
127-
<Project>{81499F24-4FAE-3BA0-D105-6C4FDF7F9372}</Project> <Name>Assembly-CSharp</Name> </ProjectReference>
128124
<ProjectReference Include="Assembly-CSharp-Editor-firstpass.csproj">
129125
<Project>{816F21A6-E317-4E44-1CFA-C27BF7902709}</Project> <Name>Assembly-CSharp-Editor-firstpass</Name> </ProjectReference>
130126
</ItemGroup>
@@ -136,4 +132,5 @@
136132
<Target Name="AfterBuild">
137133
</Target>
138134
-->
135+
139136
</Project>

‎Assembly-CSharp-firstpass.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<BaseDirectory>Assets</BaseDirectory>
16-
<LangVersion>default</LangVersion>
17-
</PropertyGroup>
16+
</PropertyGroup>
1817
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1918
<DebugSymbols>true</DebugSymbols>
2019
<DebugType>full</DebugType>
@@ -24,27 +23,25 @@
2423
<ErrorReport>prompt</ErrorReport>
2524
<WarningLevel>4</WarningLevel>
2625
<NoWarn>0169</NoWarn>
27-
<LangVersion>default</LangVersion>
28-
</PropertyGroup>
26+
</PropertyGroup>
2927
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3028
<DebugType>pdbonly</DebugType>
3129
<Optimize>true</Optimize>
3230
<OutputPath>Temp\bin\Release\</OutputPath>
3331
<ErrorReport>prompt</ErrorReport>
3432
<WarningLevel>4</WarningLevel>
3533
<NoWarn>0169</NoWarn>
36-
<LangVersion>default</LangVersion>
37-
</PropertyGroup>
34+
</PropertyGroup>
3835
<ItemGroup>
3936
<Reference Include="System" />
4037
<Reference Include="System.XML" />
4138
<Reference Include="System.Core" />
4239
<Reference Include="System.Xml.Linq" />
4340
<Reference Include="UnityEngine">
44-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/Managed/UnityEngine.dll</HintPath>
41+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/Managed/UnityEngine.dll</HintPath>
4542
</Reference>
4643
<Reference Include="UnityEditor">
47-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/Managed/UnityEditor.dll</HintPath>
44+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/Managed/UnityEditor.dll</HintPath>
4845
</Reference>
4946
</ItemGroup>
5047
<ItemGroup>
@@ -86,19 +83,21 @@
8683
<None Include="Assets\Plugins\Photon3Unity3D.xml" />
8784
<None Include="Assets\Plugins\release_history.txt" />
8885
<None Include="Assets\Plugins\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
86+
<None Include="Assets\Networking\Resources\Animations\Raw Mocap Data\Animations\_CompleteAnimationList.txt" />
8987
<None Include="Assets\Networking\Photon Unity Networking\readme.txt" />
9088
<None Include="Assets\Networking\Photon Unity Networking\changelog.txt" />
89+
<None Include="Assets\list.txt" />
9190
<Reference Include="UnityEngine.UI">
92-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
91+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
9392
</Reference>
9493
<Reference Include="UnityEngine.Networking">
95-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
94+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
9695
</Reference>
9796
<Reference Include="UnityEngine.Analytics">
98-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
97+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
9998
</Reference>
10099
<Reference Include="UnityEngine.Purchasing">
101-
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
100+
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
102101
</Reference>
103102
<Reference Include="Photon3Unity3D">
104103
<HintPath>C:/Users/BenCu/Documents/unity-game/Assets/Plugins/Photon3Unity3D.dll</HintPath>
@@ -115,4 +114,5 @@
115114
<Target Name="AfterBuild">
116115
</Target>
117116
-->
117+
118118
</Project>

0 commit comments

Comments
 (0)