diff --git a/Data/Assemblies.cfg b/Data/Assemblies.cfg
index cb31d8095..5af4836c2 100644
--- a/Data/Assemblies.cfg
+++ b/Data/Assemblies.cfg
@@ -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
\ No newline at end of file
+System.Xml.dll
\ No newline at end of file
diff --git a/README.md b/README.md
index 82031a24a..918d7c0c3 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/RunUO.sln b/RunUO.sln
index 403fb7556..036ea1603 100644
--- a/RunUO.sln
+++ b/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
diff --git a/Scripts/Gumps/Properties/PropsConfig.cs b/Scripts/Gumps/Props/PropsConfig.cs
similarity index 100%
rename from Scripts/Gumps/Properties/PropsConfig.cs
rename to Scripts/Gumps/Props/PropsConfig.cs
diff --git a/Scripts/Gumps/Properties/PropsGump.cs b/Scripts/Gumps/Props/PropsGump.cs
similarity index 100%
rename from Scripts/Gumps/Properties/PropsGump.cs
rename to Scripts/Gumps/Props/PropsGump.cs
diff --git a/Scripts/Gumps/Properties/SetBodyGump.cs b/Scripts/Gumps/Props/SetBodyGump.cs
similarity index 100%
rename from Scripts/Gumps/Properties/SetBodyGump.cs
rename to Scripts/Gumps/Props/SetBodyGump.cs
diff --git a/Scripts/Gumps/Properties/SetCustomEnumGump.cs b/Scripts/Gumps/Props/SetCustomEnumGump.cs
similarity index 100%
rename from Scripts/Gumps/Properties/SetCustomEnumGump.cs
rename to Scripts/Gumps/Props/SetCustomEnumGump.cs
diff --git a/Scripts/Gumps/Properties/SetGump.cs b/Scripts/Gumps/Props/SetGump.cs
similarity index 100%
rename from Scripts/Gumps/Properties/SetGump.cs
rename to Scripts/Gumps/Props/SetGump.cs
diff --git a/Scripts/Gumps/Properties/SetListOptionGump.cs b/Scripts/Gumps/Props/SetListOptionGump.cs
similarity index 100%
rename from Scripts/Gumps/Properties/SetListOptionGump.cs
rename to Scripts/Gumps/Props/SetListOptionGump.cs
diff --git a/Scripts/Gumps/Properties/SetObjectGump.cs b/Scripts/Gumps/Props/SetObjectGump.cs
similarity index 100%
rename from Scripts/Gumps/Properties/SetObjectGump.cs
rename to Scripts/Gumps/Props/SetObjectGump.cs
diff --git a/Scripts/Gumps/Properties/SetObjectTarget.cs b/Scripts/Gumps/Props/SetObjectTarget.cs
similarity index 100%
rename from Scripts/Gumps/Properties/SetObjectTarget.cs
rename to Scripts/Gumps/Props/SetObjectTarget.cs
diff --git a/Scripts/Gumps/Properties/SetPoint2DGump.cs b/Scripts/Gumps/Props/SetPoint2DGump.cs
similarity index 100%
rename from Scripts/Gumps/Properties/SetPoint2DGump.cs
rename to Scripts/Gumps/Props/SetPoint2DGump.cs
diff --git a/Scripts/Gumps/Properties/SetPoint3DGump.cs b/Scripts/Gumps/Props/SetPoint3DGump.cs
similarity index 100%
rename from Scripts/Gumps/Properties/SetPoint3DGump.cs
rename to Scripts/Gumps/Props/SetPoint3DGump.cs
diff --git a/Scripts/Gumps/Properties/SetTimeSpanGump.cs b/Scripts/Gumps/Props/SetTimeSpanGump.cs
similarity index 100%
rename from Scripts/Gumps/Properties/SetTimeSpanGump.cs
rename to Scripts/Gumps/Props/SetTimeSpanGump.cs
diff --git a/Scripts/Scripts.csproj b/Scripts/Scripts.csproj
index fde49282d..606ac45c8 100644
--- a/Scripts/Scripts.csproj
+++ b/Scripts/Scripts.csproj
@@ -17,7 +17,7 @@
full
false
Output\
- TRACE;DEBUG;NEWTIMERS, NEWPARENT
+ TRACE;DEBUG;NEWTIMERS;NEWPARENT
prompt
4
false
@@ -26,7 +26,7 @@
pdbonly
true
Output\
- TRACE;NEWTIMERS, NEWPARENT
+ TRACE;NEWTIMERS;NEWPARENT
prompt
4
false
@@ -37,7 +37,7 @@
true
Output\
- TRACE;DEBUG;NEWTIMERS, NEWPARENT
+ TRACE;DEBUG;NEWTIMERS;NEWPARENT
full
x64
prompt
@@ -46,7 +46,7 @@
Output\
- TRACE;NEWTIMERS, NEWPARENT
+ TRACE;NEWTIMERS;NEWPARENT
true
pdbonly
x64
@@ -55,14 +55,12 @@
false
-
-
@@ -810,17 +808,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -3300,7 +3298,7 @@
Server
-
+
diff --git a/Server/ScriptCompiler.cs b/Server/ScriptCompiler.cs
index 8ae4042d7..e72111f28 100644
--- a/Server/ScriptCompiler.cs
+++ b/Server/ScriptCompiler.cs
@@ -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" );
diff --git a/Server/Server.csproj b/Server/Server.csproj
index 2e3c85608..fa703a21d 100644
--- a/Server/Server.csproj
+++ b/Server/Server.csproj
@@ -1,4 +1,4 @@
-
+
Debug
@@ -39,7 +39,7 @@
true
..\
- TRACE;DEBUG;NEWTIMERS, NEWPARENT
+ TRACE;DEBUG;NEWTIMERS;NEWPARENT
true
full
AnyCPU
@@ -50,7 +50,7 @@
..\
- TRACE;NEWTIMERS, NEWPARENT
+ TRACE;NEWTIMERS;NEWPARENT
true
true
pdbonly
@@ -85,15 +85,10 @@
false
-
-
-
-
-
@@ -248,8 +243,8 @@
-
+
-
\ No newline at end of file
+