Updates against master
This commit is contained in:
Kamron Batman
commit
5df5b61221
17 changed files with 41 additions and 64 deletions
|
|
@ -1,11 +1,7 @@
|
|||
System.dll
|
||||
System.Core.dll
|
||||
System.Data.dll
|
||||
System.Data.DataSetExtensions.dll
|
||||
System.Drawing.dll
|
||||
System.Web.dll
|
||||
System.Windows.Forms.dll
|
||||
System.Xml.dll
|
||||
System.Xml.Linq.dll
|
||||
|
||||
Microsoft.CSharp.dll
|
||||
System.Xml.dll
|
||||
|
|
@ -7,6 +7,12 @@ runuo
|
|||
|
||||
RunUO Git Repository
|
||||
|
||||
***
|
||||
RunUO is no longer officially supported by a core team.
|
||||
|
||||
If you wish to find support in a wider UO development commuity, visit [ServUO - Ultima Online Emulation](http://www.servuo.com)
|
||||
***
|
||||
|
||||
Typical Windows Build
|
||||
|
||||
PS C:\runuo> C:\Windows\Microsoft.NET\Framework64\v4.0.30319\csc /optimize /unsafe /t:exe /out:RunUO.exe /win32icon:Server\runuo.ico /d:NEWTIMERS /d:NEWPARENT /recurse:Server\\*.cs
|
||||
|
|
@ -25,4 +31,3 @@ Latest Razor builds can be found at https://github.com/msturgill/razor/releases/
|
|||
|
||||
Latest UOSteam builds (previously AssistUO) can be found at http://uosteam.com
|
||||
|
||||
IRC: chat.freenode.net #runuo
|
||||
|
|
|
|||
39
RunUO.sln
39
RunUO.sln
|
|
@ -1,6 +1,8 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2012
|
||||
# Visual Studio 2013
|
||||
VisualStudioVersion = 12.0.40629.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scripts", "Scripts\Scripts.csproj", "{DAE872E6-6899-427C-A75D-AD52526EBCDA}"
|
||||
|
|
@ -220,38 +222,17 @@ EndProject
|
|||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|Mixed Platforms = Debug|Mixed Platforms
|
||||
Debug|x64 = Debug|x64
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|Mixed Platforms = Release|Mixed Platforms
|
||||
Release|x64 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Debug|Any CPU.Build.0 = Debug|x64
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Debug|x64.Build.0 = Debug|x64
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{0B33CEEB-88E1-49A6-8D7D-AF6A5A357087}.Release|x64.Build.0 = Release|Any CPU
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Debug|Any CPU.Build.0 = Debug|x64
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Debug|x64.Build.0 = Debug|x64
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Debug|x64.Deploy.0 = Debug|x64
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{DAE872E6-6899-427C-A75D-AD52526EBCDA}.Release|x64.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -259,11 +240,10 @@ Global
|
|||
GlobalSection(NestedProjects) = preSolution
|
||||
{0BC3F1F5-95F7-4048-8BA1-71F2430104D8} = {1B394627-C6BF-447D-8CBD-4A3B5262C5B4}
|
||||
{3CA15B59-8702-42FE-9980-54F8335CE149} = {1B394627-C6BF-447D-8CBD-4A3B5262C5B4}
|
||||
{4883A0CC-9D0C-4045-AC24-2A2FEAF09B88} = {1B394627-C6BF-447D-8CBD-4A3B5262C5B4}
|
||||
{F1E91339-C2F1-40B7-80D0-6289228168D0} = {1B394627-C6BF-447D-8CBD-4A3B5262C5B4}
|
||||
{70B04D45-39DD-422D-B95F-99ED9FC3DAC1} = {1B394627-C6BF-447D-8CBD-4A3B5262C5B4}
|
||||
{D990829A-479F-4377-B0C2-FD7C795C4D28} = {3CA15B59-8702-42FE-9980-54F8335CE149}
|
||||
{2C58085D-5E30-4FB4-A71C-FD0328C60558} = {3CA15B59-8702-42FE-9980-54F8335CE149}
|
||||
{4883A0CC-9D0C-4045-AC24-2A2FEAF09B88} = {1B394627-C6BF-447D-8CBD-4A3B5262C5B4}
|
||||
{F1E91339-C2F1-40B7-80D0-6289228168D0} = {1B394627-C6BF-447D-8CBD-4A3B5262C5B4}
|
||||
{D4052FE1-A0C6-486C-B972-348945894772} = {F1E91339-C2F1-40B7-80D0-6289228168D0}
|
||||
{C5F8ACCC-B741-4398-8F1B-9425F7F4659A} = {F1E91339-C2F1-40B7-80D0-6289228168D0}
|
||||
{1AE5E70F-6607-4C60-82BF-764F7BD89138} = {F1E91339-C2F1-40B7-80D0-6289228168D0}
|
||||
|
|
@ -272,5 +252,6 @@ Global
|
|||
{B018CA81-2D88-49DA-B362-2F6D84148B94} = {F1E91339-C2F1-40B7-80D0-6289228168D0}
|
||||
{A42F9968-E255-4960-9C4D-66180D828EB9} = {F1E91339-C2F1-40B7-80D0-6289228168D0}
|
||||
{452A8873-A7C2-4FD8-A940-8AFDEACB9702} = {F1E91339-C2F1-40B7-80D0-6289228168D0}
|
||||
{70B04D45-39DD-422D-B95F-99ED9FC3DAC1} = {1B394627-C6BF-447D-8CBD-4A3B5262C5B4}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>Output\</OutputPath>
|
||||
<DefineConstants>TRACE;DEBUG;NEWTIMERS, NEWPARENT</DefineConstants>
|
||||
<DefineConstants>TRACE;DEBUG;NEWTIMERS;NEWPARENT</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<UseVSHostingProcess>false</UseVSHostingProcess>
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>Output\</OutputPath>
|
||||
<DefineConstants>TRACE;NEWTIMERS, NEWPARENT</DefineConstants>
|
||||
<DefineConstants>TRACE;NEWTIMERS;NEWPARENT</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<UseVSHostingProcess>false</UseVSHostingProcess>
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>Output\</OutputPath>
|
||||
<DefineConstants>TRACE;DEBUG;NEWTIMERS, NEWPARENT</DefineConstants>
|
||||
<DefineConstants>TRACE;DEBUG;NEWTIMERS;NEWPARENT</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||
<OutputPath>Output\</OutputPath>
|
||||
<DefineConstants>TRACE;NEWTIMERS, NEWPARENT</DefineConstants>
|
||||
<DefineConstants>TRACE;NEWTIMERS;NEWPARENT</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
|
|
@ -55,14 +55,12 @@
|
|||
<UseVSHostingProcess>false</UseVSHostingProcess>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Web" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Accounting\AccessRestrictions.cs" />
|
||||
|
|
@ -810,17 +808,17 @@
|
|||
<Compile Include="Gumps\PetResurrectGump.cs" />
|
||||
<Compile Include="Gumps\PlayerVendorGumps.cs" />
|
||||
<Compile Include="Gumps\PolymorphGump.cs" />
|
||||
<Compile Include="Gumps\Properties\PropsConfig.cs" />
|
||||
<Compile Include="Gumps\Properties\PropsGump.cs" />
|
||||
<Compile Include="Gumps\Properties\SetBodyGump.cs" />
|
||||
<Compile Include="Gumps\Properties\SetCustomEnumGump.cs" />
|
||||
<Compile Include="Gumps\Properties\SetGump.cs" />
|
||||
<Compile Include="Gumps\Properties\SetListOptionGump.cs" />
|
||||
<Compile Include="Gumps\Properties\SetObjectGump.cs" />
|
||||
<Compile Include="Gumps\Properties\SetObjectTarget.cs" />
|
||||
<Compile Include="Gumps\Properties\SetPoint2DGump.cs" />
|
||||
<Compile Include="Gumps\Properties\SetPoint3DGump.cs" />
|
||||
<Compile Include="Gumps\Properties\SetTimeSpanGump.cs" />
|
||||
<Compile Include="Gumps\Props\PropsConfig.cs" />
|
||||
<Compile Include="Gumps\Props\PropsGump.cs" />
|
||||
<Compile Include="Gumps\Props\SetBodyGump.cs" />
|
||||
<Compile Include="Gumps\Props\SetCustomEnumGump.cs" />
|
||||
<Compile Include="Gumps\Props\SetGump.cs" />
|
||||
<Compile Include="Gumps\Props\SetListOptionGump.cs" />
|
||||
<Compile Include="Gumps\Props\SetObjectGump.cs" />
|
||||
<Compile Include="Gumps\Props\SetObjectTarget.cs" />
|
||||
<Compile Include="Gumps\Props\SetPoint2DGump.cs" />
|
||||
<Compile Include="Gumps\Props\SetPoint3DGump.cs" />
|
||||
<Compile Include="Gumps\Props\SetTimeSpanGump.cs" />
|
||||
<Compile Include="Gumps\ReclaimVendorGump.cs" />
|
||||
<Compile Include="Gumps\ReportMurderer.cs" />
|
||||
<Compile Include="Gumps\ResurrectGump.cs" />
|
||||
|
|
@ -3300,7 +3298,7 @@
|
|||
<Name>Server</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSHARP.Targets" />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />
|
||||
<ProjectExtensions>
|
||||
<VisualStudio AllowExistingFolder="true" />
|
||||
</ProjectExtensions>
|
||||
|
|
|
|||
|
|
@ -80,7 +80,9 @@ namespace Server
|
|||
|
||||
public static string GetCompilerOptions( bool debug )
|
||||
{
|
||||
StringBuilder sb = null;
|
||||
StringBuilder sb = null;
|
||||
|
||||
AppendCompilerOption( ref sb, "/unsafe" );
|
||||
|
||||
if( !debug )
|
||||
AppendCompilerOption( ref sb, "/optimize" );
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>..\</OutputPath>
|
||||
<DefineConstants>TRACE;DEBUG;NEWTIMERS, NEWPARENT</DefineConstants>
|
||||
<DefineConstants>TRACE;DEBUG;NEWTIMERS;NEWPARENT</DefineConstants>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
|
||||
<OutputPath>..\</OutputPath>
|
||||
<DefineConstants>TRACE;NEWTIMERS, NEWPARENT</DefineConstants>
|
||||
<DefineConstants>TRACE;NEWTIMERS;NEWPARENT</DefineConstants>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
|
|
@ -85,15 +85,10 @@
|
|||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Web" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="AggressorInfo.cs" />
|
||||
|
|
@ -248,8 +243,8 @@
|
|||
<ItemGroup>
|
||||
<None Include="app.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSHARP.Targets" />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />
|
||||
<ProjectExtensions>
|
||||
<VisualStudio AllowExistingFolder="true" />
|
||||
</ProjectExtensions>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue