Skip to content

Commit a073246

Browse files
author
Ben C
authored
Update 1.2.1
Merge #41
2 parents de0d0d3 + fd36493 commit a073246

Some content is hidden

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

49 files changed

+1645
-363
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ Icon?
3131
ehthumbs.db
3232
[Tt]humbs.db
3333
[Dd]esktop.ini
34+
.vscode/settings.json
35+
Assembly-CSharp-Editor-firstpass.csproj
36+
Assembly-CSharp-firstpass.csproj
37+
Assembly-CSharp-Editor.csproj

‎Assembly-CSharp-Editor-firstpass.csproj‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,45 @@
66
<ProductVersion>10.0.20506</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
88
<RootNamespace></RootNamespace>
9-
<ProjectGuid>{816F21A6-E317-4E44-1CFA-C27BF7902709}</ProjectGuid>
9+
<ProjectGuid>{8246ABAC-209F-CEBE-5015-F1D32A3B3962}</ProjectGuid>
1010
<OutputType>Library</OutputType>
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<AssemblyName>Assembly-CSharp-Editor-firstpass</AssemblyName>
1313
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<BaseDirectory>Assets</BaseDirectory>
16-
</PropertyGroup>
16+
<LangVersion>default</LangVersion>
17+
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
1920
<DebugType>full</DebugType>
2021
<Optimize>false</Optimize>
2122
<OutputPath>Temp\bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_0;UNITY_5_4;UNITY_5;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;CROSS_PLATFORM_INPUT</DefineConstants>
23+
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_0;UNITY_5_4;UNITY_5;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;CROSS_PLATFORM_INPUT</DefineConstants>
2324
<ErrorReport>prompt</ErrorReport>
2425
<WarningLevel>4</WarningLevel>
2526
<NoWarn>0169</NoWarn>
26-
</PropertyGroup>
27+
<LangVersion>default</LangVersion>
28+
</PropertyGroup>
2729
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2830
<DebugType>pdbonly</DebugType>
2931
<Optimize>true</Optimize>
3032
<OutputPath>Temp\bin\Release\</OutputPath>
3133
<ErrorReport>prompt</ErrorReport>
3234
<WarningLevel>4</WarningLevel>
3335
<NoWarn>0169</NoWarn>
34-
</PropertyGroup>
36+
<LangVersion>default</LangVersion>
37+
</PropertyGroup>
3538
<ItemGroup>
3639
<Reference Include="System" />
3740
<Reference Include="System.XML" />
3841
<Reference Include="System.Core" />
3942
<Reference Include="System.Xml.Linq" />
4043
<Reference Include="UnityEngine">
41-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/Managed/UnityEngine.dll</HintPath>
44+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/Managed/UnityEngine.dll</HintPath>
4245
</Reference>
4346
<Reference Include="UnityEditor">
44-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/Managed/UnityEditor.dll</HintPath>
47+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/Managed/UnityEditor.dll</HintPath>
4548
</Reference>
4649
</ItemGroup>
4750
<ItemGroup>
@@ -54,60 +57,60 @@
5457
<None Include="Assets\Networking\Photon Unity Networking\changelog.txt" />
5558
<None Include="Assets\list.txt" />
5659
<Reference Include="UnityEditor.Advertisements">
57-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
60+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
5861
</Reference>
5962
<Reference Include="nunit.framework">
60-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/nunit.framework.dll</HintPath>
63+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/nunit.framework.dll</HintPath>
6164
</Reference>
6265
<Reference Include="UnityEditor.EditorTestsRunner">
63-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/UnityEditor.EditorTestsRunner.dll</HintPath>
66+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/UnityEditor.EditorTestsRunner.dll</HintPath>
6467
</Reference>
6568
<Reference Include="UnityEngine.UI">
66-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
69+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
6770
</Reference>
6871
<Reference Include="UnityEditor.UI">
69-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
72+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
7073
</Reference>
7174
<Reference Include="UnityEngine.Networking">
72-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
75+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
7376
</Reference>
7477
<Reference Include="UnityEditor.Networking">
75-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
78+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
7679
</Reference>
7780
<Reference Include="UnityEditor.TreeEditor">
78-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
81+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
7982
</Reference>
8083
<Reference Include="UnityEngine.Analytics">
81-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
84+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
8285
</Reference>
8386
<Reference Include="UnityEngine.Purchasing">
84-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
87+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
8588
</Reference>
8689
<Reference Include="Newtonsoft.Json">
87-
<HintPath>C:/Users/BenCu/Documents/unity-game/Assets/Networking/Photon Unity Networking/Editor/PhotonNetwork/Newtonsoft.Json.dll</HintPath>
90+
<HintPath>C:/Users/BenCu/Documents/TowerRush/Assets/Networking/Photon Unity Networking/Editor/PhotonNetwork/Newtonsoft.Json.dll</HintPath>
8891
</Reference>
8992
<Reference Include="Photon3Unity3D">
90-
<HintPath>C:/Users/BenCu/Documents/unity-game/Assets/Plugins/Photon3Unity3D.dll</HintPath>
93+
<HintPath>C:/Users/BenCu/Documents/TowerRush/Assets/Plugins/Photon3Unity3D.dll</HintPath>
9194
</Reference>
9295
<Reference Include="websocket-sharp">
93-
<HintPath>C:/Users/BenCu/Documents/unity-game/Assets/Plugins/WebSocket/websocket-sharp.dll</HintPath>
96+
<HintPath>C:/Users/BenCu/Documents/TowerRush/Assets/Plugins/WebSocket/websocket-sharp.dll</HintPath>
9497
</Reference>
9598
<Reference Include="UnityEditor.Graphs">
96-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
99+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
97100
</Reference>
98101
<Reference Include="UnityEditor.LinuxStandalone.Extensions">
99-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll</HintPath>
102+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll</HintPath>
100103
</Reference>
101104
<Reference Include="UnityEditor.WindowsStandalone.Extensions">
102-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
105+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
103106
</Reference>
104107
<Reference Include="UnityEditor.OSXStandalone.Extensions">
105-
<HintPath>C:/Program Files/Unity 5.4.0b22/Editor/Data/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
108+
<HintPath>C:/Program Files/Unity 5.4.0b25/Editor/Data/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
106109
</Reference>
107110
</ItemGroup>
108111
<ItemGroup>
109112
<ProjectReference Include="Assembly-CSharp-firstpass.csproj">
110-
<Project>{2519C5CC-BAC2-7AAC-AFA9-7A11A8EB22A4}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
113+
<Project>{5634AAFB-7FC6-D2C3-26DF-548CD721EFD9}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
111114
</ItemGroup>
112115
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
113116
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -117,5 +120,4 @@
117120
<Target Name="AfterBuild">
118121
</Target>
119122
-->
120-
121123
</Project>

0 commit comments

Comments
 (0)