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

16734 Commits

Author SHA1 Message Date
Dan Balasescu
4b7a053544
Merge branch 'master' into update-placement-more-often 2020-02-13 18:43:27 +09:00
Dean Herbert
d6263adb7b
Merge pull request #7806 from peppy/timeline-zoom-button-repeat
Add mouse down repeat support to timeline zoom buttons
2020-02-13 18:35:11 +09:00
Dean Herbert
24e7c3e11b
Merge pull request #7811 from smoogipoo/mod-expansion-types
Improve extensibility of mod display expansion
2020-02-13 18:34:46 +09:00
smoogipoo
d4f14e552a Improve extensibility of mod display expansion 2020-02-13 18:05:53 +09:00
Dan Balasescu
c384e3cfc2
Merge branch 'master' into timeline-zoom-button-repeat 2020-02-13 18:04:36 +09:00
Dan Balasescu
97a03729b2
Merge branch 'master' into fix-blueprint-outside-container 2020-02-13 17:54:20 +09:00
Dan Balasescu
d80e9550fb
Merge branch 'master' into timeline-zoom-button-repeat 2020-02-13 17:38:45 +09:00
Dan Balasescu
5a90e6f9b5
Merge branch 'master' into fix-blueprint-outside-container 2020-02-13 17:32:49 +09:00
Dan Balasescu
48a6583216
Merge branch 'master' into disable-interaction-progress-bar 2020-02-13 17:20:22 +09:00
Dean Herbert
e2e6e67f79 Merge branch 'master' into difficultyadjust-order 2020-02-13 14:07:47 +09:00
Dean Herbert
53b62816f8 Add index constants for cross-class safety 2020-02-13 14:07:37 +09:00
Dean Herbert
045d1f9c5b Disallow seeking on osu!direct download progress bars 2020-02-13 13:36:53 +09:00
Dean Herbert
6a2b3c5c02
Merge pull request #7733 from EVAST9919/rankings-overlay-spotlights
Add spotlight selector to RankingsOverlay
2020-02-13 13:14:02 +09:00
Dean Herbert
03bf10f9a2 Remove unused using statement 2020-02-13 11:15:00 +09:00
Dean Herbert
487dd47c9e Add mouse down repeat support to timeline zoom buttons 2020-02-13 11:14:09 +09:00
Dean Herbert
e34a24a063 Update placement blueprint more often for better display 2020-02-13 10:45:16 +09:00
Dean Herbert
2b6f99d404 Standardise placement blueprint creation and destruction 2020-02-13 10:12:56 +09:00
Dean Herbert
b65e839bd2 Simplify blueprints by removing visible state 2020-02-13 10:00:09 +09:00
Dean Herbert
0fe41fd50a Fix blueprint showing even when mouse outside of container 2020-02-13 09:03:48 +09:00
voidedWarranties
a8eb9ba45c Update xmldoc 2020-02-12 15:55:16 -08: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
voidedWarranties
e9b5137147 Remove >-1 limitation by using a separate constructor 2020-02-11 21:52:22 -08: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
voidedWarranties
3d1183eea0
Merge branch 'master' into difficultyadjust-order 2020-02-10 16:46:24 -08:00
voidedWarranties
ca237fd987 Simplify ordering by using only numbers, add xmldoc 2020-02-10 16:21:49 -08:00
Andrei Zavatski
0b6558dc40 Add SpotlightsLayout to RankingsOverlay 2020-02-11 02:35:23 +03:00
Andrei Zavatski
b04a4b5c8a Implement SpotlightsLayout 2020-02-11 01:44:56 +03:00
Andrei Zavatski
ed6a35cb9f Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-spotlights 2020-02-11 00:18:11 +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
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
voidedWarranties
ea521b466f Switch numerical consts to an enum 2020-02-09 21:37:40 -08: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
voidedWarranties
137181017b Naming consistency with osu!web 2020-02-09 20:36:54 -08:00
voidedWarranties
88a56d00bf Allow specifying order to SettingSource 2020-02-09 20:11:37 -08:00