Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cuongvo/ultimasdk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: uoinfusion/ultimasdk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
5 contributors

Commits on Sep 30, 2013

  1. initial commit

    @msturgill
    msturgill committed Sep 30, 2013

    Verified

    This commit was signed with the committer’s verified signature.
    pradyunsg Pradyun Gedam
    GPG key ID: DA17C4B29CB32E4B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    873041a View commit details

  2. hack in tighter uop integration

    @msturgill
    msturgill committed Sep 30, 2013
    Copy the full SHA
    e4f4975 View commit details

Commits on Mar 22, 2014

  1. .net 4.0

    @msturgill
    msturgill committed Mar 22, 2014
    Copy the full SHA
    2262ac2 View commit details

Commits on Mar 23, 2014

  1. tidy

    @msturgill
    msturgill committed Mar 23, 2014
    Copy the full SHA
    c5a62e9 View commit details

  2. merge

    @msturgill
    msturgill committed Mar 23, 2014
    Copy the full SHA
    5f57375 View commit details

  3. format

    @msturgill
    msturgill committed Mar 23, 2014
    Copy the full SHA
    a486eab View commit details

  4. razor compat

    @msturgill
    msturgill committed Mar 23, 2014
    Copy the full SHA
    0913e81 View commit details

  5. tidy

    @msturgill
    msturgill committed Mar 23, 2014
    Copy the full SHA
    01d4d5e View commit details

  6. Merge branch 'master' into net40

    @msturgill
    msturgill committed Mar 23, 2014
    Copy the full SHA
    23287a1 View commit details

  7. gitignore

    @msturgill
    msturgill committed Mar 23, 2014
    Copy the full SHA
    8ba9d31 View commit details

Commits on Sep 28, 2014

  1. gitignore

    @msturgill
    msturgill committed Sep 28, 2014
    Copy the full SHA
    8b773a3 View commit details

Commits on Jul 21, 2015

  1. Create .travis.yml

    @msturgill
    msturgill committed Jul 21, 2015
    Copy the full SHA
    482f4b4 View commit details

  2. Update .travis.yml

    @msturgill
    msturgill committed Jul 21, 2015
    Copy the full SHA
    7706d28 View commit details

  3. Update README.md

    @msturgill
    msturgill committed Jul 21, 2015
    Copy the full SHA
    dbbb375 View commit details

Commits on Feb 14, 2017

  1. Remove signing.

    Jakub Linhart committed Feb 14, 2017
    Copy the full SHA
    c4f7fcb View commit details

Commits on Mar 9, 2017

  1. Removing strong name (private key missing).

    Jakub Linhart committed Mar 9, 2017
    Copy the full SHA
    672aeda View commit details

Commits on Mar 12, 2017

  1. Multiple Ultima Online windows enumeration.

    Jakub Linhart committed Mar 12, 2017
    Copy the full SHA
    5f28477 View commit details

Commits on Oct 30, 2017

  1. Making it possible to explicitly select client window.

    Jakub Linhart committed Oct 30, 2017
    Copy the full SHA
    a556fa0 View commit details

Commits on Feb 2, 2019

  1. Merge branch 'master' of github.com:JakubLinhart/ultimasdk 

    # Conflicts:
#	Ultima/Client.cs
    @JakubLinhart
    JakubLinhart committed Feb 2, 2019
    Copy the full SHA
    d525eeb View commit details

Commits on Apr 7, 2019

  1. netstandard2.0

    @Nirad
    Nirad committed Apr 7, 2019
    Copy the full SHA
    27f8b50 View commit details

  2. Merge pull request #1 from Nirad/net-standard20 

    netstandard2.0
    @JakubLinhart
    JakubLinhart authored Apr 7, 2019
    Copy the full SHA
    e30b7c3 View commit details

  3. Multitargeting netcore2.2 and net47 (supports registry access).

    @JakubLinhart
    JakubLinhart committed Apr 7, 2019
    Copy the full SHA
    bddf6a9 View commit details

  4. Removed unused reference that is not available for .net core.

    @JakubLinhart
    JakubLinhart committed Apr 7, 2019
    Copy the full SHA
    d6724aa View commit details

Commits on May 20, 2019

  1. Add support for keyword parsing.

    @JakubLinhart
    JakubLinhart committed May 20, 2019
    Copy the full SHA
    5b379a4 View commit details

Commits on Jun 4, 2024

  1. Update vulnerable dependencies.

    @JakubLinhart
    JakubLinhart committed Jun 4, 2024
    Copy the full SHA
    eb7cee4 View commit details
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -149,3 +149,4 @@ $RECYCLE.BIN/

# Mac crap
.DS_Store
*.snk
5 changes: 5 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
language: csharp
solution: Ultima.csproj
before_install:
- sed -i 's/<SignAssembly>true<\/SignAssembly>/<SignAssembly>true<\/SignAssembly>/' Ultima.csproj
- sed -i 's/<AssemblyOriginatorKeyFile>UltimaSDK.snk<\/AssemblyOriginatorKeyFile>//' Ultima.csproj
47 changes: 11 additions & 36 deletions Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,11 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Ultima SDK")]
[assembly: AssemblyDescription("Ultima SDK")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Ultima SDK")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("8f45cfdb-a644-4747-8834-02fad85a8f1d")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.3")]
[assembly: AssemblyFileVersion("2.0.3")]
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("8f45cfdb-a644-4747-8834-02fad85a8f1d")]
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
ultimasdk
=========

[![Build Status](https://travis-ci.org/msturgill/ultimasdk.svg?branch=master)](https://travis-ci.org/msturgill/ultimasdk)

Ultima SDK
116 changes: 28 additions & 88 deletions Ultima.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,89 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{5D66ACE6-B2A4-400F-B5A5-24525959AC5C}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Ultima</RootNamespace>
<AssemblyName>Ultima</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>UltimaSDK.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Ultima\Animations.cs" />
<Compile Include="Ultima\Art.cs" />
<Compile Include="Ultima\ASCIIFont.cs" />
<Compile Include="Ultima\CalibrationInfo.cs" />
<Compile Include="Ultima\Client.cs" />
<Compile Include="Ultima\ClientHandles.cs" />
<Compile Include="Ultima\FileIndex.cs" />
<Compile Include="Ultima\Gumps.cs" />
<Compile Include="Ultima\Hues.cs" />
<Compile Include="Ultima\LocationPointer.cs" />
<Compile Include="Ultima\Map.cs" />
<Compile Include="Ultima\Multis.cs" />
<Compile Include="Ultima\NativeMethods.cs" />
<Compile Include="Ultima\ProcessStream.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Ultima\Skills.cs" />
<Compile Include="Ultima\Sound.cs" />
<Compile Include="Ultima\StringEntry.cs" />
<Compile Include="Ultima\StringList.cs" />
<Compile Include="Ultima\Textures.cs" />
<Compile Include="Ultima\TileData.cs" />
<Compile Include="Ultima\TileList.cs" />
<Compile Include="Ultima\TileMatrix.cs" />
<Compile Include="Ultima\TileMatrixPatch.cs" />
<Compile Include="Ultima\Verdata.cs" />
<Compile Include="Ultima\WindowProcessStream.cs" />
</ItemGroup>
<ItemGroup>
<None Include="UltimaSDK.snk" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<!-- 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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
<AssemblyTitle>Ultima SDK</AssemblyTitle>
<Product>Ultima SDK</Product>
<Description>Ultima SDK</Description>
<Copyright>Copyright � 2014</Copyright>
<AssemblyVersion>4.3.3</AssemblyVersion>
<FileVersion>4.3.3</FileVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PostBuildEvent />
<PostBuildEvent />
<PostBuildEvent />
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net47'">
<DefineConstants>NET47;NETFULL</DefineConstants>
</PropertyGroup>

<PropertyGroup>
<AssemblyOriginatorKeyFile />
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="4.7.2" />
</ItemGroup>
</Project>
Loading