1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 04:27:34 +08:00
Commit Graph

31582 Commits

Author SHA1 Message Date
Lucas A
82e314da59 Fix merge conflicts. 2020-09-03 21:56:47 +02:00
Dean Herbert
ebed7d09e3 Update resources 2020-09-03 21:56:36 +09:00
Dan Balasescu
8330a3aff4
Merge pull request #10044 from peppy/update-icons
Update toolbar icons and source titles from overlays directly
2020-09-03 20:55:20 +09:00
Dan Balasescu
4d9a5f7ba8
Merge branch 'master' into update-icons 2020-09-03 20:19:51 +09:00
Dean Herbert
bb8bc1097e
Merge pull request #10020 from smoogipoo/timeshift-leaderboard-topscore 2020-09-03 18:40:05 +09:00
Dean Herbert
7a0c1411b6
Merge branch 'master' into timeshift-leaderboard-topscore 2020-09-03 18:11:04 +09:00
Dean Herbert
d55c9c3cc2 Fix UserProfile weirdness 2020-09-03 17:11:34 +09:00
Dean Herbert
99e34d8562 Update with missing icons 2020-09-03 17:05:45 +09:00
Dean Herbert
f5a73130e1 Fix regression in sidebar button sizing 2020-09-03 16:34:58 +09:00
Dean Herbert
0d1674ca5e Combine settings strings to read from same location 2020-09-03 16:34:58 +09:00
Dean Herbert
2fac0a180e Adjust toolbar button sizing 2020-09-03 16:34:58 +09:00
Dean Herbert
98c5a04a09 Update home button 2020-09-03 16:34:58 +09:00
Dean Herbert
942276d88f Remove outdated SearchableList classes 2020-09-03 16:34:58 +09:00
Dean Herbert
7bcbac6f45 Move header setting to FullscreenOverlay 2020-09-03 16:34:58 +09:00
Dean Herbert
dbf44fbaf2 Update names and icons to match new designs 2020-09-03 16:34:58 +09:00
Dean Herbert
dceae21bbf Centralise fetching of overlay component titles and textures 2020-09-03 16:34:58 +09:00
Dean Herbert
19de6124b6
Merge pull request #10026 from peppy/update-framework 2020-09-03 16:10:43 +09:00
Dean Herbert
4c011a88ce
Merge branch 'master' into update-framework 2020-09-03 15:08:18 +09:00
Dean Herbert
fe524ec491 Merge branch 'master' into update-framework 2020-09-03 14:58:32 +09:00
Dean Herbert
0530c4b8a7 Update framework 2020-09-03 14:58:22 +09:00
Dan Balasescu
cf89a6e1a4
Merge pull request #10043 from peppy/better-outro-music-fade
Improve music fade on game exit
2020-09-03 14:24:46 +09:00
Dan Balasescu
12b43e1d5c
Merge pull request #10019 from Game4all/game-overlay-activation-mode
Add a bindable to OsuScreen to allow dynamically changing its OverlayActivation mode
2020-09-03 14:03:41 +09:00
Dan Balasescu
84b3604192
Merge branch 'master' into game-overlay-activation-mode 2020-09-03 13:34:22 +09:00
Dean Herbert
2f42c57f4b Add safeties to ensure the current track doesn't loop or change 2020-09-03 13:15:23 +09:00
Dean Herbert
547c8090e5 Improve game exit music fade 2020-09-03 13:15:23 +09:00
Dan Balasescu
d8a25f5247
Merge pull request #10038 from peppy/fade-between-audio-tracks
Add smooth fading between audio tracks on transition
2020-09-03 13:14:43 +09:00
Lucas A
754274a146 Fix and add XMLDoc 2020-09-02 20:55:26 +02:00
Lucas A
3fc6a74fdf Expose an immutable bindable in interface. 2020-09-02 19:55:46 +02:00
Dean Herbert
6a765d2d76 Add smooth fading between audio tracks on transition 2020-09-02 20:04:56 +09:00
Dean Herbert
05cc22d441
Merge pull request #10037 from peppy/tournament-bracket-editor-empty-ux 2020-09-02 16:27:59 +09:00
Dean Herbert
ee0d7b5217
Merge pull request #9792 from smoogipoo/beatmap-track-rework 2020-09-02 15:59:12 +09:00
Dean Herbert
c964e4036e Merge branch 'master' into update-framework 2020-09-02 15:49:19 +09:00
Dean Herbert
249ae5df1b
Merge branch 'master' into beatmap-track-rework 2020-09-02 15:24:46 +09:00
smoogipoo
555b2196b7 Add xmldoc to MusicController.ResetTrackAdjustments() 2020-09-02 15:23:50 +09:00
Dean Herbert
5195da3ceb Add message box in bracket editor explaining how to get started 2020-09-02 15:18:51 +09:00
smoogipoo
bff652a26f Persist nulls to the top score bindable 2020-09-02 14:29:46 +09:00
smoogipoo
7a6e02c558 Allow null rank 2020-09-02 14:28:31 +09:00
smoogipoo
f793bf66e5 Remove rate adjustment from player test scene 2020-09-02 14:25:24 +09:00
Dean Herbert
dda776d15f
Merge pull request #10036 from smoogipoo/fix-tourney-nullref 2020-09-02 13:52:53 +09:00
smoogipoo
8f90cc1820 Add test 2020-09-02 13:21:51 +09:00
smoogipoo
8bf679db8b Fix nullref in date text box 2020-09-02 13:17:17 +09:00
Dean Herbert
73796fbf33
Merge pull request #10031 from ppy/dependabot/nuget/Sentry-2.1.6
Bump Sentry from 2.1.5 to 2.1.6
2020-09-02 10:51:34 +09:00
Dean Herbert
6c19ef02bc
Merge pull request #10032 from ppy/dependabot/nuget/Microsoft.Build.Traversal-2.1.1
Bump Microsoft.Build.Traversal from 2.0.52 to 2.1.1
2020-09-02 10:51:25 +09:00
Dean Herbert
75aa67b6e9
Merge pull request #10033 from ppy/dependabot/nuget/Microsoft.NET.Test.Sdk-16.7.1
Bump Microsoft.NET.Test.Sdk from 16.7.0 to 16.7.1
2020-09-02 10:51:03 +09:00
dependabot-preview[bot]
66c0d12da6
Bump Microsoft.NET.Test.Sdk from 16.7.0 to 16.7.1
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.0 to 16.7.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.7.0...v16.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-01 17:19:46 +00:00
dependabot-preview[bot]
846189659b
Bump Microsoft.Build.Traversal from 2.0.52 to 2.1.1
Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.0.52 to 2.1.1.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.0.52...Microsoft.Build.Traversal.2.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-01 17:19:29 +00:00
dependabot-preview[bot]
112ecf085d
Bump Sentry from 2.1.5 to 2.1.6
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.5...2.1.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-01 17:19:04 +00:00
smoogipoo
7e1844ed77 Fix track adjusments being reset incorrectly 2020-09-01 18:07:19 +09:00
smoogipoo
26b4226b55 Fix ModTimeRamp not working 2020-09-01 16:55:10 +09:00
Dean Herbert
9dca25bd58
Merge pull request #10027 from peppy/fix-editor-zoom-bounds 2020-09-01 16:12:36 +09:00