diff --git a/RAGECOOP.sln b/RAGECOOP.sln index e5ead53..10be393 100644 --- a/RAGECOOP.sln +++ b/RAGECOOP.sln @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31919.166 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageCoop.Server", "Server\RageCoop.Server.csproj", "{84AB99D9-5E00-4CA2-B1DD-56B8419AAD24}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageCoop.Server", "RageCoop.Server\RageCoop.Server.csproj", "{84AB99D9-5E00-4CA2-B1DD-56B8419AAD24}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RageCoop.Client", "Client\RageCoop.Client.csproj", "{EF56D109-1F22-43E0-9DFF-CFCFB94E0681}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageCoop.Core", "RageCoop.Core\RageCoop.Core.csproj", "{CC2E8102-E568-4524-AA1F-F8E0F1CFE58A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RageCoop.Core", "Core\RageCoop.Core.csproj", "{CC2E8102-E568-4524-AA1F-F8E0F1CFE58A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RageCoop.Client", "RageCoop.Client\RageCoop.Client.csproj", "{EF56D109-1F22-43E0-9DFF-CFCFB94E0681}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,14 +25,6 @@ Global {84AB99D9-5E00-4CA2-B1DD-56B8419AAD24}.Release|Any CPU.Build.0 = Release|Any CPU {84AB99D9-5E00-4CA2-B1DD-56B8419AAD24}.Release|x64.ActiveCfg = Release|Any CPU {84AB99D9-5E00-4CA2-B1DD-56B8419AAD24}.Release|x64.Build.0 = Release|Any CPU - {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Debug|x64.ActiveCfg = Debug|Any CPU - {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Debug|x64.Build.0 = Debug|Any CPU - {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Release|Any CPU.Build.0 = Release|Any CPU - {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Release|x64.ActiveCfg = Release|Any CPU - {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Release|x64.Build.0 = Release|Any CPU {CC2E8102-E568-4524-AA1F-F8E0F1CFE58A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CC2E8102-E568-4524-AA1F-F8E0F1CFE58A}.Debug|Any CPU.Build.0 = Debug|Any CPU {CC2E8102-E568-4524-AA1F-F8E0F1CFE58A}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -41,6 +33,14 @@ Global {CC2E8102-E568-4524-AA1F-F8E0F1CFE58A}.Release|Any CPU.Build.0 = Release|Any CPU {CC2E8102-E568-4524-AA1F-F8E0F1CFE58A}.Release|x64.ActiveCfg = Release|Any CPU {CC2E8102-E568-4524-AA1F-F8E0F1CFE58A}.Release|x64.Build.0 = Release|Any CPU + {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Debug|x64.ActiveCfg = Debug|Any CPU + {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Debug|x64.Build.0 = Debug|Any CPU + {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Release|Any CPU.Build.0 = Release|Any CPU + {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Release|x64.ActiveCfg = Release|Any CPU + {EF56D109-1F22-43E0-9DFF-CFCFB94E0681}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Client/Debug.cs b/RageCoop.Client/Debug.cs similarity index 100% rename from Client/Debug.cs rename to RageCoop.Client/Debug.cs diff --git a/Client/DevTools/DevTool.cs b/RageCoop.Client/DevTools/DevTool.cs similarity index 100% rename from Client/DevTools/DevTool.cs rename to RageCoop.Client/DevTools/DevTool.cs diff --git a/Client/Main.cs b/RageCoop.Client/Main.cs similarity index 100% rename from Client/Main.cs rename to RageCoop.Client/Main.cs diff --git a/Client/Menus/CoopMenu.cs b/RageCoop.Client/Menus/CoopMenu.cs similarity index 100% rename from Client/Menus/CoopMenu.cs rename to RageCoop.Client/Menus/CoopMenu.cs diff --git a/Client/Menus/Sub/DebugMenu.cs b/RageCoop.Client/Menus/Sub/DebugMenu.cs similarity index 100% rename from Client/Menus/Sub/DebugMenu.cs rename to RageCoop.Client/Menus/Sub/DebugMenu.cs diff --git a/Client/Menus/Sub/DevToolMenu.cs b/RageCoop.Client/Menus/Sub/DevToolMenu.cs similarity index 100% rename from Client/Menus/Sub/DevToolMenu.cs rename to RageCoop.Client/Menus/Sub/DevToolMenu.cs diff --git a/Client/Menus/Sub/ServersMenu.cs b/RageCoop.Client/Menus/Sub/ServersMenu.cs similarity index 100% rename from Client/Menus/Sub/ServersMenu.cs rename to RageCoop.Client/Menus/Sub/ServersMenu.cs diff --git a/Client/Menus/Sub/SettingsMenu.cs b/RageCoop.Client/Menus/Sub/SettingsMenu.cs similarity index 100% rename from Client/Menus/Sub/SettingsMenu.cs rename to RageCoop.Client/Menus/Sub/SettingsMenu.cs diff --git a/Client/Networking/Chat.cs b/RageCoop.Client/Networking/Chat.cs similarity index 100% rename from Client/Networking/Chat.cs rename to RageCoop.Client/Networking/Chat.cs diff --git a/Client/Networking/DownloadManager.cs b/RageCoop.Client/Networking/DownloadManager.cs similarity index 100% rename from Client/Networking/DownloadManager.cs rename to RageCoop.Client/Networking/DownloadManager.cs diff --git a/Client/Networking/MapLoader.cs b/RageCoop.Client/Networking/MapLoader.cs similarity index 100% rename from Client/Networking/MapLoader.cs rename to RageCoop.Client/Networking/MapLoader.cs diff --git a/Client/Networking/Networking.cs b/RageCoop.Client/Networking/Networking.cs similarity index 100% rename from Client/Networking/Networking.cs rename to RageCoop.Client/Networking/Networking.cs diff --git a/Client/Networking/Receive.cs b/RageCoop.Client/Networking/Receive.cs similarity index 100% rename from Client/Networking/Receive.cs rename to RageCoop.Client/Networking/Receive.cs diff --git a/Client/Networking/Send.cs b/RageCoop.Client/Networking/Send.cs similarity index 100% rename from Client/Networking/Send.cs rename to RageCoop.Client/Networking/Send.cs diff --git a/Client/PlayerList.cs b/RageCoop.Client/PlayerList.cs similarity index 100% rename from Client/PlayerList.cs rename to RageCoop.Client/PlayerList.cs diff --git a/Client/Properties/AssemblyInfo.cs b/RageCoop.Client/Properties/AssemblyInfo.cs similarity index 100% rename from Client/Properties/AssemblyInfo.cs rename to RageCoop.Client/Properties/AssemblyInfo.cs diff --git a/Client/RageCoop.Client.csproj b/RageCoop.Client/RageCoop.Client.csproj similarity index 98% rename from Client/RageCoop.Client.csproj rename to RageCoop.Client/RageCoop.Client.csproj index c4b5fee..95be6bc 100644 --- a/Client/RageCoop.Client.csproj +++ b/RageCoop.Client/RageCoop.Client.csproj @@ -119,7 +119,7 @@ - + {cc2e8102-e568-4524-aa1f-f8e0f1cfe58a} RageCoop.Core diff --git a/Client/Scripting/API.cs b/RageCoop.Client/Scripting/API.cs similarity index 100% rename from Client/Scripting/API.cs rename to RageCoop.Client/Scripting/API.cs diff --git a/Client/Scripting/ClientScript.cs b/RageCoop.Client/Scripting/ClientScript.cs similarity index 100% rename from Client/Scripting/ClientScript.cs rename to RageCoop.Client/Scripting/ClientScript.cs diff --git a/Client/Scripting/Engine.cs b/RageCoop.Client/Scripting/Engine.cs similarity index 100% rename from Client/Scripting/Engine.cs rename to RageCoop.Client/Scripting/Engine.cs diff --git a/Client/Settings.cs b/RageCoop.Client/Settings.cs similarity index 100% rename from Client/Settings.cs rename to RageCoop.Client/Settings.cs diff --git a/Client/Sync/Entities/SyncedEntity.cs b/RageCoop.Client/Sync/Entities/SyncedEntity.cs similarity index 100% rename from Client/Sync/Entities/SyncedEntity.cs rename to RageCoop.Client/Sync/Entities/SyncedEntity.cs diff --git a/Client/Sync/Entities/SyncedPed.cs b/RageCoop.Client/Sync/Entities/SyncedPed.cs similarity index 100% rename from Client/Sync/Entities/SyncedPed.cs rename to RageCoop.Client/Sync/Entities/SyncedPed.cs diff --git a/Client/Sync/Entities/SyncedProjectile.cs b/RageCoop.Client/Sync/Entities/SyncedProjectile.cs similarity index 100% rename from Client/Sync/Entities/SyncedProjectile.cs rename to RageCoop.Client/Sync/Entities/SyncedProjectile.cs diff --git a/Client/Sync/Entities/SyncedVehicle.cs b/RageCoop.Client/Sync/Entities/SyncedVehicle.cs similarity index 100% rename from Client/Sync/Entities/SyncedVehicle.cs rename to RageCoop.Client/Sync/Entities/SyncedVehicle.cs diff --git a/Client/Sync/EntityPool.cs b/RageCoop.Client/Sync/EntityPool.cs similarity index 100% rename from Client/Sync/EntityPool.cs rename to RageCoop.Client/Sync/EntityPool.cs diff --git a/Client/Sync/SyncEvents.cs b/RageCoop.Client/Sync/SyncEvents.cs similarity index 100% rename from Client/Sync/SyncEvents.cs rename to RageCoop.Client/Sync/SyncEvents.cs diff --git a/Client/Sync/SyncParameters.cs b/RageCoop.Client/Sync/SyncParameters.cs similarity index 100% rename from Client/Sync/SyncParameters.cs rename to RageCoop.Client/Sync/SyncParameters.cs diff --git a/Client/Util/MathExtensions.cs b/RageCoop.Client/Util/MathExtensions.cs similarity index 100% rename from Client/Util/MathExtensions.cs rename to RageCoop.Client/Util/MathExtensions.cs diff --git a/Client/Util/PedConfigFlags.cs b/RageCoop.Client/Util/PedConfigFlags.cs similarity index 100% rename from Client/Util/PedConfigFlags.cs rename to RageCoop.Client/Util/PedConfigFlags.cs diff --git a/Client/Util/PedExtensions.cs b/RageCoop.Client/Util/PedExtensions.cs similarity index 100% rename from Client/Util/PedExtensions.cs rename to RageCoop.Client/Util/PedExtensions.cs diff --git a/Client/Util/TaskType.cs b/RageCoop.Client/Util/TaskType.cs similarity index 100% rename from Client/Util/TaskType.cs rename to RageCoop.Client/Util/TaskType.cs diff --git a/Client/Util/Util.cs b/RageCoop.Client/Util/Util.cs similarity index 100% rename from Client/Util/Util.cs rename to RageCoop.Client/Util/Util.cs diff --git a/Client/Util/VehicleExtensions.cs b/RageCoop.Client/Util/VehicleExtensions.cs similarity index 100% rename from Client/Util/VehicleExtensions.cs rename to RageCoop.Client/Util/VehicleExtensions.cs diff --git a/Client/Util/WeaponUtil.cs b/RageCoop.Client/Util/WeaponUtil.cs similarity index 100% rename from Client/Util/WeaponUtil.cs rename to RageCoop.Client/Util/WeaponUtil.cs diff --git a/Client/WorldThread.cs b/RageCoop.Client/WorldThread.cs similarity index 100% rename from Client/WorldThread.cs rename to RageCoop.Client/WorldThread.cs diff --git a/Client/app.config b/RageCoop.Client/app.config similarity index 100% rename from Client/app.config rename to RageCoop.Client/app.config diff --git a/Client/packages.config b/RageCoop.Client/packages.config similarity index 100% rename from Client/packages.config rename to RageCoop.Client/packages.config diff --git a/Core/BitReader.cs b/RageCoop.Core/BitReader.cs similarity index 100% rename from Core/BitReader.cs rename to RageCoop.Core/BitReader.cs diff --git a/Core/CoreUtils.cs b/RageCoop.Core/CoreUtils.cs similarity index 100% rename from Core/CoreUtils.cs rename to RageCoop.Core/CoreUtils.cs diff --git a/Core/Logging/Logger.cs b/RageCoop.Core/Logging/Logger.cs similarity index 100% rename from Core/Logging/Logger.cs rename to RageCoop.Core/Logging/Logger.cs diff --git a/Core/Packets/FilePackets.cs b/RageCoop.Core/Packets/FilePackets.cs similarity index 100% rename from Core/Packets/FilePackets.cs rename to RageCoop.Core/Packets/FilePackets.cs diff --git a/Core/Packets/Packets.cs b/RageCoop.Core/Packets/Packets.cs similarity index 100% rename from Core/Packets/Packets.cs rename to RageCoop.Core/Packets/Packets.cs diff --git a/Core/Packets/PedPackets.cs b/RageCoop.Core/Packets/PedPackets.cs similarity index 100% rename from Core/Packets/PedPackets.cs rename to RageCoop.Core/Packets/PedPackets.cs diff --git a/Core/Packets/PlayerPackets.cs b/RageCoop.Core/Packets/PlayerPackets.cs similarity index 100% rename from Core/Packets/PlayerPackets.cs rename to RageCoop.Core/Packets/PlayerPackets.cs diff --git a/Core/Packets/ProjectileSync.cs b/RageCoop.Core/Packets/ProjectileSync.cs similarity index 100% rename from Core/Packets/ProjectileSync.cs rename to RageCoop.Core/Packets/ProjectileSync.cs diff --git a/Core/Packets/SyncEvents/BulletShot.cs b/RageCoop.Core/Packets/SyncEvents/BulletShot.cs similarity index 100% rename from Core/Packets/SyncEvents/BulletShot.cs rename to RageCoop.Core/Packets/SyncEvents/BulletShot.cs diff --git a/Core/Packets/SyncEvents/EnteredVehicle.cs b/RageCoop.Core/Packets/SyncEvents/EnteredVehicle.cs similarity index 100% rename from Core/Packets/SyncEvents/EnteredVehicle.cs rename to RageCoop.Core/Packets/SyncEvents/EnteredVehicle.cs diff --git a/Core/Packets/SyncEvents/EnteringVehicle.cs b/RageCoop.Core/Packets/SyncEvents/EnteringVehicle.cs similarity index 100% rename from Core/Packets/SyncEvents/EnteringVehicle.cs rename to RageCoop.Core/Packets/SyncEvents/EnteringVehicle.cs diff --git a/Core/Packets/SyncEvents/LeaveVehicle.cs b/RageCoop.Core/Packets/SyncEvents/LeaveVehicle.cs similarity index 100% rename from Core/Packets/SyncEvents/LeaveVehicle.cs rename to RageCoop.Core/Packets/SyncEvents/LeaveVehicle.cs diff --git a/Core/Packets/SyncEvents/NozzleTransform.cs b/RageCoop.Core/Packets/SyncEvents/NozzleTransform.cs similarity index 100% rename from Core/Packets/SyncEvents/NozzleTransform.cs rename to RageCoop.Core/Packets/SyncEvents/NozzleTransform.cs diff --git a/Core/Packets/SyncEvents/OwnerChanged.cs b/RageCoop.Core/Packets/SyncEvents/OwnerChanged.cs similarity index 100% rename from Core/Packets/SyncEvents/OwnerChanged.cs rename to RageCoop.Core/Packets/SyncEvents/OwnerChanged.cs diff --git a/Core/Packets/SyncEvents/PedKilled.cs b/RageCoop.Core/Packets/SyncEvents/PedKilled.cs similarity index 100% rename from Core/Packets/SyncEvents/PedKilled.cs rename to RageCoop.Core/Packets/SyncEvents/PedKilled.cs diff --git a/Core/Packets/VehiclePackets.cs b/RageCoop.Core/Packets/VehiclePackets.cs similarity index 100% rename from Core/Packets/VehiclePackets.cs rename to RageCoop.Core/Packets/VehiclePackets.cs diff --git a/Core/PlayerData.cs b/RageCoop.Core/PlayerData.cs similarity index 100% rename from Core/PlayerData.cs rename to RageCoop.Core/PlayerData.cs diff --git a/Core/RageCoop.Core.csproj b/RageCoop.Core/RageCoop.Core.csproj similarity index 100% rename from Core/RageCoop.Core.csproj rename to RageCoop.Core/RageCoop.Core.csproj diff --git a/Core/Scripting/ScriptingEngine.cs b/RageCoop.Core/Scripting/ScriptingEngine.cs similarity index 100% rename from Core/Scripting/ScriptingEngine.cs rename to RageCoop.Core/Scripting/ScriptingEngine.cs diff --git a/Server/Blocklist.cs b/RageCoop.Server/Blocklist.cs similarity index 100% rename from Server/Blocklist.cs rename to RageCoop.Server/Blocklist.cs diff --git a/Server/Client.cs b/RageCoop.Server/Client.cs similarity index 100% rename from Server/Client.cs rename to RageCoop.Server/Client.cs diff --git a/Server/DownloadManager.cs b/RageCoop.Server/DownloadManager.cs similarity index 100% rename from Server/DownloadManager.cs rename to RageCoop.Server/DownloadManager.cs diff --git a/Server/FileTransfer.cs b/RageCoop.Server/FileTransfer.cs similarity index 100% rename from Server/FileTransfer.cs rename to RageCoop.Server/FileTransfer.cs diff --git a/Server/Program.cs b/RageCoop.Server/Program.cs similarity index 100% rename from Server/Program.cs rename to RageCoop.Server/Program.cs diff --git a/Server/Properties/PublishProfiles/FolderProfile.pubxml b/RageCoop.Server/Properties/PublishProfiles/FolderProfile.pubxml similarity index 100% rename from Server/Properties/PublishProfiles/FolderProfile.pubxml rename to RageCoop.Server/Properties/PublishProfiles/FolderProfile.pubxml diff --git a/Server/Properties/PublishProfiles/FolderProfile.pubxml.user b/RageCoop.Server/Properties/PublishProfiles/FolderProfile.pubxml.user similarity index 100% rename from Server/Properties/PublishProfiles/FolderProfile.pubxml.user rename to RageCoop.Server/Properties/PublishProfiles/FolderProfile.pubxml.user diff --git a/Server/RageCoop.Server.csproj b/RageCoop.Server/RageCoop.Server.csproj similarity index 94% rename from Server/RageCoop.Server.csproj rename to RageCoop.Server/RageCoop.Server.csproj index b57ebe8..6f93d6b 100644 --- a/Server/RageCoop.Server.csproj +++ b/RageCoop.Server/RageCoop.Server.csproj @@ -26,7 +26,7 @@ - + diff --git a/Server/RageCoop.Server.csproj.user b/RageCoop.Server/RageCoop.Server.csproj.user similarity index 100% rename from Server/RageCoop.Server.csproj.user rename to RageCoop.Server/RageCoop.Server.csproj.user diff --git a/Server/Resources.cs b/RageCoop.Server/Resources.cs similarity index 100% rename from Server/Resources.cs rename to RageCoop.Server/Resources.cs diff --git a/Server/Scripting/API.cs b/RageCoop.Server/Scripting/API.cs similarity index 100% rename from Server/Scripting/API.cs rename to RageCoop.Server/Scripting/API.cs diff --git a/Server/Scripting/Engine.cs b/RageCoop.Server/Scripting/Engine.cs similarity index 100% rename from Server/Scripting/Engine.cs rename to RageCoop.Server/Scripting/Engine.cs diff --git a/Server/Scripting/EventArgs/EventArgs.cs b/RageCoop.Server/Scripting/EventArgs/EventArgs.cs similarity index 100% rename from Server/Scripting/EventArgs/EventArgs.cs rename to RageCoop.Server/Scripting/EventArgs/EventArgs.cs diff --git a/Server/Scripting/ServerScript.cs b/RageCoop.Server/Scripting/ServerScript.cs similarity index 100% rename from Server/Scripting/ServerScript.cs rename to RageCoop.Server/Scripting/ServerScript.cs diff --git a/Server/Server.cs b/RageCoop.Server/Server.cs similarity index 100% rename from Server/Server.cs rename to RageCoop.Server/Server.cs diff --git a/Server/Settings.cs b/RageCoop.Server/Settings.cs similarity index 100% rename from Server/Settings.cs rename to RageCoop.Server/Settings.cs diff --git a/Server/Util.cs b/RageCoop.Server/Util.cs similarity index 100% rename from Server/Util.cs rename to RageCoop.Server/Util.cs