v4.0.0 -> Dev

.clang-format

@@ -1,21 +1,23 @@
 # Generated from CLion C/C++ Code Style settings
 BasedOnStyle: LLVM
 AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
+AlignAfterOpenBracket: BlockIndent
 AlignConsecutiveAssignments: None
 AlignEscapedNewlines: Left
 AlignOperands: Align
-AllowAllArgumentsOnNextLine: false
-AllowAllConstructorInitializersOnNextLine: false
-AllowAllParametersOfDeclarationOnNextLine: false
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: Always
-AllowShortCaseLabelsOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Always
+AllowShortIfStatementsOnASingleLine: AllIfsAndElse
 AllowShortLambdasOnASingleLine: Empty
 AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterReturnType: None
-AlwaysBreakTemplateDeclarations: Yes
+AlwaysBreakTemplateDeclarations: Leave
+BinPackArguments: true
+BinPackParameters: true
 BreakBeforeBraces: Custom
 BraceWrapping:
   AfterCaseLabel: true
@@ -35,23 +37,24 @@ BraceWrapping:
   SplitEmptyFunction: false
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
+BracedInitializerIndentWidth: 4
 BreakBeforeBinaryOperators: None
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: BeforeColon
 BreakInheritanceList: BeforeColon
-Cpp11BracedListStyle: false
+Cpp11BracedListStyle: true
 ColumnLimit: 0
 CompactNamespaces: false
-ContinuationIndentWidth: 4
+ContinuationIndentWidth: 0
 IndentAccessModifiers: false
 IndentCaseLabels: true
 IndentPPDirectives: BeforeHash
 IndentWidth: 4
 InsertNewlineAtEOF: true
 KeepEmptyLinesAtTheStartOfBlocks: true
-LambdaBodyIndentation: Signature
+LambdaBodyIndentation: OuterScope
 MaxEmptyLinesToKeep: 1
-NamespaceIndentation: All
+NamespaceIndentation: None
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PointerAlignment: Left
@@ -64,7 +67,7 @@ SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: false
+SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInAngles: false

.dockerignore

@@ -1,5 +1,9 @@
 dependencies/v8
 .git
-build*/
-cmake-*/
+build
+cmake-build-*/
+vcpkg/
+docker/
+dependencies/fc/
 *.tar
+*.diff

.editorconfig

@@ -448,7 +448,7 @@ ij_c_indent_implementation_members = 0
 ij_c_indent_inside_code_block = 4
 ij_c_indent_interface_members = 0
 ij_c_indent_interface_members_except_ivars_block = false
-ij_c_indent_namespace_members = 4
+ij_c_indent_namespace_members = 0
 ij_c_indent_preprocessor_directive = 0
 ij_c_indent_visibility_keywords = 4
 ij_c_insert_override = true
@@ -979,34 +979,37 @@ ij_toml_keep_indents_on_empty_lines = false
 
 # Visual C++ Code Style settings
 
-cpp_generate_documentation_comments = xml
+cpp_generate_documentation_comments = doxygen_triple_slash
 
 # Visual C++ Formatting settings
 
+indent_style = tab
+indent_size = 4
+tab_width= 4
 cpp_indent_braces = false
-cpp_indent_multi_line_relative_to = innermost_parenthesis
+cpp_indent_multi_line_relative_to = outermost_parenthesis
 cpp_indent_within_parentheses = indent
-cpp_indent_preserve_within_parentheses = true
+cpp_indent_preserve_within_parentheses = false
 cpp_indent_case_contents = true
-cpp_indent_case_labels = false
+cpp_indent_case_labels = true
 cpp_indent_case_contents_when_block = false
-cpp_indent_lambda_braces_when_parameter = true
+cpp_indent_lambda_braces_when_parameter = false
 cpp_indent_goto_labels = one_left
 cpp_indent_preprocessor = leftmost_column
 cpp_indent_access_specifiers = false
-cpp_indent_namespace_contents = true
+cpp_indent_namespace_contents = false
 cpp_indent_preserve_comments = false
-cpp_new_line_before_open_brace_namespace = ignore
-cpp_new_line_before_open_brace_type = ignore
-cpp_new_line_before_open_brace_function = ignore
-cpp_new_line_before_open_brace_block = ignore
-cpp_new_line_before_open_brace_lambda = ignore
-cpp_new_line_scope_braces_on_separate_lines = false
+cpp_new_line_before_open_brace_namespace = new_line
+cpp_new_line_before_open_brace_type = new_line
+cpp_new_line_before_open_brace_function = new_line
+cpp_new_line_before_open_brace_block = new_line
+cpp_new_line_before_open_brace_lambda = new_line
+cpp_new_line_scope_braces_on_separate_lines = true
 cpp_new_line_close_brace_same_line_empty_type = false
 cpp_new_line_close_brace_same_line_empty_function = false
 cpp_new_line_before_catch = true
 cpp_new_line_before_else = true
-cpp_new_line_before_while_in_do_while = false
+cpp_new_line_before_while_in_do_while = true
 cpp_space_before_function_open_parenthesis = remove
 cpp_space_within_parameter_list_parentheses = false
 cpp_space_between_empty_parameter_list_parentheses = false
@@ -1043,10 +1046,13 @@ cpp_space_around_ternary_operator = insert
 cpp_use_unreal_engine_macro_formatting = true
 cpp_wrap_preserve_blocks = one_liners
 
-# Visual C++ Inlcude Cleanup settings
+# Visual C++ Include Cleanup settings
 
+cpp_include_cleanup_alternate_files = utilities/std/generator.h:generator,generator.h:generator
 cpp_include_cleanup_add_missing_error_tag_type = suggestion
+cpp_include_cleanup_excluded_files = corecrt.h,Windows.h,tomcrypt.h
 cpp_include_cleanup_remove_unused_error_tag_type = dimmed
+cpp_include_cleanup_replacement_files = generator:utilities/std/generator.h
 cpp_include_cleanup_optimize_unused_error_tag_type = suggestion
 cpp_include_cleanup_sort_after_edits = false
 cpp_sort_includes_error_tag_type = none

.gitattributes

@@ -1,2 +1,6 @@
-* test eol=lf
-bin/servers/* binary
+* text=auto
+*.cpp text
+*.h text
+*.exe binary
+bin/servers/** binary
+.gitignore text

.gitignore

@@ -10,10 +10,12 @@ bin/*.bin
 bin/*.dat
 bin/*.dll
 bin/*.exe
+bin/*.idb
+bin/*.ilk
+bin/*.obj
 bin/*.pdb
-bin/*.zip
 bin/*.txt
-bin/*.ilk
+bin/*.zip
 bin/GS2Emu.*
 bin/gs2emu*
 bin/servers/*
@@ -24,7 +26,7 @@ build*/*
 cmake-build-*/
 dependencies/.cipd/
 dependencies/.gclient*
-dependencies/v8*
+dependencies/fc/
 lib/
 out/
 packages/

.gitmodules

@@ -1,18 +0,0 @@
-[submodule "dependencies/miniupnp"]
-	path = dependencies/miniupnp
-	url = https://github.com/miniupnp/miniupnp.git
-[submodule "dependencies/depot_tools"]
-	path = dependencies/depot_tools
-	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
-[submodule "dependencies/gs2lib"]
-	path = dependencies/gs2lib
-	url = https://xtjoeytx@bitbucket.org/xtjoeytx/gs2lib.git
-[submodule "dependencies/gs2compiler"]
-	path = dependencies/gs2compiler
-	url = https://github.com/xtjoeytx/gs2-parser.git
-[submodule "cmake/nuget"]
-	path = cmake/nuget
-	url = https://github.com/katusk/CMakeNuGetTools
-[submodule "vcpkg"]
-	path = vcpkg
-	url = https://github.com/microsoft/vcpkg.git