Skip to content
This repository has been archived by the owner on Jul 19, 2022. It is now read-only.

Commit

Permalink
Merge pull request #23 from AftermathFreelancer/1.3
Browse files Browse the repository at this point in the history
1.3
  • Loading branch information
Lazrius authored Apr 11, 2020
2 parents 010659d + 7a03e5c commit 5693e16
Show file tree
Hide file tree
Showing 145 changed files with 19,626 additions and 16,799 deletions.
183 changes: 183 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
# ---> C Sharp
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
[Bb]in/
[Oo]bj/

# mstest test results
TestResults

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates
.vs/

# Build results
[Dd]ebug/
[Rr]elease/
x64/
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.log
*.vspscc
*.vssscc
.builds

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# 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
*.Publish.xml

# NuGet Packages Directory
packages

# Windows Azure Build Output
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
[Bb]in
[Oo]bj
sql
TestResults
[Tt]est[Rr]esult*
*.Cache
ClientBin
[Ss]tyle[Cc]op.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects

# 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

# ---> C++
# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

# ---> C
# Object files
*.o
*.ko
*.obj
*.elf

# Precompiled Headers
*.gch
*.pch

# Libraries
*.lib
*.a
*.la
*.lo

# Shared objects (inc. Windows DLLs)
*.dll
*.so
*.so.*
*.dylib

# Executables
*.exe
*.out
*.app
*.i*86
*.x86_64
*.hex

# Debug files
*.dSYM/

# ---> CMake
CMakeCache.txt
CMakeFiles
CMakeScripts
Makefile
cmake_install.cmake
install_manifest.txt

3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "FLUtils"]
path = FLUtils
url = https://github.com/AftermathFreelancer/FLUtils.git
18 changes: 13 additions & 5 deletions DockPanelSuite/DockPanelSuite.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WeifenLuo.WinFormsUI</RootNamespace>
<AssemblyName>WeifenLuo.WinFormsUI.Docking</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
Expand All @@ -29,6 +29,12 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -38,6 +44,8 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -46,6 +54,8 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet />
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -81,9 +91,7 @@
<Compile Include="Docking\DockPanel.AutoHideWindow.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Docking\DockPanel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Docking\DockPanel.cs" />
<Compile Include="Docking\DockPanel.DockDragHandler.cs">
<SubType>Component</SubType>
</Compile>
Expand Down
2 changes: 1 addition & 1 deletion DockPanelSuite/Docking/DockPane.SplitterControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ partial class DockPane
{
private class SplitterControl : Control, ISplitterDragSource
{
DockPane m_pane;
private DockPane m_pane;

public SplitterControl(DockPane pane)
{
Expand Down
2 changes: 1 addition & 1 deletion DockPanelSuite/Docking/DockPanel.DockDragHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ public DockOutline()
DragForm.Show(false);
}

DragForm m_dragForm;
private DragForm m_dragForm;
private DragForm DragForm
{
get { return m_dragForm; }
Expand Down
2 changes: 1 addition & 1 deletion DockPanelSuite/Docking/DockPanel.SplitterDragHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public SplitterOutline()
DragForm.Show(false);
}

DragForm m_dragForm;
private DragForm m_dragForm;
private DragForm DragForm
{
get { return m_dragForm; }
Expand Down
2 changes: 1 addition & 1 deletion DockPanelSuite/Docking/DockPanel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ private void InvalidateWindowRegion()
DummyControl.Invalidate();
}

void DummyControl_Paint(object sender, PaintEventArgs e)
private void DummyControl_Paint(object sender, PaintEventArgs e)
{
DummyControl.Paint -= m_dummyControlPaintEventHandler;
UpdateWindowRegion();
Expand Down
1 change: 1 addition & 0 deletions FLUtils
Submodule FLUtils added at f823dd
15 changes: 13 additions & 2 deletions FreelancerModStudio.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29519.87
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreelancerModStudio", "FreelancerModStudio\FreelancerModStudio.csproj", "{8FFDB3D5-4135-435B-A446-F2D8D088AA44}"
ProjectSection(ProjectDependencies) = postProject
{BB650B0C-AB45-44B0-900E-6187EC208C95} = {BB650B0C-AB45-44B0-900E-6187EC208C95}
Expand All @@ -10,6 +12,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DockPanelSuite", "DockPanel
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelixEngine", "HelixEngine\HelixEngine.csproj", "{93BD8CFA-B81B-46FD-8779-0DB02C2A691E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FLUtils", "FLUtils\FLUtils.csproj", "{2EBBCA03-FAB7-499A-849F-23EF97E0BD61}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -28,8 +32,15 @@ Global
{93BD8CFA-B81B-46FD-8779-0DB02C2A691E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{93BD8CFA-B81B-46FD-8779-0DB02C2A691E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{93BD8CFA-B81B-46FD-8779-0DB02C2A691E}.Release|Any CPU.Build.0 = Release|Any CPU
{2EBBCA03-FAB7-499A-849F-23EF97E0BD61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2EBBCA03-FAB7-499A-849F-23EF97E0BD61}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2EBBCA03-FAB7-499A-849F-23EF97E0BD61}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2EBBCA03-FAB7-499A-849F-23EF97E0BD61}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {08F15264-94C5-4AC8-A9F1-C79A2AD46DCF}
EndGlobalSection
EndGlobal
7 changes: 7 additions & 0 deletions FreelancerModStudio/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[*.cs]

# SA1516: Elements should be separated by blank line
dotnet_diagnostic.SA1516.severity = none

# SA1600: Elements should be documented
dotnet_diagnostic.SA1600.severity = suggestion
10 changes: 10 additions & 0 deletions FreelancerModStudio/ActionType.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace FreelancerModStudio.AutoUpdate
{
public enum ActionType
{
Close,
CloseAndAbort,
Download,
Install
}
}
20 changes: 10 additions & 10 deletions FreelancerModStudio/AutoUpdate/ActionType.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
namespace FreelancerModStudio.AutoUpdate
{
public enum ActionType
{
Close,
CloseAndAbort,
Download,
Install
}
}
namespace FreelancerModStudio.AutoUpdate
{
public enum ActionType
{
Close,
CloseAndAbort,
Download,
Install
}
}
Loading

0 comments on commit 5693e16

Please sign in to comment.