Skip to content

Commit

Permalink
Merge branch 'neo'
Browse files Browse the repository at this point in the history
  • Loading branch information
@NotNite
NotNite committed Nov 13, 2024
2 parents d315831 + 340c11b commit d01c858
Show file tree
Hide file tree
Showing 96 changed files with 3,425 additions and 4,192 deletions.
158 changes: 123 additions & 35 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -1,83 +1,171 @@

root = true

[*]
charset = utf-8-bom
charset = utf-8

end_of_line = lf
trim_trailing_whitespace = false
insert_final_newline = false
insert_final_newline = true

indent_style = space
indent_size = 4
trim_trailing_whitespace = true

# Microsoft .NET properties
csharp_indent_braces = false
csharp_new_line_before_catch = false
csharp_new_line_before_else = false
csharp_new_line_before_finally = false
csharp_new_line_before_members_in_object_initializers = false
csharp_new_line_before_open_brace = none
csharp_preferred_modifier_order = public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion
csharp_preferred_modifier_order = public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async, file, required:suggestion
csharp_style_prefer_utf8_string_literals = true:suggestion
csharp_style_var_elsewhere = true:suggestion
csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_empty_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_before_open_square_brackets = false
csharp_space_before_comma = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_comma = true
csharp_space_after_cast = true
csharp_space_around_binary_operators = before_and_after
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_square_brackets = false
dotnet_code_quality_unused_parameters = non_public
dotnet_naming_rule.event_rule.import_to_resharper = as_predefined
dotnet_naming_rule.event_rule.severity = warning
dotnet_naming_rule.event_rule.style = on_upper_camel_case_style
dotnet_naming_rule.event_rule.symbols = event_symbols
dotnet_naming_rule.private_constants_rule.import_to_resharper = as_predefined
dotnet_naming_rule.private_constants_rule.severity = warning
dotnet_naming_rule.private_constants_rule.style = upper_camel_case_style
dotnet_naming_rule.private_constants_rule.symbols = private_constants_symbols
dotnet_naming_rule.private_instance_fields_rule.import_to_resharper = as_predefined
dotnet_naming_rule.private_instance_fields_rule.severity = warning
dotnet_naming_rule.private_instance_fields_rule.style = lower_camel_case_style
dotnet_naming_rule.private_instance_fields_rule.symbols = private_instance_fields_symbols
dotnet_naming_rule.private_static_fields_rule.import_to_resharper = as_predefined
dotnet_naming_rule.private_static_fields_rule.severity = warning
dotnet_naming_rule.private_static_fields_rule.style = upper_camel_case_style
dotnet_naming_rule.private_static_fields_rule.symbols = private_static_fields_symbols
dotnet_naming_rule.private_static_readonly_rule.import_to_resharper = as_predefined
dotnet_naming_rule.private_static_readonly_rule.severity = warning
dotnet_naming_rule.private_static_readonly_rule.style = upper_camel_case_style
dotnet_naming_rule.private_static_readonly_rule.symbols = private_static_readonly_symbols
dotnet_naming_rule.unity_serialized_field_rule.import_to_resharper = True
dotnet_naming_rule.unity_serialized_field_rule.resharper_description = Unity serialized field
dotnet_naming_rule.unity_serialized_field_rule.resharper_guid = 5f0fdb63-c892-4d2c-9324-15c80b22a7ef
dotnet_naming_rule.unity_serialized_field_rule.severity = warning
dotnet_naming_rule.unity_serialized_field_rule.style = lower_camel_case_style
dotnet_naming_rule.unity_serialized_field_rule.symbols = unity_serialized_field_symbols
dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
dotnet_naming_style.on_upper_camel_case_style.capitalization = pascal_case
dotnet_naming_style.on_upper_camel_case_style.required_prefix = On
dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
dotnet_naming_symbols.event_symbols.applicable_accessibilities = *
dotnet_naming_symbols.event_symbols.applicable_kinds = event
dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field
dotnet_naming_symbols.private_constants_symbols.required_modifiers = const
dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static, readonly
dotnet_naming_symbols.unity_serialized_field_symbols.applicable_accessibilities = *
dotnet_naming_symbols.unity_serialized_field_symbols.applicable_kinds =
dotnet_naming_symbols.unity_serialized_field_symbols.applicable_kinds =
dotnet_naming_symbols.unity_serialized_field_symbols.resharper_applicable_kinds = unity_serialised_field
dotnet_naming_symbols.unity_serialized_field_symbols.resharper_required_modifiers = instance
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none
dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:suggestion
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion
dotnet_style_qualification_for_event = true:warning
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
dotnet_style_parentheses_in_other_operators = always_for_clarity:silent
dotnet_style_object_initializer = false
dotnet_style_qualification_for_field = true:warning
dotnet_style_qualification_for_method = true:warning
dotnet_style_qualification_for_property = true:warning
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
dotnet_style_qualification_for_method = true:warning
dotnet_style_qualification_for_event = true:warning

# ReSharper properties
resharper_allow_comment_after_lbrace = true
resharper_align_linq_query = true
resharper_align_multiline_argument = true
resharper_align_multiline_calls_chain = true
resharper_align_multiline_expression = true
resharper_align_multiline_extends_list = true
resharper_align_multiline_for_stmt = true
resharper_align_multiline_parameter = true
resharper_align_multiple_declaration = true
resharper_align_multline_type_parameter_constrains = true
resharper_align_multline_type_parameter_list = true
resharper_apply_auto_detected_rules = false
resharper_apply_on_completion = true
resharper_auto_property_can_be_made_get_only_global_highlighting = none
resharper_auto_property_can_be_made_get_only_local_highlighting = none
resharper_autodetect_indent_settings = true
resharper_blank_lines_after_block_statements = 0
resharper_blank_lines_around_auto_property = 0
resharper_blank_lines_around_property = 0
resharper_blank_lines_around_single_line_type = 0
resharper_blank_lines_around_type = 1
resharper_braces_for_ifelse = required_for_multiline
resharper_can_use_global_alias = false
resharper_csharp_align_multiline_argument = false
resharper_csharp_align_multiline_calls_chain = false
resharper_csharp_align_multiline_parameter = true
resharper_csharp_align_multiple_declaration = true
resharper_csharp_blank_lines_around_field = 0
resharper_csharp_blank_lines_around_type = 1
resharper_csharp_empty_block_style = together_same_line
resharper_csharp_insert_final_newline = true
resharper_place_accessorholder_attribute_on_same_line = true
resharper_csharp_int_align_comments = true
resharper_csharp_naming_rule.private_constants = AaBb
resharper_csharp_naming_rule.private_static_fields = AaBb
resharper_csharp_naming_rule.private_static_readonly = AaBb
resharper_csharp_new_line_before_while = true
resharper_csharp_remove_spaces_on_blank_lines = true
resharper_csharp_wrap_after_declaration_lpar = true
resharper_csharp_wrap_before_declaration_rpar = true
resharper_enforce_line_ending_style = true
resharper_member_can_be_private_global_highlighting = none
resharper_member_can_be_private_local_highlighting = none
resharper_new_line_before_finally = false
resharper_new_line_before_while = true
resharper_place_accessorholder_attribute_on_same_line = if_owner_is_single_line
resharper_place_accessor_attribute_on_same_line = if_owner_is_single_line
resharper_place_field_attribute_on_same_line = if_owner_is_single_line
resharper_place_method_attribute_on_same_line = if_owner_is_single_line
resharper_show_autodetect_configure_formatting_tip = false
resharper_space_within_single_line_array_initializer_braces = false
resharper_use_indent_from_vs = false
resharper_xmldoc_keep_user_linebreaks = false
resharper_xmldoc_linebreak_before_elements = remarks,example,returns,param,typeparam,value,para
resharper_xmldoc_linebreak_before_multiline_elements = false

# ReSharper inspection severities
resharper_arrange_missing_parentheses_highlighting = hint
resharper_arrange_redundant_parentheses_highlighting = hint
resharper_arrange_this_qualifier_highlighting = none
resharper_arrange_type_member_modifiers_highlighting = hint
resharper_arrange_type_modifiers_highlighting = hint
resharper_built_in_type_reference_style_for_member_access_highlighting = hint
resharper_built_in_type_reference_style_highlighting = hint
resharper_check_namespace_highlighting = none
resharper_class_never_instantiated_global_highlighting = none
resharper_string_literal_typo_highlighting = none
resharper_built_in_type_reference_style_highlighting = none
resharper_foreach_can_be_converted_to_query_using_another_get_enumerator_highlighting = none
resharper_foreach_can_be_partly_converted_to_query_using_another_get_enumerator_highlighting = none
resharper_invert_if_highlighting = none
resharper_loop_can_be_converted_to_query_highlighting = none
resharper_method_has_async_overload_highlighting = none
resharper_private_field_can_be_converted_to_local_variable_highlighting = none
resharper_redundant_base_qualifier_highlighting = none
resharper_suggest_var_or_type_built_in_types_highlighting = hint
resharper_suggest_var_or_type_elsewhere_highlighting = hint
resharper_suggest_var_or_type_simple_types_highlighting = hint
resharper_unused_member_global_highlighting = none
resharper_unused_type_global_highlighting = none
resharper_unused_auto_property_accessor_global_highlighting = none
csharp_style_deconstructed_variable_declaration = true:silent
resharper_web_config_module_not_resolved_highlighting = warning
resharper_web_config_type_not_resolved_highlighting = warning
resharper_web_config_wrong_module_highlighting = warning

[*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,cc,cginc,compute,cp,cpp,cs,cshtml,cu,cuh,cxx,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,ixx,master,ml,mli,mpp,mq4,mq5,mqh,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,vb,xaml,xamlx,xoml,xsd}]
indent_style = space
indent_size = 4
tab_width = 4

[{*.nix,flake.lock}]
charset = utf-8
indent_size = 2
17 changes: 4 additions & 13 deletions .github/workflows/nightly.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: [ push, pull_request ]
on: [push, pull_request]

name: Nightly builds

Expand All @@ -10,24 +10,15 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.x
- name: Download Dalamud
run: |
Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev"
dotnet-version: 9.0.x
- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Publish
run: dotnet publish Alpha/Alpha.csproj --self-contained false --output ./artifacts
- name: Upload artifacts (Alpha)
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: windows-nightly
name: Alpha
path: ./artifacts
- name: Upload artifacts (Omega)
uses: actions/upload-artifact@v3
with:
name: omega-nightly
path: ./Omega/bin/Release/Omega
6 changes: 0 additions & 6 deletions Alpha.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alpha", "Alpha\Alpha.csproj", "{60F3D665-EB5A-4385-BA63-E44D59A011A2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Omega", "Omega\Omega.csproj", "{75877617-6F35-4AAC-92C2-97EB140458C3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -14,9 +12,5 @@ Global
{60F3D665-EB5A-4385-BA63-E44D59A011A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{60F3D665-EB5A-4385-BA63-E44D59A011A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{60F3D665-EB5A-4385-BA63-E44D59A011A2}.Release|Any CPU.Build.0 = Release|Any CPU
{75877617-6F35-4AAC-92C2-97EB140458C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{75877617-6F35-4AAC-92C2-97EB140458C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75877617-6F35-4AAC-92C2-97EB140458C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75877617-6F35-4AAC-92C2-97EB140458C3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
56 changes: 23 additions & 33 deletions Alpha/Alpha.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,36 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>2.0.0.0</Version>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DpiAwareness>PerMonitorV2</DpiAwareness>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ImGui.NET" Version="1.89.7.1" />
<PackageReference Include="Lumina" Version="3.10.2" />
<PackageReference Include="Lumina.Excel" Version="6.3.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.6.0-1.final" />
<PackageReference Include="NativeFileDialogSharp" Version="0.6.0-alpha" />
<PackageReference Include="Serilog" Version="3.0.0-dev-01958" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.1-dev-00910" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
<PackageReference Include="Veldrid" Version="4.9.0" />
<PackageReference Include="Veldrid.StartupUtilities" Version="4.9.0" />
<PackageReference Include="WebSocketSharp" Version="1.0.3-rc11" />
</ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0"/>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.22.3" />
<PackageReference Include="Grpc.Tools" Version="2.54.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<Protobuf Include="..\omega.proto" />
</ItemGroup>
<PackageReference Include="Lumina" Version="5.2.1"/>
<PackageReference Include="Lumina.Excel" Version="7.0.3"/>

<ItemGroup>
<EmbeddedResource Include="res/Fonts/NotoSans-Medium.ttf" LogicalName="NotoSans-Medium.ttf" />
<EmbeddedResource Include="res/Fonts/NotoSansCJKjp-Medium.otf" LogicalName="NotoSansCJKjp-Medium.otf" />
<EmbeddedResource Include="res/Shaders/GLSL/imgui-vertex.glsl" LogicalName="imgui-vertex.glsl" />
<EmbeddedResource Include="res/Shaders/GLSL/imgui-frag.glsl" LogicalName="imgui-frag.glsl" />
<EmbeddedResource Include="res/Shaders/HLSL/imgui-vertex.hlsl.bytes" LogicalName="imgui-vertex.hlsl.bytes" />
<EmbeddedResource Include="res/Shaders/HLSL/imgui-frag.hlsl.bytes" LogicalName="imgui-frag.hlsl.bytes" />
<EmbeddedResource Include="res/Shaders/SPIR-V/imgui-vertex.spv" LogicalName="imgui-vertex.spv" />
<EmbeddedResource Include="res/Shaders/SPIR-V/imgui-frag.spv" LogicalName="imgui-frag.spv" />
<EmbeddedResource Include="res/Shaders/Metal/imgui-vertex.metallib" LogicalName="imgui-vertex.metallib" />
<EmbeddedResource Include="res/Shaders/Metal/imgui-frag.metallib" LogicalName="imgui-frag.metallib" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0"/>
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0"/>

<!-- No idea who owns this package but it's the only updated one I could find -->
<PackageReference Include="Hexa.NET.ImGui" Version="2.1.10"/>
<PackageReference Include="Hexa.NET.Utilities" Version="2.1.8"/>
<PackageReference Include="Hexa.NET.ImGui.Backends" Version="1.0.5"/>
<PackageReference Include="Hexa.NET.ImGui.Backends.SDL2" Version="1.0.5"/>
<PackageReference Include="Hexa.NET.ImGui.Backends.GLFW" Version="1.0.5"/>
<PackageReference Include="Hexa.NET.OpenGL3" Version="1.0.1"/>
<PackageReference Include="Silk.NET.SDL" Version="2.21.0" ExcludeAssets="native"/>

<PackageReference Include="NativeFileDialog.Extended" Version="1.2.0"/>

<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5"/>
</ItemGroup>
</Project>
</Project>
Loading

0 comments on commit d01c858

Please sign in to comment.