smoogipoo
d7c09e7dbd
Merge remote-tracking branch 'origin/master' into fix-new-inspections
...
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
Dean Herbert
f1952c0816
Update font awesome usage
2019-04-02 19:55:24 +09:00
Dean Herbert
c39c37a18d
Apply more missed cases
2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38
Apply newline additions
2019-04-01 12:16:32 +09:00
Dean Herbert
de80fc0eac
Update icon usage to match framework changes
2019-03-27 19:29:27 +09:00
smoogipoo
c722ea0299
Add space
2019-03-01 14:30:58 +09:00
andy840119
e634475bf4
IsDuel -> Dual
2019-02-28 23:40:03 +09:00
andy840119
4b2be4612f
support duel mode in mania beatmap
2019-02-28 19:07:43 +09:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching
2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07
Use pattern matching wherever possible
2019-02-28 14:35:00 +09:00
Dean Herbert
26d53d06a9
Fix remaining issues
2019-02-28 13:31:40 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
Unknown
6eff79913b
remove blank lines
2019-01-11 10:34:56 +01:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
smoogipoo
a4caaf56ef
Merge remote-tracking branch 'origin/master' into fix-slider-samples
...
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2018-11-05 16:38:28 +09:00
smoogipoo
47be95ce0b
Fix slider nodes using the wrong samples
2018-10-16 17:10:24 +09:00
smoogipoo
ec9f23ab73
Make IBeatmap.HitObjects an IReadOnlyList
2018-10-11 19:53:07 +09:00
smoogipoo
49913f00f0
Fix xmldoc
2018-08-25 00:07:48 +09:00
smoogipoo
26dfabc86c
Aggressively check for valid columns before iterating endlessly
2018-08-24 23:57:44 +09:00
smoogipoo
6475dfaeef
Allow 2B maps to be converted to mania
2018-08-23 09:19:33 +09:00
Dean Herbert
786ed8203f
Merge branch 'master' into fix-mirror-note-conversion
2018-08-17 14:47:16 +09:00
smoogipoo
3d6721111a
Increase the maximum allowable iterations during mania conversion
2018-08-17 13:26:53 +09:00
smoogipoo
99ace9805f
Fix mirror note generation never completing
2018-08-17 12:54:32 +09:00
Dean Herbert
dfecb3235b
Fix custom exception stack trace output
2018-08-16 20:41:53 +09:00
Dean Herbert
b26c8e3b9e
Fix notifiation stack trace output on mania conversion failure
2018-08-16 14:04:48 +09:00
smoogipoo
26d4bb5451
xmldoc + reword
2018-08-15 09:51:02 +09:00
smoogipoo
2019a89a08
Softly-handle infinite loops in mania beatmap conversion
2018-08-14 16:45:35 +09:00
Dean Herbert
825941aff1
Use switch with type matching in place of if-else where possible
2018-07-17 14:35:09 +09:00
Dean Herbert
dbc538abbe
Use Enum.HasFlag
...
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
2018-07-16 16:18:46 +09:00
Dan Balasescu
282a99fb88
Merge branch 'master' into fix-spelling
2018-07-10 16:32:14 +09:00
Dan Balasescu
a1d2092cc9
Fix incorrect default drain time
2018-07-06 13:29:40 +09:00
Dean Herbert
1d6609d9f3
Add common custom words to dotsettings dictionary
...
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
Jean-Denis Boivin
55364af56c
I guess you meant an "or" ?
2018-06-24 14:55:27 -04:00
smoogipoo
a623155b9f
Fix missing using
2018-06-19 13:51:53 +09:00
smoogipoo
f090e82b63
Fix inverted conditional
2018-06-18 21:06:09 +09:00
smoogipoo
0625bfda30
Don't split single hitobject into multiple patterns
2018-06-18 20:17:49 +09:00
smoogipoo
8529cece4a
Fix precision error
2018-06-18 20:17:19 +09:00
smoogipoo
55f0b3c42c
Distance object generator should output a secondary pattern
...
In osu!stable, only the hitobjects which ended at the distance object's EndTime would be considered for further pattern generation.
Previously this generator was group _all_ objects including those that don't end at the object's EndTime, resulting in incorrect hitobject count for further pattern generation.
2018-06-15 22:10:57 +09:00
smoogipoo
2d59ae9354
Commit forgotten variable
2018-06-15 22:08:24 +09:00
smoogipoo
53a6d01304
Fix stair type not being flipped correctly
2018-06-15 21:06:54 +09:00
smoogipoo
5f5d797c1e
Remove unused field
2018-06-15 21:06:35 +09:00
smoogipoo
e51f96e181
Fix some notes not being recorded
2018-06-15 20:53:18 +09:00
smoogipoo
c1f7db80f1
Forgot to commit random change
2018-06-15 20:52:09 +09:00
smoogipoo
fe9aaf000c
Fix missing conditional
2018-06-15 20:50:36 +09:00
smoogipoo
481546ec7a
Fix drain time not being rounded to the second
2018-06-15 20:49:11 +09:00
smoogipoo
fd84afb89b
Fix non-inverted calculation
2018-06-14 19:38:48 +09:00
smoogipoo
a3bf16e481
Fix missing convert type
2018-06-14 19:37:32 +09:00
smoogipoo
b25a6a33cc
Fix 1K breaking hitcircle / slider conversions
2018-06-14 19:37:21 +09:00
smoogipoo
f67d263596
Move ruleset-specific hitwindows to post-converted hitobjects
2018-05-17 13:35:15 +09:00
smoogipoo
6e1d651087
Merge remote-tracking branch 'origin/master' into convert-object-hitwindows
2018-05-14 11:17:39 +09:00
smoogipoo
faa82f17cc
Pass original hitobject HitWindows during conversion
2018-05-11 15:30:50 +09:00
smoogipoo
7eb64ab590
Remove object counts from mania/taiko/catch
2018-05-07 15:51:08 +09:00
smoogipoo
b737644208
Add mania statistics
2018-05-07 15:51:08 +09:00
smoogipoo
e20323b5f6
Trim whitespace
2018-05-07 11:23:29 +09:00
smoogipoo
f3aa9269ff
Fix mania-specific beatmap conversion
2018-05-07 09:17:12 +09:00
smoogipoo
03a5df84c6
Initial rework of beatmap conversion process
2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7
Use IBeatmap wherever possible
2018-04-19 20:44:38 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
smoogipoo
9e09d434dd
Fix argument null exception in ManiaBeatmapConverter
2018-03-14 11:27:14 +09:00
smoogipoo
27a510aad8
The endtime-object pattern is never checked against
2018-03-05 20:20:42 +09:00
smoogipoo
4be478d38e
Fix LowProbability conversions happening during kiai time
2018-03-05 20:20:22 +09:00
smoogipoo
356d353cea
Fix ConversionDifficulty never actually being calculated
2018-03-05 20:20:18 +09:00
smoogipoo
675c7d0dfd
Invert Max/Mins
2018-03-05 20:20:14 +09:00
smoogipoo
dfeee79a24
Fix incorrect probability
2018-03-05 20:20:10 +09:00
smoogipoo
2bd58e5421
Re-order RNG call to match osu-stable
2018-03-05 20:20:06 +09:00
smoogipoo
4da30c6940
Fix missing conversion case
2018-03-05 20:20:00 +09:00
smoogipoo
b8b869e8b7
Remove now unused property
2018-03-01 02:28:14 +09:00
smoogipoo
a3c7755ade
Implement a conversion process for ReplayFrames
2018-03-01 02:28:14 +09:00
smoogipoo
d37844c068
Clean up off-by-one offsets from repeat-related properties
2018-01-23 13:37:25 +09:00
ANDY840119-PC\andy840119
3b291abf60
Merge branch 'master' of https://github.com/ppy/osu into mania_stage_fix
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game/Rulesets/UI/Playfield.cs
2018-01-17 22:27:32 +09:00
TocoToucan
3c11978cfa
Use local functions
2018-01-15 21:42:17 +03:00
smoogipoo
d2b1e27527
Cleanup implementation of coop key mod
...
This is how I intended the functionality to be implemented.
2018-01-15 15:49:03 +09:00
ANDY840119-PC\andy840119
bbb741245e
fix CI error
2018-01-14 21:51:07 +09:00
ANDY840119-PC\andy840119
999386497a
implement co-op mod
2018-01-14 21:35:35 +09:00
Aergwyn
ae1adfd2f2
remove unnecessary empty lines
...
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
smoogipoo
f569d54958
Local circlesize/od variables
2018-01-04 19:52:29 +09:00
smoogipoo
b68daaeb4b
Group -> Stage
2018-01-03 19:13:42 +09:00
smoogipoo
bd171926d6
Remove AvailableColumns from ManiaRulesetContainer
...
Also restructures with the addition of a ManiaBeatmap which holds definitions for "groups" of columns. At the moment these are empty save for a "Column" property, but can be expanded in the future, maybe.
2018-01-03 18:44:25 +09:00
smoogipoo
d288d8a51f
Remove SampleInfoList
2017-12-25 15:40:01 +09:00
Dean Herbert
e7c85d38a8
Move list initialisation to pattern generation code
2017-12-23 19:17:05 +09:00
smoogipoo
2c53be7853
Fix possible invalid cast when generating mania patterns
2017-11-27 18:39:13 +09:00
Dean Herbert
5d5ea5fb2e
Fix all remaining db structure issues
2017-10-19 14:05:11 +09:00
TocoToucan
887aa7496b
Rework EF Core usage in model classes
2017-10-06 00:23:26 +03:00
TocoToucan
6a4198d0d6
Initial EF Core commit
2017-10-04 22:52:12 +03:00
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
smoogipooo
2f2abf122b
Add exceptions galore.
2017-08-22 16:46:12 +09:00
smoogipooo
e337fbcf4f
Make availableColumns into a ctor argument.
2017-08-22 16:22:40 +09:00
smoogipooo
909cae5861
CI fixes.
2017-08-22 14:21:28 +09:00
smoogipooo
68c7226d12
Fix cherry pick issues.
2017-08-22 14:18:17 +09:00
smoogipooo
4eec59f669
Only set the number of availableColumns once, at ManiaRulesetContainer level.
...
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
2017-08-22 14:07:37 +09:00
smoogipooo
6a7b410bc3
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
2017-08-21 11:58:54 +09:00
Dan Balasescu
21d44b1e99
Remove correct duplicate code.
...
Already present on line 51.
2017-08-09 06:24:08 +09:00
John Neijzen
9e17549d7f
Update HitObjectPatternGenerator.cs
2017-08-08 22:56:27 +08:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
John Neijzen
9b0e1c26a3
Clean Up Code
2017-06-07 19:53:37 +08:00
smoogipooo
e529ced131
Fix mania-specific beatmaps not setting samples correctly.
2017-05-29 16:18:01 +09:00
smoogipooo
3f4cbd02cd
Fix warnings.
2017-05-26 16:29:20 +09:00
smoogipooo
946cd4bfa3
General cleanup + more xmldocs.
2017-05-24 21:57:38 +09:00
smoogipooo
dcf879687d
Implement basic hold note + tick input.
2017-05-24 20:45:01 +09:00
smoogipooo
836bf930a0
More cleanups.
2017-05-23 15:29:38 +09:00
smoogipooo
ea4a285329
Fix compile errors.
2017-05-23 14:08:15 +09:00
smoogipooo
3cdfd2eef5
Split ControlPoint into different types.
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
smoogipooo
7314a9019c
Fix nullref.
2017-05-22 16:39:30 +09:00
smoogipooo
f70bfd5378
CI fixes.
2017-05-22 13:43:53 +09:00
Dan Balasescu
4556ead3b6
Merge branch 'master' into mania-hitobject-object-conversion
2017-05-22 12:54:06 +09:00
Dean Herbert
b50f9cad44
Merge branch 'master' into mania-endtime-object-conversion
2017-05-22 12:14:53 +09:00
Dan Balasescu
d02aaf0a28
Merge branch 'master' into mania-distance-object-conversion
2017-05-22 11:36:36 +09:00
smoogipooo
8077ddf944
Update with pattern changes.
2017-05-22 10:34:12 +09:00
smoogipooo
7d417e4219
Merge remote-tracking branch 'smoogipooo/mania-pattern-changes' into mania-hitobject-object-conversion
2017-05-22 10:32:32 +09:00
smoogipooo
dba9dd3509
Remove siblings.
2017-05-22 10:30:03 +09:00
smoogipooo
e232968ea7
Fix line endings resulting in CI error.
2017-05-22 10:25:28 +09:00
smoogipooo
6714a244e8
Add check before possibly going into endless loop.
2017-05-22 10:23:08 +09:00
smoogipooo
2d11a8bdf0
Update with pattern changes.
2017-05-22 10:20:42 +09:00
Dan Balasescu
4ce3a78066
Update Pattern.cs
2017-05-22 10:18:42 +09:00
smoogipooo
e9f7be8dce
Merge branch 'mania-pattern-changes' into mania-endtime-object-conversion
2017-05-22 10:17:54 +09:00
smoogipooo
cd66e2af14
Update with pattern changes.
2017-05-22 10:17:08 +09:00
smoogipooo
9fd4ab2302
Merge branch 'mania-pattern-changes' into mania-distance-object-conversion
2017-05-22 10:14:32 +09:00
smoogipooo
0a0139aded
Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod.
2017-05-22 10:12:33 +09:00
smoogipooo
8c260e3364
Renamings + refactorings to Pattern.
2017-05-22 10:04:25 +09:00
smoogipooo
9de18d45a5
Use bitshifted notation.
2017-05-22 10:00:11 +09:00
smoogipooo
9f2ca1acbf
Remove siblings.
2017-05-22 09:57:03 +09:00
smoogipooo
3041b55aac
Remove siblings.
2017-05-22 09:50:36 +09:00
smoogipooo
ecf81fa8d2
Cleanup.
2017-05-22 08:25:48 +09:00
smoogipooo
8d94c2ef8b
Fix CI errors (for now).
2017-05-19 21:17:14 +09:00
smoogipooo
f8270f31a9
Fix build errors.
2017-05-19 21:15:29 +09:00
smoogipooo
6ab7a91415
Add generator to generate patterns from HitObjects.
2017-05-19 20:57:20 +09:00
smoogipooo
e76cb4cc31
Update to match base branch.
2017-05-19 17:51:59 +09:00
smoogipooo
0a596ef1e4
Merge branch 'mania-beatmap-conversion' into mania-endtime-object-conversion
...
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-19 17:50:19 +09:00
smoogipooo
90270ac586
Update to match base branch.
2017-05-19 17:48:23 +09:00
smoogipooo
5d8f0a4707
Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion
...
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-19 17:42:24 +09:00
smoogipooo
7b05930fc2
Revert "Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects."
...
This reverts commit 6821197a6a
.
2017-05-19 17:38:06 +09:00
smoogipooo
860b607f45
A bit more cleanup.
2017-05-19 16:49:05 +09:00
smoogipooo
1cb3fc7262
Oops fix unused using.
2017-05-19 16:45:06 +09:00
smoogipooo
6821197a6a
Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects.
2017-05-19 16:40:01 +09:00
smoogipooo
2cea5f0fa3
Add comments.
2017-05-19 16:39:02 +09:00
smoogipooo
9191c4f3e3
Remove LegacyBeatmapConverter.
2017-05-19 16:31:56 +09:00
smoogipooo
67cf64062a
Add flag to determine whether the beatmap requested for conversion is for the current ruleset.
2017-05-19 16:02:40 +09:00
Dan Balasescu
e52b87bc58
Fix incorrect comment.
2017-05-18 19:47:16 +09:00
Dan Balasescu
b5674c8f30
Update DistanceObjectPatternGenerator.cs
2017-05-18 19:33:02 +09:00
smoogipooo
1f6939f57b
Add IHasEndTime object pattern generation.
2017-05-18 19:31:56 +09:00
smoogipooo
a239411808
Fix warnings/errors.
2017-05-18 19:10:32 +09:00
smoogipooo
78453c7ce3
Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion
...
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-18 19:06:27 +09:00
smoogipooo
c80e2e8f0a
Attempt to solve warnings...
2017-05-18 18:46:50 +09:00
smoogipooo
35bd608a4a
Simplify method parameters, make conversion work again.
2017-05-18 18:41:44 +09:00
smoogipooo
a30e49d21b
Add hold end samples.
2017-05-18 18:19:29 +09:00
smoogipooo
53a2f34f8b
Set siblings, removing warning.
2017-05-18 18:15:09 +09:00
smoogipooo
eae4f8b412
Fix compilation due to previously-removed function.
2017-05-18 18:11:09 +09:00
smoogipooo
2af025e630
Add IHasDistance object pattern generation.
2017-05-18 18:09:13 +09:00
smoogipooo
afd3eb4b8d
Implement things a bit more to remove warnings.
2017-05-18 18:04:32 +09:00