1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-29 17:07:33 +08:00
Commit Graph

247 Commits

Author SHA1 Message Date
smoogipoo
6e7426a098 Simplify/improve beatmap conversion precheck 2019-12-23 17:44:18 +09:00
Huo Yaoyuan
c457571da6 Use index and range expressions 2019-12-15 20:17:35 +08:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert
709ec1404f Centralise End/StartTime retrieval to extension method 2019-11-25 19:09:14 +09:00
Berkan Diler
fccdbffa93 Use MathF instead of Math- functions when possible
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
Huo Yaoyuan
8239c2da61 Refactor to avoid using try-finally as control flow. 2019-11-22 00:12:03 +08:00
Huo Yaoyuan
4cd7d67fe4 Use early return for if-pattern-matching. 2019-11-22 00:02:40 +08:00
Huo Yaoyuan
20f01ff3e9 Revert false positives of 'unused assignment'. 2019-11-21 23:54:38 +08:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Berkan Diler
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
Huo Yaoyuan
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Huo Yaoyuan
53bc2dcab7 Use costum displaying text for inherited references. 2019-11-18 15:29:18 +08:00
Huo Yaoyuan
b04bca7db6 Reference elements in origin definition. 2019-11-17 20:55:40 +08:00
Huo Yaoyuan
144812669d Use static local functions. 2019-11-12 19:56:54 +08:00
Huo Yaoyuan
dcfa98414f Use ??=. 2019-11-12 19:56:51 +08:00
Huo Yaoyuan
31cc0d13da Use 'out var'. 2019-11-12 19:55:26 +08:00
Huo Yaoyuan
e5e8e70704 Use pattern matching. 2019-11-12 19:55:19 +08:00
Huo Yaoyuan
7d7b9e36b2 Use compound assignment. 2019-11-12 19:53:50 +08:00
Huo Yaoyuan
4b75e0bf6a Redundant assignment. 2019-11-12 19:53:47 +08:00
Dean Herbert
b37bf4ea01 Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition 2019-11-12 10:44:53 +09:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
smoogipoo
6fc1be64c2 Make hitobject samples a bindable list 2019-11-08 14:04:57 +09:00
Dean Herbert
7e9c100c9b Apply new resharper refactors 2019-08-09 12:29:33 +09:00
Dean Herbert
60ea3d4e1a Fix skinning support for combobreak 2019-06-30 21:58:30 +09:00
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