From eaafba79e2fc7fcc9d9eff122350666fd27f7a7c Mon Sep 17 00:00:00 2001 From: Andrew Babbitt Date: Tue, 29 Mar 2016 17:38:41 -0600 Subject: [PATCH 1/2] Updated .gitignore and changed all projects to build in a central directory at the root of the project. --- .gitignore | 225 +++++++- .../FFXIVClassic Lobby Server.csproj | 208 +++---- .../FFXIVClassic Map Server.csproj | 538 +++++++++--------- 3 files changed, 585 insertions(+), 386 deletions(-) diff --git a/.gitignore b/.gitignore index 0f4dc533..d983bb85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,212 @@ -FFXIVClassic Map Server/bin/Debug/packets/wireshark packets/ -FFXIVClassic Map Server/bin/ -FFXIVClassic Map Server/obj/ -FFXIVClassic_Lobby_Server/bin/ -FFXIVClassic_Lobby_Server/obj/ -packages/ -ipch/ -Blowfish/Debug/ -Debug/ -FFXIVClassic_Lobby_Server.opensdf -FFXIVClassic_Lobby_Server.sdf -FFXIVClassic Lobby Server/obj/ -FFXIVClassic Lobby Server/bin/ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +build/ +bld/ +[Bb]in/ +[Oo]bj/ + +# Visual Studio 2015 cache/options directory +.vs/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +## TODO: Comment the next line if you want to checkin your +## web deploy settings but do note that will include unencrypted +## passwords +#*.pubxml + +*.publishproj + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config + +# Windows Azure Build Output +csx/ +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# LightSwitch generated files +GeneratedArtifacts/ +_Pvt_Extensions/ +ModelManifest.xml \ No newline at end of file diff --git a/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj b/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj index f175935a..b919fc7e 100644 --- a/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj +++ b/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj @@ -1,105 +1,105 @@ - - - - - Debug - AnyCPU - {703091E0-F69C-4177-8FAE-C258AC6A65AA} - Exe - Properties - FFXIVClassic_Lobby_Server - FFXIVClassic_Lobby_Server - v4.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - - - - ..\packages\Cyotek.CircularBuffer.1.0.0.0\lib\net20\Cyotek.Collections.Generic.CircularBuffer.dll - - - ..\packages\Dapper.1.42\lib\net45\Dapper.dll - - - ..\packages\MySql.Data.6.9.7\lib\net45\MySql.Data.dll - - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + AnyCPU + {703091E0-F69C-4177-8FAE-C258AC6A65AA} + Exe + Properties + FFXIVClassic_Lobby_Server + FFXIVClassic_Lobby_Server + v4.5 + 512 + + + AnyCPU + true + full + false + ..\bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + + + AnyCPU + pdbonly + true + ..\bin\Release\ + TRACE + prompt + 4 + true + + + + ..\packages\Cyotek.CircularBuffer.1.0.0.0\lib\net20\Cyotek.Collections.Generic.CircularBuffer.dll + + + ..\packages\Dapper.1.42\lib\net45\Dapper.dll + + + ..\packages\MySql.Data.6.9.7\lib\net45\MySql.Data.dll + + + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj index eee44060..a5017ffa 100644 --- a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj +++ b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj @@ -1,270 +1,270 @@ - - - - - Debug - AnyCPU - {E8FA2784-D4B9-4711-8CC6-712A4B1CD54F} - Exe - Properties - FFXIVClassic_Map_Server - FFXIVClassic Map Server - v4.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - - - - ..\packages\Cyotek.CircularBuffer.1.0.0.0\lib\net20\Cyotek.Collections.Generic.CircularBuffer.dll - True - - - ..\packages\Dapper.1.42\lib\net45\Dapper.dll - True - - - ..\packages\MoonSharp.1.2.1.0\lib\net40-client\MoonSharp.Interpreter.dll - - - ..\packages\MySql.Data.6.9.7\lib\net45\MySql.Data.dll - True - - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + AnyCPU + {E8FA2784-D4B9-4711-8CC6-712A4B1CD54F} + Exe + Properties + FFXIVClassic_Map_Server + FFXIVClassic Map Server + v4.5 + 512 + + + AnyCPU + true + full + false + ..\bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + + + AnyCPU + pdbonly + true + ..\bin\Release\ + TRACE + prompt + 4 + true + + + + ..\packages\Cyotek.CircularBuffer.1.0.0.0\lib\net20\Cyotek.Collections.Generic.CircularBuffer.dll + True + + + ..\packages\Dapper.1.42\lib\net45\Dapper.dll + True + + + ..\packages\MoonSharp.1.2.1.0\lib\net40-client\MoonSharp.Interpreter.dll + + + ..\packages\MySql.Data.6.9.7\lib\net45\MySql.Data.dll + True + + + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 52806d2f3da3c11bf7a7382b69fd61c0f07f1d56 Mon Sep 17 00:00:00 2001 From: Andrew Babbitt Date: Tue, 29 Mar 2016 17:52:37 -0600 Subject: [PATCH 2/2] Updated the readme to be more helpful. --- README.md | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7c6019ea..ca075976 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,17 @@ -# FFXIV Classic Server # - -A FFXIV 1.0 server emulator. - -### Important ### - -The original lobby server repo was deleted and the project was merged under the same solution as the map server. All work will be now done in this repo. \ No newline at end of file +FFXIV Classic Server +======== + +Welcome to the FFXIV 1.0 server project. +If you wish to discuss and help please visit the IRC channel. + +**IRC Channel** + * **Server:** irc.ffochat.com + * **Channel:** #ffxivclassic + +Pull Requests +======== +Commits should contain a descriptive name for what you are modifying + +Remember to check back for any feedback, and drop a comment once requested changes have been made (if there are any). + +Please *test your code* before committing changes/submitting a pull request. \ No newline at end of file