Home Explore Help
Register Sign In
GFG_New
/
ET9_WebGL_Base
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

调整服务器代码目录结构

tanghai 9 years ago
parent
6f67e5c085
commit
9f9c85167b
100 changed files with 56 additions and 46 deletions
Split View Show Diff Stats
  1. BIN
      Server/Lib/ENet.dll
  2. 7 7
      Server/Server.App/Server.App.csproj
  3. 0 0
      Server/Server.Base/Config/ACategory.cs
  4. 0 0
      Server/Server.Base/Config/AConfig.cs
  5. 0 0
      Server/Server.Base/Config/ConfigAttribute.cs
  6. 0 0
      Server/Server.Base/Config/ICategory.cs
  7. 0 0
      Server/Server.Base/DoubleMap.cs
  8. 0 0
      Server/Server.Base/Helper/ArrayHelper.cs
  9. 0 0
      Server/Server.Base/Helper/ByteHelper.cs
  10. 0 0
      Server/Server.Base/Helper/EnumHelper.cs
  11. 0 0
      Server/Server.Base/Helper/FileHelper.cs
  12. 0 0
      Server/Server.Base/Helper/IdGenerater.cs
  13. 0 0
      Server/Server.Base/Helper/MD5Helper.cs
  14. 0 0
      Server/Server.Base/Helper/MongoHelper.cs
  15. 0 0
      Server/Server.Base/Helper/ProtobufHelper.cs
  16. 0 0
      Server/Server.Base/Helper/RandomHelper.cs
  17. 0 0
      Server/Server.Base/Helper/StringHelper.cs
  18. 0 0
      Server/Server.Base/Helper/TimeHelper.cs
  19. 0 0
      Server/Server.Base/Helper/ZipHelper.cs
  20. 0 0
      Server/Server.Base/Log/ALogDecorater.cs
  21. 0 0
      Server/Server.Base/Log/ILog.cs
  22. 0 0
      Server/Server.Base/Log/Log.cs
  23. 0 0
      Server/Server.Base/Log/NLogAdapter.cs
  24. 0 0
      Server/Server.Base/Log/StackInfoDecorater.cs
  25. 0 0
      Server/Server.Base/MultiMap.cs
  26. 0 0
      Server/Server.Base/Network/AChannel.cs
  27. 0 0
      Server/Server.Base/Network/AService.cs
  28. 0 0
      Server/Server.Base/Network/TNet/PacketParser.cs
  29. 0 0
      Server/Server.Base/Network/TNet/TBuffer.cs
  30. 0 0
      Server/Server.Base/Network/TNet/TChannel.cs
  31. 0 0
      Server/Server.Base/Network/TNet/TPoller.cs
  32. 0 0
      Server/Server.Base/Network/TNet/TService.cs
  33. 0 0
      Server/Server.Base/Network/TNet/TSocket.cs
  34. 0 0
      Server/Server.Base/Network/UNet/Library.cs
  35. 0 0
      Server/Server.Base/Network/UNet/NativeMethods.cs
  36. 0 0
      Server/Server.Base/Network/UNet/NativeStructs.cs
  37. 0 0
      Server/Server.Base/Network/UNet/UAddress.cs
  38. 0 0
      Server/Server.Base/Network/UNet/UChannel.cs
  39. 0 0
      Server/Server.Base/Network/UNet/UPacket.cs
  40. 0 0
      Server/Server.Base/Network/UNet/UPoller.cs
  41. 0 0
      Server/Server.Base/Network/UNet/UService.cs
  42. 0 0
      Server/Server.Base/Network/UNet/USocket.cs
  43. 0 0
      Server/Server.Base/Network/UNet/USocketManager.cs
  44. 0 0
      Server/Server.Base/Object/Component.cs
  45. 0 0
      Server/Server.Base/Object/Entity.cs
  46. 0 0
      Server/Server.Base/Object/IAwake.cs
  47. 0 0
      Server/Server.Base/Object/ILoader.cs
  48. 0 0
      Server/Server.Base/Object/IStart.cs
  49. 0 0
      Server/Server.Base/Object/IUpdate.cs
  50. 0 0
      Server/Server.Base/Object/Object.cs
  51. 0 0
      Server/Server.Base/Object/ObjectEventAttribute.cs
  52. 0 0
      Server/Server.Base/Object/ObjectManager.cs
  53. 0 0
      Server/Server.Base/Properties/AssemblyInfo.cs
  54. 0 0
      Server/Server.Base/QueueDictionary.cs
  55. 0 0
      Server/Server.Base/Server.Base.csproj
  56. 0 0
      Server/Server.Base/TryLocker.cs
  57. 0 0
      Server/Server.Controller/Properties/AssemblyInfo.cs
  58. 0 0
      Server/Server.Controller/Server.Controller.csproj
  59. 0 0
      Server/Server.Model/AEventAttribute.cs
  60. 0 0
      Server/Server.Model/AMEvent.cs
  61. 0 0
      Server/Server.Model/Component/EventComponent.cs
  62. 0 0
      Server/Server.Model/Component/MessageComponent.cs
  63. 0 0
      Server/Server.Model/Component/MessageHandlerComponent.cs
  64. 0 0
      Server/Server.Model/Component/NetworkComponent.cs
  65. 0 0
      Server/Server.Model/Component/Scene.cs
  66. 0 0
      Server/Server.Model/Component/TimeComponent.cs
  67. 0 0
      Server/Server.Model/Component/TimerComponent.cs
  68. 0 0
      Server/Server.Model/EntityType.cs
  69. 0 0
      Server/Server.Model/Env.cs
  70. 0 0
      Server/Server.Model/EnvKey.cs
  71. 0 0
      Server/Server.Model/EventAttribute.cs
  72. 0 0
      Server/Server.Model/EventIdType.cs
  73. 0 0
      Server/Server.Model/GameException.cs
  74. 0 0
      Server/Server.Model/IEvent.cs
  75. 0 0
      Server/Server.Model/Message/ErrorCode.cs
  76. 0 0
      Server/Server.Model/Message/IErrorMessage.cs
  77. 0 0
      Server/Server.Model/Message/IMRegister.cs
  78. 0 0
      Server/Server.Model/Message/Message.cs
  79. 0 0
      Server/Server.Model/Message/MessageAttribute.cs
  80. 0 0
      Server/Server.Model/Message/Opcode.cs
  81. 0 0
      Server/Server.Model/Message/OpcodeHelper.cs
  82. 0 0
      Server/Server.Model/Properties/AssemblyInfo.cs
  83. 0 0
      Server/Server.Model/Scene/Server.cs
  84. 1 1
      Server/Server.Model/Server.Model.csproj
  85. 48 38
      Server/Server.sln
  86. 0 0
      Server/ThirdParty/ENet/CMakeLists.txt
  87. 0 0
      Server/ThirdParty/ENet/ENet.vcxproj
  88. 0 0
      Server/ThirdParty/ENet/ENet.vcxproj.filters
  89. 0 0
      Server/ThirdParty/ENet/callbacks.c
  90. 0 0
      Server/ThirdParty/ENet/compress.c
  91. 0 0
      Server/ThirdParty/ENet/enet/callbacks.h
  92. 0 0
      Server/ThirdParty/ENet/enet/enet.h
  93. 0 0
      Server/ThirdParty/ENet/enet/list.h
  94. 0 0
      Server/ThirdParty/ENet/enet/protocol.h
  95. 0 0
      Server/ThirdParty/ENet/enet/time.h
  96. 0 0
      Server/ThirdParty/ENet/enet/types.h
  97. 0 0
      Server/ThirdParty/ENet/enet/unix.h
  98. 0 0
      Server/ThirdParty/ENet/enet/utility.h
  99. 0 0
      Server/ThirdParty/ENet/enet/win32.h
  100. 0 0
      Server/ThirdParty/ENet/host.c

BIN
Server/Lib/ENet.dll
View File


+ 7 - 7
Server/Server.App/Server.App.csproj
View File 

@@ -50,20 +50,20 @@
 
     <None Include="App.config" />
 
   </ItemGroup>
 
   <ItemGroup>
 
-    <ProjectReference Include="..\Base\Server.Base.csproj">
 
+    <None Include="NLog.config">
 
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 
+    </None>
 
+  </ItemGroup>
 
+  <ItemGroup>
 
+    <ProjectReference Include="..\Server.Base\Server.Base.csproj">
 
       <Project>{afbad3d5-c827-4ba6-9940-7060b6c39306}</Project>
 
       <Name>Server.Base</Name>
 
     </ProjectReference>
 
-    <ProjectReference Include="..\Model\Server.Model.csproj">
 
+    <ProjectReference Include="..\Server.Model\Server.Model.csproj">
 
       <Project>{e997a298-c1e1-4dc7-85a3-4b0e2a6e196d}</Project>
 
       <Name>Server.Model</Name>
 
     </ProjectReference>
 
   </ItemGroup>
 
-  <ItemGroup>
 
-    <None Include="NLog.config">
 
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 
-    </None>
 
-  </ItemGroup>
 
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

+ 0 - 0
Server/Base/Config/ACategory.cs → Server/Server.Base/Config/ACategory.cs
View File


+ 0 - 0
Server/Base/Config/AConfig.cs → Server/Server.Base/Config/AConfig.cs
View File


+ 0 - 0
Server/Base/Config/ConfigAttribute.cs → Server/Server.Base/Config/ConfigAttribute.cs
View File


+ 0 - 0
Server/Base/Config/ICategory.cs → Server/Server.Base/Config/ICategory.cs
View File


+ 0 - 0
Server/Base/DoubleMap.cs → Server/Server.Base/DoubleMap.cs
View File


+ 0 - 0
Server/Base/Helper/ArrayHelper.cs → Server/Server.Base/Helper/ArrayHelper.cs
View File


+ 0 - 0
Server/Base/Helper/ByteHelper.cs → Server/Server.Base/Helper/ByteHelper.cs
View File


+ 0 - 0
Server/Base/Helper/EnumHelper.cs → Server/Server.Base/Helper/EnumHelper.cs
View File


+ 0 - 0
Server/Base/Helper/FileHelper.cs → Server/Server.Base/Helper/FileHelper.cs
View File


+ 0 - 0
Server/Base/Helper/IdGenerater.cs → Server/Server.Base/Helper/IdGenerater.cs
View File


+ 0 - 0
Server/Base/Helper/MD5Helper.cs → Server/Server.Base/Helper/MD5Helper.cs
View File


+ 0 - 0
Server/Base/Helper/MongoHelper.cs → Server/Server.Base/Helper/MongoHelper.cs
View File


+ 0 - 0
Server/Base/Helper/ProtobufHelper.cs → Server/Server.Base/Helper/ProtobufHelper.cs
View File


+ 0 - 0
Server/Base/Helper/RandomHelper.cs → Server/Server.Base/Helper/RandomHelper.cs
View File


+ 0 - 0
Server/Base/Helper/StringHelper.cs → Server/Server.Base/Helper/StringHelper.cs
View File


+ 0 - 0
Server/Base/Helper/TimeHelper.cs → Server/Server.Base/Helper/TimeHelper.cs
View File


+ 0 - 0
Server/Base/Helper/ZipHelper.cs → Server/Server.Base/Helper/ZipHelper.cs
View File


+ 0 - 0
Server/Base/Log/ALogDecorater.cs → Server/Server.Base/Log/ALogDecorater.cs
View File


+ 0 - 0
Server/Base/Log/ILog.cs → Server/Server.Base/Log/ILog.cs
View File


+ 0 - 0
Server/Base/Log/Log.cs → Server/Server.Base/Log/Log.cs
View File


+ 0 - 0
Server/Base/Log/NLogAdapter.cs → Server/Server.Base/Log/NLogAdapter.cs
View File


+ 0 - 0
Server/Base/Log/StackInfoDecorater.cs → Server/Server.Base/Log/StackInfoDecorater.cs
View File


+ 0 - 0
Server/Base/MultiMap.cs → Server/Server.Base/MultiMap.cs
View File


+ 0 - 0
Server/Base/Network/AChannel.cs → Server/Server.Base/Network/AChannel.cs
View File


+ 0 - 0
Server/Base/Network/AService.cs → Server/Server.Base/Network/AService.cs
View File


+ 0 - 0
Server/Base/Network/TNet/PacketParser.cs → Server/Server.Base/Network/TNet/PacketParser.cs
View File


+ 0 - 0
Server/Base/Network/TNet/TBuffer.cs → Server/Server.Base/Network/TNet/TBuffer.cs
View File


+ 0 - 0
Server/Base/Network/TNet/TChannel.cs → Server/Server.Base/Network/TNet/TChannel.cs
View File


+ 0 - 0
Server/Base/Network/TNet/TPoller.cs → Server/Server.Base/Network/TNet/TPoller.cs
View File


+ 0 - 0
Server/Base/Network/TNet/TService.cs → Server/Server.Base/Network/TNet/TService.cs
View File


+ 0 - 0
Server/Base/Network/TNet/TSocket.cs → Server/Server.Base/Network/TNet/TSocket.cs
View File


+ 0 - 0
Server/Base/Network/UNet/Library.cs → Server/Server.Base/Network/UNet/Library.cs
View File


+ 0 - 0
Server/Base/Network/UNet/NativeMethods.cs → Server/Server.Base/Network/UNet/NativeMethods.cs
View File


+ 0 - 0
Server/Base/Network/UNet/NativeStructs.cs → Server/Server.Base/Network/UNet/NativeStructs.cs
View File


+ 0 - 0
Server/Base/Network/UNet/UAddress.cs → Server/Server.Base/Network/UNet/UAddress.cs
View File


+ 0 - 0
Server/Base/Network/UNet/UChannel.cs → Server/Server.Base/Network/UNet/UChannel.cs
View File


+ 0 - 0
Server/Base/Network/UNet/UPacket.cs → Server/Server.Base/Network/UNet/UPacket.cs
View File


+ 0 - 0
Server/Base/Network/UNet/UPoller.cs → Server/Server.Base/Network/UNet/UPoller.cs
View File


+ 0 - 0
Server/Base/Network/UNet/UService.cs → Server/Server.Base/Network/UNet/UService.cs
View File


+ 0 - 0
Server/Base/Network/UNet/USocket.cs → Server/Server.Base/Network/UNet/USocket.cs
View File


+ 0 - 0
Server/Base/Network/UNet/USocketManager.cs → Server/Server.Base/Network/UNet/USocketManager.cs
View File


+ 0 - 0
Server/Base/Object/Component.cs → Server/Server.Base/Object/Component.cs
View File


+ 0 - 0
Server/Base/Object/Entity.cs → Server/Server.Base/Object/Entity.cs
View File


+ 0 - 0
Server/Base/Object/IAwake.cs → Server/Server.Base/Object/IAwake.cs
View File


+ 0 - 0
Server/Base/Object/ILoader.cs → Server/Server.Base/Object/ILoader.cs
View File


+ 0 - 0
Server/Base/Object/IStart.cs → Server/Server.Base/Object/IStart.cs
View File


+ 0 - 0
Server/Base/Object/IUpdate.cs → Server/Server.Base/Object/IUpdate.cs
View File


+ 0 - 0
Server/Base/Object/Object.cs → Server/Server.Base/Object/Object.cs
View File


+ 0 - 0
Server/Base/Object/ObjectEventAttribute.cs → Server/Server.Base/Object/ObjectEventAttribute.cs
View File


+ 0 - 0
Server/Base/Object/ObjectManager.cs → Server/Server.Base/Object/ObjectManager.cs
View File


+ 0 - 0
Server/Base/Properties/AssemblyInfo.cs → Server/Server.Base/Properties/AssemblyInfo.cs
View File


+ 0 - 0
Server/Base/QueueDictionary.cs → Server/Server.Base/QueueDictionary.cs
View File


+ 0 - 0
Server/Base/Server.Base.csproj → Server/Server.Base/Server.Base.csproj
View File


+ 0 - 0
Server/Base/TryLocker.cs → Server/Server.Base/TryLocker.cs
View File


+ 0 - 0
Server/Controller/Properties/AssemblyInfo.cs → Server/Server.Controller/Properties/AssemblyInfo.cs
View File


+ 0 - 0
Server/Controller/Server.Controller.csproj → Server/Server.Controller/Server.Controller.csproj
View File


+ 0 - 0
Server/Model/AEventAttribute.cs → Server/Server.Model/AEventAttribute.cs
View File


+ 0 - 0
Server/Model/AMEvent.cs → Server/Server.Model/AMEvent.cs
View File


+ 0 - 0
Server/Model/Component/EventComponent.cs → Server/Server.Model/Component/EventComponent.cs
View File


+ 0 - 0
Server/Model/Component/MessageComponent.cs → Server/Server.Model/Component/MessageComponent.cs
View File


+ 0 - 0
Server/Model/Component/MessageHandlerComponent.cs → Server/Server.Model/Component/MessageHandlerComponent.cs
View File


+ 0 - 0
Server/Model/Component/NetworkComponent.cs → Server/Server.Model/Component/NetworkComponent.cs
View File


+ 0 - 0
Server/Model/Component/Scene.cs → Server/Server.Model/Component/Scene.cs
View File


+ 0 - 0
Server/Model/Component/TimeComponent.cs → Server/Server.Model/Component/TimeComponent.cs
View File


+ 0 - 0
Server/Model/Component/TimerComponent.cs → Server/Server.Model/Component/TimerComponent.cs
View File


+ 0 - 0
Server/Model/EntityType.cs → Server/Server.Model/EntityType.cs
View File


+ 0 - 0
Server/Model/Env.cs → Server/Server.Model/Env.cs
View File


+ 0 - 0
Server/Model/EnvKey.cs → Server/Server.Model/EnvKey.cs
View File


+ 0 - 0
Server/Model/EventAttribute.cs → Server/Server.Model/EventAttribute.cs
View File


+ 0 - 0
Server/Model/EventIdType.cs → Server/Server.Model/EventIdType.cs
View File


+ 0 - 0
Server/Model/GameException.cs → Server/Server.Model/GameException.cs
View File


+ 0 - 0
Server/Model/IEvent.cs → Server/Server.Model/IEvent.cs
View File


+ 0 - 0
Server/Model/Message/ErrorCode.cs → Server/Server.Model/Message/ErrorCode.cs
View File


+ 0 - 0
Server/Model/Message/IErrorMessage.cs → Server/Server.Model/Message/IErrorMessage.cs
View File


+ 0 - 0
Server/Model/Message/IMRegister.cs → Server/Server.Model/Message/IMRegister.cs
View File


+ 0 - 0
Server/Model/Message/Message.cs → Server/Server.Model/Message/Message.cs
View File


+ 0 - 0
Server/Model/Message/MessageAttribute.cs → Server/Server.Model/Message/MessageAttribute.cs
View File


+ 0 - 0
Server/Model/Message/Opcode.cs → Server/Server.Model/Message/Opcode.cs
View File


+ 0 - 0
Server/Model/Message/OpcodeHelper.cs → Server/Server.Model/Message/OpcodeHelper.cs
View File


+ 0 - 0
Server/Model/Properties/AssemblyInfo.cs → Server/Server.Model/Properties/AssemblyInfo.cs
View File


+ 0 - 0
Server/Model/Scene/Server.cs → Server/Server.Model/Scene/Server.cs
View File


+ 1 - 1
Server/Model/Server.Model.csproj → Server/Server.Model/Server.Model.csproj
View File 

@@ -73,7 +73,7 @@
 
     <Compile Include="Scene\Server.cs" />
 
   </ItemGroup>
 
   <ItemGroup>
 
-    <ProjectReference Include="..\Base\Server.Base.csproj">
 
+    <ProjectReference Include="..\Server.Base\Server.Base.csproj">
 
       <Project>{afbad3d5-c827-4ba6-9940-7060b6c39306}</Project>
 
       <Name>Server.Base</Name>
 
     </ProjectReference>

+ 48 - 38
Server/Server.sln
View File 

@@ -3,17 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 
 # Visual Studio 14
 
 VisualStudioVersion = 14.0.25420.1
 
 MinimumVisualStudioVersion = 10.0.40219.1
 
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Base", "Base\Server.Base.csproj", "{AFBAD3D5-C827-4BA6-9940-7060B6C39306}"
 
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.App", "Server.App\Server.App.csproj", "{3F8DC04C-9E05-403F-B6A5-36293EB99937}"
 
 EndProject
 
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Model", "Model\Server.Model.csproj", "{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}"
 
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{D736BBFE-822E-4F67-8376-44CDDBAA09F4}"
 
 EndProject
 
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Controller", "Controller\Server.Controller.csproj", "{ED2A5401-3829-4A8B-915D-A2A18FB233F8}"
 
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Base", "Server.Base\Server.Base.csproj", "{AFBAD3D5-C827-4BA6-9940-7060B6C39306}"
 
 EndProject
 
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuget", "Nuget\Nuget.csproj", "{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}"
 
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Controller", "Server.Controller\Server.Controller.csproj", "{ED2A5401-3829-4A8B-915D-A2A18FB233F8}"
 
 EndProject
 
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.App", "Server.App\Server.App.csproj", "{3F8DC04C-9E05-403F-B6A5-36293EB99937}"
 
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Model", "Server.Model\Server.Model.csproj", "{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}"
 
+EndProject
 
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ENet", "ThirdParty\ENet\ENet.vcxproj", "{C9992B7C-313E-4C9F-A954-640D01EDFB58}"
 
 EndProject
 
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Server.ENet", "ENet\ENet.vcxproj", "{C9992B7C-313E-4C9F-A954-640D01EDFB58}"
 
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuget", "ThirdParty\Nuget\Nuget.csproj", "{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}"
 
 EndProject
 
 Global
 
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 
@@ -25,6 +27,18 @@ Global
 
 		Release|x86 = Release|x86
 
 	EndGlobalSection
 
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|Any CPU.Build.0 = Debug|Any CPU
 
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x64.ActiveCfg = Debug|Any CPU
 
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x64.Build.0 = Debug|Any CPU
 
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x86.ActiveCfg = Debug|Any CPU
 
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x86.Build.0 = Debug|Any CPU
 
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|Any CPU.ActiveCfg = Release|Any CPU
 
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|Any CPU.Build.0 = Release|Any CPU
 
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x64.ActiveCfg = Release|Any CPU
 
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x64.Build.0 = Release|Any CPU
 
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x86.ActiveCfg = Release|Any CPU
 
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x86.Build.0 = Release|Any CPU
 
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Debug|Any CPU.Build.0 = Debug|Any CPU
 
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Debug|x64.ActiveCfg = Debug|Any CPU
 
@@ -37,18 +51,6 @@ Global
 
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Release|x64.Build.0 = Release|Any CPU
 
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Release|x86.ActiveCfg = Release|Any CPU
 
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Release|x86.Build.0 = Release|Any CPU
 
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x64.ActiveCfg = Debug|Any CPU
 
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x64.Build.0 = Debug|Any CPU
 
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x86.ActiveCfg = Debug|Any CPU
 
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x86.Build.0 = Debug|Any CPU
 
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|Any CPU.Build.0 = Release|Any CPU
 
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x64.ActiveCfg = Release|Any CPU
 
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x64.Build.0 = Release|Any CPU
 
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x86.ActiveCfg = Release|Any CPU
 
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x86.Build.0 = Release|Any CPU
 
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Debug|x64.ActiveCfg = Debug|Any CPU
 
@@ -61,26 +63,18 @@ Global
 
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Release|x64.Build.0 = Release|Any CPU
 
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Release|x86.ActiveCfg = Release|Any CPU
 
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Release|x86.Build.0 = Release|Any CPU
 
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|Any CPU.Build.0 = Debug|Any CPU
 
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x64.ActiveCfg = Debug|Any CPU
 
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x86.ActiveCfg = Debug|Any CPU
 
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|Any CPU.ActiveCfg = Release|Any CPU
 
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|Any CPU.Build.0 = Release|Any CPU
 
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x64.ActiveCfg = Release|Any CPU
 
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x86.ActiveCfg = Release|Any CPU
 
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|Any CPU.Build.0 = Debug|Any CPU
 
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x64.ActiveCfg = Debug|Any CPU
 
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x64.Build.0 = Debug|Any CPU
 
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x86.ActiveCfg = Debug|Any CPU
 
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x86.Build.0 = Debug|Any CPU
 
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|Any CPU.ActiveCfg = Release|Any CPU
 
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|Any CPU.Build.0 = Release|Any CPU
 
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x64.ActiveCfg = Release|Any CPU
 
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x64.Build.0 = Release|Any CPU
 
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x86.ActiveCfg = Release|Any CPU
 
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x86.Build.0 = Release|Any CPU
 
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x64.ActiveCfg = Debug|Any CPU
 
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x64.Build.0 = Debug|Any CPU
 
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x86.ActiveCfg = Debug|Any CPU
 
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x86.Build.0 = Debug|Any CPU
 
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|Any CPU.Build.0 = Release|Any CPU
 
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x64.ActiveCfg = Release|Any CPU
 
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x64.Build.0 = Release|Any CPU
 
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x86.ActiveCfg = Release|Any CPU
 
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x86.Build.0 = Release|Any CPU
 
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Any CPU.ActiveCfg = Debug|Win32
 
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|x64.ActiveCfg = Debug|x64
 
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|x64.Build.0 = Debug|x64
 
@@ -91,8 +85,24 @@ Global
 
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x64.Build.0 = Release|x64
 
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x86.ActiveCfg = Release|Win32
 
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x86.Build.0 = Release|Win32
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|Any CPU.Build.0 = Debug|Any CPU
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x64.ActiveCfg = Debug|Any CPU
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x64.Build.0 = Debug|Any CPU
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x86.ActiveCfg = Debug|Any CPU
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x86.Build.0 = Debug|Any CPU
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|Any CPU.ActiveCfg = Release|Any CPU
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|Any CPU.Build.0 = Release|Any CPU
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x64.ActiveCfg = Release|Any CPU
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x64.Build.0 = Release|Any CPU
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x86.ActiveCfg = Release|Any CPU
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x86.Build.0 = Release|Any CPU
 
 	EndGlobalSection
 
 	GlobalSection(SolutionProperties) = preSolution
 
 		HideSolutionNode = FALSE
 
 	EndGlobalSection
 
+	GlobalSection(NestedProjects) = preSolution
 
+		{C9992B7C-313E-4C9F-A954-640D01EDFB58} = {D736BBFE-822E-4F67-8376-44CDDBAA09F4}
 
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135} = {D736BBFE-822E-4F67-8376-44CDDBAA09F4}
 
+	EndGlobalSection
 
 EndGlobal

+ 0 - 0
Server/ENet/CMakeLists.txt → Server/ThirdParty/ENet/CMakeLists.txt
View File


+ 0 - 0
Server/ENet/ENet.vcxproj → Server/ThirdParty/ENet/ENet.vcxproj
View File


+ 0 - 0
Server/ENet/ENet.vcxproj.filters → Server/ThirdParty/ENet/ENet.vcxproj.filters
View File


+ 0 - 0
Server/ENet/callbacks.c → Server/ThirdParty/ENet/callbacks.c
View File


+ 0 - 0
Server/ENet/compress.c → Server/ThirdParty/ENet/compress.c
View File


+ 0 - 0
Server/ENet/enet/callbacks.h → Server/ThirdParty/ENet/enet/callbacks.h
View File


+ 0 - 0
Server/ENet/enet/enet.h → Server/ThirdParty/ENet/enet/enet.h
View File


+ 0 - 0
Server/ENet/enet/list.h → Server/ThirdParty/ENet/enet/list.h
View File


+ 0 - 0
Server/ENet/enet/protocol.h → Server/ThirdParty/ENet/enet/protocol.h
View File


+ 0 - 0
Server/ENet/enet/time.h → Server/ThirdParty/ENet/enet/time.h
View File


+ 0 - 0
Server/ENet/enet/types.h → Server/ThirdParty/ENet/enet/types.h
View File


+ 0 - 0
Server/ENet/enet/unix.h → Server/ThirdParty/ENet/enet/unix.h
View File


+ 0 - 0
Server/ENet/enet/utility.h → Server/ThirdParty/ENet/enet/utility.h
View File


+ 0 - 0
Server/ENet/enet/win32.h → Server/ThirdParty/ENet/enet/win32.h
View File


+ 0 - 0
Server/ENet/host.c → Server/ThirdParty/ENet/host.c
View File


Some files were not shown because too many files changed in this diff