Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dustdustinthewind committed Jan 27, 2020
2 parents a5980c0 + 99f2cbe commit 12ab7f3
Show file tree
Hide file tree
Showing 60 changed files with 1,178 additions and 615 deletions.
197 changes: 197 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
# Remove the line below if you want to inherit .editorconfig settings from higher directories
root = true

# C# files
[*.cs]

#### Core EditorConfig Options ####

# Indentation and spacing
indent_size = 4
indent_style = space
tab_width = 4

# New line preferences
end_of_line = crlf
insert_final_newline = false

#### .NET Coding Conventions ####

# Organize usings
dotnet_separate_import_directive_groups = false
dotnet_sort_system_directives_first = false

# this. and Me. preferences
dotnet_style_qualification_for_event = false:suggestion
dotnet_style_qualification_for_field = false:suggestion
dotnet_style_qualification_for_method = false:suggestion
dotnet_style_qualification_for_property = false:suggestion

# Language keywords vs BCL types preferences
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion

# Parentheses preferences
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent

# Modifier preferences
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent

# Expression-level preferences
csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion
csharp_style_throw_expression = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_object_initializer = true:suggestion
dotnet_style_prefer_auto_properties = true:warning
dotnet_style_prefer_compound_assignment = true:suggestion
dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion
dotnet_style_prefer_conditional_expression_over_return = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion

# Field preferences
dotnet_style_readonly_field = false:suggestion

# Parameter preferences
dotnet_code_quality_unused_parameters = all:warning

#### C# Coding Conventions ####

# var preferences
csharp_style_var_elsewhere = false:warning
csharp_style_var_for_built_in_types = false:warning
csharp_style_var_when_type_is_apparent = false:warning

# Expression-bodied members
csharp_style_expression_bodied_accessors = when_on_single_line:suggestion
csharp_style_expression_bodied_constructors = when_on_single_line:suggestion
csharp_style_expression_bodied_indexers = when_on_single_line:suggestion
csharp_style_expression_bodied_lambdas = when_on_single_line:suggestion
csharp_style_expression_bodied_local_functions = when_on_single_line:suggestion
csharp_style_expression_bodied_methods = when_on_single_line:suggestion
csharp_style_expression_bodied_operators = false:suggestion
csharp_style_expression_bodied_properties = when_on_single_line:suggestion

# Pattern matching preferences
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_prefer_switch_expression = true:warning

# Null-checking preferences
csharp_style_conditional_delegate_call = true:suggestion

# Modifier preferences
csharp_prefer_static_local_function = false:suggestion
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async

# Code-block preferences
csharp_prefer_braces = true:warning
csharp_prefer_simple_using_statement = true:suggestion

# Expression-level preferences
csharp_prefer_simple_default_expression = true:suggestion
csharp_style_pattern_local_over_anonymous_function = true:suggestion
csharp_style_prefer_index_operator = true:suggestion
csharp_style_prefer_range_operator = true:suggestion
csharp_style_unused_value_assignment_preference = discard_variable:suggestion
csharp_style_unused_value_expression_statement_preference = discard_variable:silent

# 'using' directive preferences
csharp_using_directive_placement = outside_namespace:error

#### C# Formatting Rules ####

# New line preferences
csharp_new_line_before_catch = true
csharp_new_line_before_else = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_open_brace = all
csharp_new_line_between_query_expression_clauses = true

# Indentation preferences
csharp_indent_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_case_contents_when_block = true
csharp_indent_labels = one_less_than_current
csharp_indent_switch_labels = true

# Space preferences
csharp_space_after_cast = false
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_after_comma = true
csharp_space_after_dot = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_semicolon_in_for_statement = true
csharp_space_around_binary_operators = before_and_after
csharp_space_around_declaration_statements = false
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_before_comma = false
csharp_space_before_dot = false
csharp_space_before_open_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_between_empty_square_brackets = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false

# Wrapping preferences
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = true

#### Naming styles ####

# Naming rules

dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i

dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case

dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case

# Symbol specifications

dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal
dotnet_naming_symbols.interface.required_modifiers =

dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal
dotnet_naming_symbols.types.required_modifiers =

dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal
dotnet_naming_symbols.non_field_members.required_modifiers =

# Naming styles

dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case

dotnet_naming_style.begins_with_i.required_prefix = I
dotnet_naming_style.begins_with_i.required_suffix =
dotnet_naming_style.begins_with_i.word_separator =
dotnet_naming_style.begins_with_i.capitalization = pascal_case
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "Wobble"]
path = Wobble
url = https://github.com/Adrriii/Wobble.git
url = https://github.com/PulsarcGame/Wobble.git
41 changes: 39 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,41 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.3.0-alpha] - 2020-01-26

### Added
- **Experimental**: Crosshair turns invisible when playing with Hidden.
- Option to batch convert multiple maps in a single folder.
- Optimization to Song Select.
- Delay to refreshing the Song Select after typing in the search bar.
- Screenshot function, screenshot key defined in `config.ini` (default for now is F11), images save to Pulsarc/Screenshots

### Fixed
- Setting decimal numbers for ApproachRate crashing the game.
- Unresponsiveness from some buttons.
- Inconsistent Beatmap card movement in the Song Select.
- Pressing Delete/Backspace causing the Song Select to refresh.

### Changed
- Drawables now scale their positioning on both axis, instead of just one. This makes working with skini's more consistent and have less guess-work.

## [1.2.0-alpha] - 2019-12-04

### Added
- Leaderboards update after completing a map.
- Version counter to the main menu
- Borderless Fullscreen option. Makes alt-tabbing from Fullscreen smoother. When `FullScreen = 2` in config.ini or the Resolution is set to 0, this is enabled.
- `AllMessages' to config.ini. Setting this to false makes it so only Error and Warning messages go through.

### Fixed
- Leaderboard card positioning
- Close button or ALT+F4 not closing the game.
- Certain Intralism Map backgrounds crashing the game during conversion.
- Invalid characters crashing the game

### Changed
- How static variables work in Pulsarc.cs, fixes some issues with the game.

## [1.1.1-alpha] - 2019-11-29

### Fixed
Expand Down Expand Up @@ -48,8 +83,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Leaderboard for past scores


[unreleased]: https://github.com/PulsarcGame/Pulsarc/compare/v1.1.1-alpha...HEAD
[unreleased]: https://github.com/PulsarcGame/Pulsarc/compare/v1.3.0-alpha...HEAD
[1.3.0-alpha]: https://github.com/PulsarcGame/Pulsarc/compare/v1.2.0-alpha...v1.3.0-alpha
[1.2.0-alpha]: https://github.com/PulsarcGame/Pulsarc/compare/v1.1.1-alpha...v1.2.0-alpha
[1.1.1-alpha]: https://github.com/PulsarcGame/Pulsarc/compare/v1.1.0-alpha...v1.1.1-alpha
[1.1.0-alpha]: https://github.com/PulsarcGame/Pulsarc/compare/v1.0.1-alpha...v1.1.0-alpha
[1.0.1-alpha]: https://github.com/PulsarcGame/Pulsarc/compare/v1.0.0-pre-release...v1.0.1-alpha
[1.0.0-pre-release]: https://github.com/PulsarcGame/Pulsarc/tag/v1.0.0-pre-release
[1.0.0-pre-release]: https://github.com/PulsarcGame/Pulsarc/tree/v1.0.0-pre-release
7 changes: 6 additions & 1 deletion CODESTYLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,11 @@ for (int i = 0; i < 100; ++i) // Right
for (int i=0 ; i<100 ; ++i) // Wrong
```

## `var` vs Type
**DO** use the variable type.

**DO NOT** use `var`

## Naming
camelCasing - First word all lowercase, following words initial uppercase.

Expand All @@ -254,4 +259,4 @@ Follow all [.NET Framework Design Guidelines](https://docs.microsoft.com/en-us/d
* **DO** use camelCasing for local variables
* **DO** use PascalCasing for method, property, event, and class names.
* **DO** prefix interface names with ``I``
* **DO NOT** prefix enums, classes, or delegates with any letter.
* **DO NOT** prefix enums, classes, or delegates with any letter.
26 changes: 14 additions & 12 deletions Pulsarc/Beatmaps/BeatmapHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
using System.Globalization;
using Pulsarc.Beatmaps.Events;
using Pulsarc.Utils.SQLite;
using Wobble.Logging;
using Pulsarc.Utils;

namespace Pulsarc.Beatmaps
{
Expand Down Expand Up @@ -53,7 +55,7 @@ static public Beatmap Load(string path, string fileName)
}
catch
{
Console.WriteLine($"Unknown beatmap field : {type}");
PulsarcLogger.Error($"Unknown beatmap field : {type}", LogType.Runtime);
}
break;
case "Background":
Expand All @@ -63,9 +65,9 @@ static public Beatmap Load(string path, string fileName)
parsed.GetType().GetProperty(type).SetValue(parsed, rightPart);
}
catch
{
Console.WriteLine($"Unknown beatmap field : {type}");
}
{
PulsarcLogger.Error($"Unknown beatmap field : {type}", LogType.Runtime);
}
break;
}
case "PreviewTime":
Expand All @@ -76,7 +78,7 @@ static public Beatmap Load(string path, string fileName)
}
catch
{
Console.WriteLine($"Unknown beatmap field : {type}");
PulsarcLogger.Error($"Unknown beatmap field : {type}", LogType.Runtime);
}
break;
case "Difficulty":
Expand All @@ -86,7 +88,7 @@ static public Beatmap Load(string path, string fileName)
}
catch
{
Console.WriteLine($"Unknown beatmap field : {type}");
PulsarcLogger.Error($"Unknown beatmap field : {type}", LogType.Runtime);
}
break;
case "Events":
Expand All @@ -96,7 +98,7 @@ static public Beatmap Load(string path, string fileName)
state = type;
break;
default:
Console.WriteLine($"Unknown beatmap field : {type}");
PulsarcLogger.Error($"Unknown beatmap field : {type}", LogType.Runtime);
break;
}
}
Expand All @@ -118,7 +120,7 @@ static public Beatmap Load(string path, string fileName)
}
catch
{
Console.WriteLine($"Invalid Event : {line}");
PulsarcLogger.Error($"Invalid Event : {line}", LogType.Runtime);
}
break;
case "TimingPoints":
Expand All @@ -128,7 +130,7 @@ static public Beatmap Load(string path, string fileName)
}
catch
{
Console.WriteLine($"Invalid TimingPoint : {line}");
PulsarcLogger.Error($"Invalid TimingPoint : {line}", LogType.Runtime);
}
break;
case "Arcs":
Expand All @@ -138,11 +140,11 @@ static public Beatmap Load(string path, string fileName)
}
catch
{
Console.WriteLine($"Invalid Arc : {line}");
PulsarcLogger.Error($"Invalid Arc : {line}", LogType.Runtime);
}
break;
default:
Console.WriteLine($"Invalid state : {line}");
PulsarcLogger.Error($"Invalid state : {line}", LogType.Runtime);
break;

}
Expand Down Expand Up @@ -259,7 +261,7 @@ static private void WriteProperty(StreamWriter file, Beatmap beatmap, string pro
}
catch
{
Console.WriteLine($"Trying to write invalid property {property}");
PulsarcLogger.Error($"Trying to write invalid property {property}", LogType.Runtime);
}
}

Expand Down
3 changes: 2 additions & 1 deletion Pulsarc/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ public static class Program
[STAThread]
static void Main()
{
Pulsarc.Run();
using (var game = new Pulsarc())
game.Run();
}
}
}
Loading

0 comments on commit 12ab7f3

Please sign in to comment.