Skip to content

Commit c1bd13e

Browse files
author
Ben Cuan
committed
Merge pull request #32 from FewdpewGames/develop
Major bug fix: GUI scaling Added some minor asset changes that will be used in future updates
2 parents cb753b6 + c88a9ae commit c1bd13e

File tree

276 files changed

+1490
-1294
lines changed

Some content is hidden

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

276 files changed

+1490
-1294
lines changed

‎Assembly-CSharp-Editor-firstpass.csproj‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>10.0.20506</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<RootNamespace></RootNamespace>
9+
<ProjectGuid>{816F21A6-E317-4E44-1CFA-C27BF7902709}</ProjectGuid>
10+
<OutputType>Library</OutputType>
11+
<AppDesignerFolder>Properties</AppDesignerFolder>
12+
<AssemblyName>Assembly-CSharp-Editor-firstpass</AssemblyName>
13+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
14+
<FileAlignment>512</FileAlignment>
15+
<BaseDirectory>Assets</BaseDirectory>
16+
<LangVersion>default</LangVersion>
17+
</PropertyGroup>
18+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19+
<DebugSymbols>true</DebugSymbols>
20+
<DebugType>full</DebugType>
21+
<Optimize>false</Optimize>
22+
<OutputPath>Temp\bin\Debug\</OutputPath>
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;CROSS_PLATFORM_INPUT</DefineConstants>
24+
<ErrorReport>prompt</ErrorReport>
25+
<WarningLevel>4</WarningLevel>
26+
<NoWarn>0169</NoWarn>
27+
<LangVersion>default</LangVersion>
28+
</PropertyGroup>
29+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30+
<DebugType>pdbonly</DebugType>
31+
<Optimize>true</Optimize>
32+
<OutputPath>Temp\bin\Release\</OutputPath>
33+
<ErrorReport>prompt</ErrorReport>
34+
<WarningLevel>4</WarningLevel>
35+
<NoWarn>0169</NoWarn>
36+
<LangVersion>default</LangVersion>
37+
</PropertyGroup>
38+
<ItemGroup>
39+
<Reference Include="System" />
40+
<Reference Include="System.XML" />
41+
<Reference Include="System.Core" />
42+
<Reference Include="System.Xml.Linq" />
43+
<Reference Include="UnityEngine">
44+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/Managed/UnityEngine.dll</HintPath>
45+
</Reference>
46+
<Reference Include="UnityEditor">
47+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/Managed/UnityEditor.dll</HintPath>
48+
</Reference>
49+
</ItemGroup>
50+
<ItemGroup>
51+
<Compile Include="Assets\Plugins\VSCode\Plugins\Editor\VSCode.cs" />
52+
<None Include="Assets\Plugins\Photon3Unity3D.xml" />
53+
<None Include="Assets\Plugins\release_history.txt" />
54+
<None Include="Assets\Plugins\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
55+
<None Include="Assets\Networking\Photon Unity Networking\readme.txt" />
56+
<None Include="Assets\Networking\Photon Unity Networking\changelog.txt" />
57+
<Reference Include="UnityEditor.Advertisements">
58+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
59+
</Reference>
60+
<Reference Include="nunit.framework">
61+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/nunit.framework.dll</HintPath>
62+
</Reference>
63+
<Reference Include="UnityEditor.EditorTestsRunner">
64+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/EditorTestsRunner/Editor/UnityEditor.EditorTestsRunner.dll</HintPath>
65+
</Reference>
66+
<Reference Include="UnityEngine.UI">
67+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
68+
</Reference>
69+
<Reference Include="UnityEditor.UI">
70+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
71+
</Reference>
72+
<Reference Include="UnityEngine.Networking">
73+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
74+
</Reference>
75+
<Reference Include="UnityEditor.Networking">
76+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
77+
</Reference>
78+
<Reference Include="UnityEditor.TreeEditor">
79+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll</HintPath>
80+
</Reference>
81+
<Reference Include="UnityEngine.Analytics">
82+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
83+
</Reference>
84+
<Reference Include="UnityEngine.Purchasing">
85+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
86+
</Reference>
87+
<Reference Include="Newtonsoft.Json">
88+
<HintPath>C:/Users/BenCu/Documents/unity-game/Assets/Networking/Photon Unity Networking/Editor/PhotonNetwork/Newtonsoft.Json.dll</HintPath>
89+
</Reference>
90+
<Reference Include="Photon3Unity3D">
91+
<HintPath>C:/Users/BenCu/Documents/unity-game/Assets/Plugins/Photon3Unity3D.dll</HintPath>
92+
</Reference>
93+
<Reference Include="websocket-sharp">
94+
<HintPath>C:/Users/BenCu/Documents/unity-game/Assets/Plugins/WebSocket/websocket-sharp.dll</HintPath>
95+
</Reference>
96+
<Reference Include="UnityEditor.Graphs">
97+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/Managed/UnityEditor.Graphs.dll</HintPath>
98+
</Reference>
99+
<Reference Include="UnityEditor.LinuxStandalone.Extensions">
100+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll</HintPath>
101+
</Reference>
102+
<Reference Include="UnityEditor.WindowsStandalone.Extensions">
103+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
104+
</Reference>
105+
<Reference Include="UnityEditor.OSXStandalone.Extensions">
106+
<HintPath>C:/Program Files/Unity 5.4.0b18/Editor/Data/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
107+
</Reference>
108+
</ItemGroup>
109+
<ItemGroup>
110+
<ProjectReference Include="Assembly-CSharp-firstpass.csproj">
111+
<Project>{2519C5CC-BAC2-7AAC-AFA9-7A11A8EB22A4}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
112+
</ItemGroup>
113+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
114+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
115+
Other similar extension points exist, see Microsoft.Common.targets.
116+
<Target Name="BeforeBuild">
117+
</Target>
118+
<Target Name="AfterBuild">
119+
</Target>
120+
-->
121+
</Project>

‎Assembly-CSharp-Editor.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@
6363
<Compile Include="Assets\Networking\Photon Unity Networking\Editor\PhotonNetwork\Views\PhotonRigidbody2DViewEditor.cs" />
6464
<Compile Include="Assets\Networking\Photon Unity Networking\Editor\PhotonNetwork\Views\PhotonRigidbodyViewEditor.cs" />
6565
<Compile Include="Assets\Networking\Photon Unity Networking\Editor\PhotonNetwork\Views\PhotonTransformViewEditor.cs" />
66-
<Compile Include="Assets\VSCode\Plugins\Editor\VSCode.cs" />
6766
<None Include="Assets\Plugins\Photon3Unity3D.xml" />
6867
<None Include="Assets\Plugins\release_history.txt" />
69-
<None Include="Assets\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
68+
<None Include="Assets\Plugins\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
7069
<None Include="Assets\Networking\Photon Unity Networking\readme.txt" />
7170
<None Include="Assets\Networking\Photon Unity Networking\changelog.txt" />
7271
<Reference Include="UnityEditor.Advertisements">
@@ -126,6 +125,8 @@
126125
<Project>{2519C5CC-BAC2-7AAC-AFA9-7A11A8EB22A4}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
127126
<ProjectReference Include="Assembly-CSharp.csproj">
128127
<Project>{81499F24-4FAE-3BA0-D105-6C4FDF7F9372}</Project> <Name>Assembly-CSharp</Name> </ProjectReference>
128+
<ProjectReference Include="Assembly-CSharp-Editor-firstpass.csproj">
129+
<Project>{816F21A6-E317-4E44-1CFA-C27BF7902709}</Project> <Name>Assembly-CSharp-Editor-firstpass</Name> </ProjectReference>
129130
</ItemGroup>
130131
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
131132
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎Assembly-CSharp-firstpass.csproj‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -48,44 +48,44 @@
4848
</Reference>
4949
</ItemGroup>
5050
<ItemGroup>
51+
<Compile Include="Assets\Plugins\Standard Assets\CrossPlatformInput\Scripts\AxisTouchButton.cs" />
52+
<Compile Include="Assets\Plugins\Standard Assets\CrossPlatformInput\Scripts\ButtonHandler.cs" />
53+
<Compile Include="Assets\Plugins\Standard Assets\CrossPlatformInput\Scripts\CrossPlatformInputManager.cs" />
54+
<Compile Include="Assets\Plugins\Standard Assets\CrossPlatformInput\Scripts\InputAxisScrollbar.cs" />
55+
<Compile Include="Assets\Plugins\Standard Assets\CrossPlatformInput\Scripts\Joystick.cs" />
56+
<Compile Include="Assets\Plugins\Standard Assets\CrossPlatformInput\Scripts\MobileControlRig.cs" />
57+
<Compile Include="Assets\Plugins\Standard Assets\CrossPlatformInput\Scripts\PlatformSpecific\MobileInput.cs" />
58+
<Compile Include="Assets\Plugins\Standard Assets\CrossPlatformInput\Scripts\PlatformSpecific\StandaloneInput.cs" />
59+
<Compile Include="Assets\Plugins\Standard Assets\CrossPlatformInput\Scripts\TiltInput.cs" />
60+
<Compile Include="Assets\Plugins\Standard Assets\CrossPlatformInput\Scripts\TouchPad.cs" />
61+
<Compile Include="Assets\Plugins\Standard Assets\CrossPlatformInput\Scripts\VirtualInput.cs" />
62+
<Compile Include="Assets\Plugins\Standard Assets\Utility\ActivateTrigger.cs" />
63+
<Compile Include="Assets\Plugins\Standard Assets\Utility\AutoMobileShaderSwitch.cs" />
64+
<Compile Include="Assets\Plugins\Standard Assets\Utility\AutoMoveAndRotate.cs" />
65+
<Compile Include="Assets\Plugins\Standard Assets\Utility\CameraRefocus.cs" />
66+
<Compile Include="Assets\Plugins\Standard Assets\Utility\CurveControlledBob.cs" />
67+
<Compile Include="Assets\Plugins\Standard Assets\Utility\DragRigidbody.cs" />
68+
<Compile Include="Assets\Plugins\Standard Assets\Utility\DynamicShadowSettings.cs" />
69+
<Compile Include="Assets\Plugins\Standard Assets\Utility\EventSystemChecker.cs" />
70+
<Compile Include="Assets\Plugins\Standard Assets\Utility\FOVKick.cs" />
71+
<Compile Include="Assets\Plugins\Standard Assets\Utility\FPSCounter.cs" />
72+
<Compile Include="Assets\Plugins\Standard Assets\Utility\FollowTarget.cs" />
73+
<Compile Include="Assets\Plugins\Standard Assets\Utility\ForcedReset.cs" />
74+
<Compile Include="Assets\Plugins\Standard Assets\Utility\LerpControlledBob.cs" />
75+
<Compile Include="Assets\Plugins\Standard Assets\Utility\ObjectResetter.cs" />
76+
<Compile Include="Assets\Plugins\Standard Assets\Utility\ParticleSystemDestroyer.cs" />
77+
<Compile Include="Assets\Plugins\Standard Assets\Utility\PlatformSpecificContent.cs" />
78+
<Compile Include="Assets\Plugins\Standard Assets\Utility\SimpleActivatorMenu.cs" />
79+
<Compile Include="Assets\Plugins\Standard Assets\Utility\SimpleMouseRotator.cs" />
80+
<Compile Include="Assets\Plugins\Standard Assets\Utility\SmoothFollow.cs" />
81+
<Compile Include="Assets\Plugins\Standard Assets\Utility\TimedObjectActivator.cs" />
82+
<Compile Include="Assets\Plugins\Standard Assets\Utility\TimedObjectDestructor.cs" />
83+
<Compile Include="Assets\Plugins\Standard Assets\Utility\WaypointCircuit.cs" />
84+
<Compile Include="Assets\Plugins\Standard Assets\Utility\WaypointProgressTracker.cs" />
5185
<Compile Include="Assets\Plugins\WebSocket\WebSocket.cs" />
52-
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\AxisTouchButton.cs" />
53-
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\ButtonHandler.cs" />
54-
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\CrossPlatformInputManager.cs" />
55-
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\InputAxisScrollbar.cs" />
56-
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\Joystick.cs" />
57-
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\MobileControlRig.cs" />
58-
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\PlatformSpecific\MobileInput.cs" />
59-
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\PlatformSpecific\StandaloneInput.cs" />
60-
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\TiltInput.cs" />
61-
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\TouchPad.cs" />
62-
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\VirtualInput.cs" />
63-
<Compile Include="Assets\Standard Assets\Utility\ActivateTrigger.cs" />
64-
<Compile Include="Assets\Standard Assets\Utility\AutoMobileShaderSwitch.cs" />
65-
<Compile Include="Assets\Standard Assets\Utility\AutoMoveAndRotate.cs" />
66-
<Compile Include="Assets\Standard Assets\Utility\CameraRefocus.cs" />
67-
<Compile Include="Assets\Standard Assets\Utility\CurveControlledBob.cs" />
68-
<Compile Include="Assets\Standard Assets\Utility\DragRigidbody.cs" />
69-
<Compile Include="Assets\Standard Assets\Utility\DynamicShadowSettings.cs" />
70-
<Compile Include="Assets\Standard Assets\Utility\EventSystemChecker.cs" />
71-
<Compile Include="Assets\Standard Assets\Utility\FOVKick.cs" />
72-
<Compile Include="Assets\Standard Assets\Utility\FPSCounter.cs" />
73-
<Compile Include="Assets\Standard Assets\Utility\FollowTarget.cs" />
74-
<Compile Include="Assets\Standard Assets\Utility\ForcedReset.cs" />
75-
<Compile Include="Assets\Standard Assets\Utility\LerpControlledBob.cs" />
76-
<Compile Include="Assets\Standard Assets\Utility\ObjectResetter.cs" />
77-
<Compile Include="Assets\Standard Assets\Utility\ParticleSystemDestroyer.cs" />
78-
<Compile Include="Assets\Standard Assets\Utility\PlatformSpecificContent.cs" />
79-
<Compile Include="Assets\Standard Assets\Utility\SimpleActivatorMenu.cs" />
80-
<Compile Include="Assets\Standard Assets\Utility\SimpleMouseRotator.cs" />
81-
<Compile Include="Assets\Standard Assets\Utility\SmoothFollow.cs" />
82-
<Compile Include="Assets\Standard Assets\Utility\TimedObjectActivator.cs" />
83-
<Compile Include="Assets\Standard Assets\Utility\TimedObjectDestructor.cs" />
84-
<Compile Include="Assets\Standard Assets\Utility\WaypointCircuit.cs" />
85-
<Compile Include="Assets\Standard Assets\Utility\WaypointProgressTracker.cs" />
8686
<None Include="Assets\Plugins\Photon3Unity3D.xml" />
8787
<None Include="Assets\Plugins\release_history.txt" />
88-
<None Include="Assets\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
88+
<None Include="Assets\Plugins\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
8989
<None Include="Assets\Networking\Photon Unity Networking\readme.txt" />
9090
<None Include="Assets\Networking\Photon Unity Networking\changelog.txt" />
9191
<Reference Include="UnityEngine.UI">

‎Assembly-CSharp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<Compile Include="Assets\Test Map\MapEvents.cs" />
140140
<None Include="Assets\Plugins\Photon3Unity3D.xml" />
141141
<None Include="Assets\Plugins\release_history.txt" />
142-
<None Include="Assets\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
142+
<None Include="Assets\Plugins\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
143143
<None Include="Assets\Networking\Photon Unity Networking\readme.txt" />
144144
<None Include="Assets\Networking\Photon Unity Networking\changelog.txt" />
145145
<Reference Include="UnityEngine.UI">

‎Assets/Logo.png‎

-854 Bytes
Binary file not shown.

‎Assets/Logo.png.meta‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)