1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 13:52:54 +08:00
Commit Graph

16698 Commits

Author SHA1 Message Date
Andrei Zavatski
ec9c01a75f Merge remote-tracking branch 'refs/remotes/ppy/master' into subcomments-alter-new 2020-02-12 23:32:28 +03:00
Dan Balasescu
9a9349a13a
Merge branch 'master' into adjust-beatmap-overlay 2020-02-12 16:52:42 +09:00
Dan Balasescu
866b6bb058
Merge branch 'master' into fix-song-select-weirdness 2020-02-12 15:01:15 +09:00
Dan Balasescu
e8ea0dcc02
Merge branch 'master' into info-column-min-width 2020-02-12 13:45:16 +09:00
Tree
b694b0c90c
Merge branch 'master' into adjust-beatmap-overlay 2020-02-11 21:07:26 +01:00
Dean Herbert
2a67246b21 Ensure game is at main menu before performing exit on screen 2020-02-11 22:37:38 +09:00
recapitalverb
2be7d1a873 Remove redundant type specification 2020-02-11 18:19:08 +07:00
recapitalverb
44568ac9e6 Avoid covariant array conversion 2020-02-11 17:36:10 +07:00
recapitalverb
28a39fd8fa Use explicit typing 2020-02-11 17:12:32 +07:00
recapitalverb
17791259ed Fix InfoColumn minWidth implementation 2020-02-11 16:21:31 +07:00
Andrei Zavatski
15b4e3386f Fix incorrect algorithm for comment tree creation
Can cause one comment to be redrawn multiple times
2020-02-10 23:57:48 +03:00
TheWildTree
e072042d4e Match osu-web font size 2020-02-10 21:11:49 +01:00
Bartłomiej Dach
35d5237ddd Adjust font sizes 2020-02-10 20:40:39 +01:00
Bartłomiej Dach
811553cd60 Remove unnecessary coercions
Comparisons to null of nullable numbers are always false.
2020-02-10 20:37:34 +01:00
Bartłomiej Dach
e2950d7027 Extract method to avoid nested ternaries 2020-02-10 20:27:46 +01:00
Andrei Zavatski
d20a860879 CI fix 2020-02-10 16:08:58 +03:00
Andrei Zavatski
8239f21cad Remove whitespace 2020-02-10 15:52:12 +03:00
Andrei Zavatski
26afe0f31e Add ability to load long comment trees in CommentsContainer 2020-02-10 15:43:11 +03:00
Dan Balasescu
68e59410d9 Merge branch 'master' into seek-to-endtime-on-placement 2020-02-10 19:26:54 +09:00
Dean Herbert
8186f72507 Remove unused using 2020-02-10 17:12:45 +09:00
dependabot-preview[bot]
2252f79084 Bump Sentry from 2.0.1 to 2.0.2
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.0.1...2.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 08:01:14 +00:00
Dean Herbert
66fb72cd8a Fix song select not showing active beatmap if it is filtered by local criteria 2020-02-10 16:59:54 +09:00
Dan Balasescu
f3c47dc8c9 Merge branch 'master' into seek-to-endtime-on-placement 2020-02-10 14:53:11 +09:00
Dan Balasescu
bb15153f30 Merge branch 'master' into placement-display-in-timeline 2020-02-10 14:29:01 +09:00
Dan Balasescu
28cf5c7a59 Add accessor 2020-02-10 14:28:43 +09:00
Dan Balasescu
1f3d4e1f72 Merge branch 'master' into string_cleanup 2020-02-10 13:37:17 +09:00
Dan Balasescu
f4657b8ea8 Merge branch 'master' into fix-virtual-track-beatsync 2020-02-10 13:11:06 +09:00
Dean Herbert
96574a98ad Use non-zero length for fallback virtual track (allows tests to work as expected) 2020-02-09 21:34:56 +09:00
Dean Herbert
c1f52ef594 Refactor BeatSyncContainer to handle zero length tracks 2020-02-09 21:25:28 +09:00
Dean Herbert
d73ef7c37e Change DummyBeatmap's track to be 0 length 2020-02-09 21:25:11 +09:00
Dean Herbert
93ff25d2a4 Rename caret class 2020-02-09 15:36:44 +09:00
Dean Herbert
3865090fff
Merge branch 'master' into beat-caret 2020-02-09 14:20:51 +09:00
jorolf
c2e0c83724 change the hierarchy layout 2020-02-08 20:25:16 +01:00
Berkan Diler
5b452293d6 Minor cleanups for legacy beatmap decoders
Replaces some string.StartsWith(string, StringComparison.Ordinal) calls with ring.StartsWith(char) , when only one char is compared. Possible since .NET-Standard 2.1

And another LegacyStoryboardDecoder.handleEvents() cleanup, saves some MB of allocations.
2020-02-08 18:05:27 +01:00
Joehu
e0de60a277 Update default background dim to 80% to match stable 2020-02-07 21:03:33 -08:00
Dean Herbert
84d9e3eda7
Merge branch 'master' into fix-accuracy-format 2020-02-08 11:37:03 +09:00
Dean Herbert
801e39a543 Improve xmldoc for PlacementObject 2020-02-08 11:35:27 +09:00
Dean Herbert
5c3880d712 Merge branch 'master' into placement-display-in-timeline 2020-02-08 11:35:17 +09:00
Dean Herbert
7c89e93da5
Merge branch 'master' into sorted-hitresults 2020-02-08 11:19:18 +09:00
Dean Herbert
6758c19625
Merge pull request #7758 from EVAST9919/user-graphs-data
Receive historical monthly user playcounts from API
2020-02-08 10:19:39 +09:00
Bartłomiej Dach
9bfd3a1a63 Make PercentageBreakInfoLine use FormatAccuracy 2020-02-08 00:11:19 +01:00
TheWildTree
393b566966 Make PercentageCounter use FormatAccuracy 2020-02-07 22:16:06 +01:00
TheWildTree
8c10d31af9 Make accuracy formatting more consistent 2020-02-07 22:09:45 +01:00
jorolf
1ba8cc904a Make the caret blink to the beat 2020-02-07 21:42:47 +01:00
TheWildTree
2770fb71b2 Use SortedStatistics where needed 2020-02-07 21:12:21 +01:00
TheWildTree
59cf2037d0 Introduce SortedStatistics 2020-02-07 21:11:58 +01:00
TheWildTree
7395f01919 Use osu-web font sizes 2020-02-07 20:28:02 +01:00
Dean Herbert
91203c2b12
Merge branch 'master' into placement-display-in-timeline 2020-02-08 01:50:24 +09:00
Dean Herbert
51ae741fc7
Merge pull request #7755 from peppy/fix-spinner-placement
Fix spinner placement blueprint in multiple ways
2020-02-08 01:49:48 +09:00
Dan Balasescu
4ad20ccd8b
Merge pull request #7754 from peppy/screen-under-timeline
Make editor screens display below timeline
2020-02-08 00:47:20 +09:00