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

29681 Commits

Author SHA1 Message Date
Jack Boswell
eb3eb70a65
Merge branch 'master' into rebind-song-select 2020-06-10 22:03:26 +12:00
Jack Boswell (boswelja)
9dc1eab6ae Improve code readability of FooterButtonRandom OnPressed 2020-06-10 13:05:11 +12:00
Dean Herbert
969d0b7228
Merge pull request #9193 from peppy/update-inspectcode-version
Update inspectcode / CodeFileSanity versions used in CI
2020-06-10 09:38:10 +09:00
Dean Herbert
3ae1df07b0 Fix a couple more new formatting issues 2020-06-10 00:09:29 +09:00
Dean Herbert
880a127228 Use async overload 2020-06-10 00:08:48 +09:00
Dean Herbert
7dc19220e5 Apply new resharper formatting fixes 2020-06-09 23:38:54 +09:00
Dean Herbert
7274213cce Update framework 2020-06-09 23:30:42 +09:00
smoogipoo
ab10732a78 Remove usages of null-forgiving operator 2020-06-09 22:13:48 +09:00
smoogipoo
88aed1d504 Merge branch 'master' into update-inspectcode-version 2020-06-09 20:12:39 +09:00
Dan Balasescu
527577d7c3
Merge pull request #9236 from MiraiSubject/logovisualisation-subclass
Move user and skin specific settings for LogoVisualisation to a subclass
2020-06-09 19:16:24 +09:00
Dan Balasescu
0d83b0f50a
Merge pull request #9210 from peppy/fix-tourney-beatmap-change-ooo
Fix tournament displayed beatmap potentially being out of order on quick changes
2020-06-09 19:15:59 +09:00
Dan Balasescu
79434c6f70
Merge branch 'master' into fix-tourney-beatmap-change-ooo 2020-06-09 15:31:28 +09:00
Dean Herbert
e837528ddf
Merge pull request #9231 from peppy/fetch-private-chat-history
Fetch existing private message channels on re-joining
2020-06-09 15:08:22 +09:00
Dan Balasescu
7f72f59307
Merge branch 'master' into fetch-private-chat-history 2020-06-09 14:42:29 +09:00
Dan Balasescu
ad28f84335
Merge pull request #9230 from peppy/startup-safety
Improve handling of missing intro beatmap / files
2020-06-09 14:41:04 +09:00
Dan Balasescu
1476412eaa
Merge branch 'master' into startup-safety 2020-06-09 13:55:33 +09:00
Dean Herbert
e06e9a8bc5
Merge pull request #9217 from smoogipoo/multi-room-load-spinner
Show a loading spinner on multiplayer lounge loads
2020-06-09 11:21:43 +09:00
Dean Herbert
9d68a95f3f
Merge branch 'master' into multi-room-load-spinner 2020-06-09 10:56:56 +09:00
Dean Herbert
5fdeeec8df
Merge pull request #9175 from smoogipoo/multiplayer-beatmap-checksum
Add timeshift beatmap checksum validation
2020-06-09 10:53:33 +09:00
Shivam
a60bb5feac Rename baseclass, add xmldoc & change access to internal 2020-06-08 23:45:40 +02:00
Shivam
2a5e960025 Move user and skin specific settings to a subclass 2020-06-08 21:15:51 +02:00
smoogipoo
8a021e0beb Use save method in test 2020-06-08 22:35:01 +09:00
Dean Herbert
e5569ab963
Merge pull request #9233 from ppy/dependabot/nuget/Humanizer-2.8.26
Bump Humanizer from 2.8.11 to 2.8.26
2020-06-08 20:31:10 +09:00
Dean Herbert
1ab78fa8a7
Merge pull request #9234 from ppy/dependabot/nuget/Microsoft.Build.Traversal-2.0.48
Bump Microsoft.Build.Traversal from 2.0.34 to 2.0.48
2020-06-08 20:30:54 +09:00
dependabot-preview[bot]
e0c94304c7
Bump Humanizer from 2.8.11 to 2.8.26
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.11 to 2.8.26.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.8.11...v2.8.26)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-08 09:45:31 +00:00
dependabot-preview[bot]
bbf8864f14
Bump Microsoft.Build.Traversal from 2.0.34 to 2.0.48
Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.0.34 to 2.0.48.
- [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.34...Microsoft.Build.Traversal.2.0.48)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-08 09:45:31 +00:00
Dean Herbert
280592b3a4
Merge pull request #9232 from ppy/dependabot/nuget/Sentry-2.1.3
Bump Sentry from 2.1.1 to 2.1.3
2020-06-08 18:44:14 +09:00
Jack Boswell
49ac16873b
Merge branch 'master' into rebind-song-select 2020-06-08 21:15:34 +12:00
dependabot-preview[bot]
ff555c41c6
Bump Sentry from 2.1.1 to 2.1.3
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.1.1 to 2.1.3.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.1...2.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-08 08:57:44 +00:00
Dean Herbert
712fd6a944 Fetch existing private message channels on re-joining 2020-06-08 17:54:26 +09:00
Dean Herbert
dd61d6ed04 Attempt to reimport intro if a bad state is detected 2020-06-08 14:48:42 +09:00
Dean Herbert
63003757c4 Remove WorkingBeatmap cache when deleting or updating a beatmap 2020-06-08 14:48:26 +09:00
smoogipoo
443977aa8d Remove PreUpdate, update hash in Save() 2020-06-08 14:40:17 +09:00
Jack Boswell (boswelja)
ea9207e0ad Clean up FooterButtonRandom
Removed unnecessary using statements
Removed unnecessary constructor
2020-06-08 17:31:31 +12:00
smoogipoo
dfed27bd46 Add back stream seeking for sanity 2020-06-08 14:24:21 +09:00
Dean Herbert
72ada020a2 Don't attempt to use virtual track for intro sequence clock 2020-06-08 13:42:16 +09:00
Jack Boswell (boswelja)
bddd2b72ba Remove secondaryText and related code from FooterButtonRandom 2020-06-08 15:05:53 +12:00
Dean Herbert
5f6c35a577
Merge pull request #9215 from bdach/hold-note-release-hitsounds
Fix incorrect sample choices for hold notes
2020-06-08 10:51:57 +09:00
Dean Herbert
35574f30e7
Merge branch 'master' into hold-note-release-hitsounds 2020-06-08 10:19:59 +09:00
Dean Herbert
36d318d4dc
Merge pull request #9188 from bdach/contributing-guidelines
Add contributing guidelines
2020-06-07 21:48:04 +09:00
Dean Herbert
b41384dde8
Merge branch 'master' into multiplayer-beatmap-checksum 2020-06-07 18:05:33 +09:00
Jack Boswell
c331575cd0
Merge branch 'master' into rebind-song-select 2020-06-07 20:31:26 +12:00
Jack Boswell (boswelja)
8b7718116d Add missing blank lines 2020-06-07 16:06:18 +12:00
Jack Boswell (boswelja)
7c04e9aca4 Move new GlobalAction keybinding entries to the end of the class.
The new keybindings shouldn't mess with existing bindings anymore
2020-06-07 15:37:19 +12:00
Jack Boswell (boswelja)
0e155c8eb9 Don't switch FooterButtonRandon Action on pressed.
Instead, create a new Action that invokes either NextRandom or PreviousRandom, depending on rewindSearch
2020-06-07 15:34:19 +12:00
Dean Herbert
c3036c1d45
Merge pull request #9197 from peppy/better-reimport-support
Check all files match before using an existing archive model
2020-06-05 22:02:36 +09:00
Dan Balasescu
2ad5b2065f
Merge branch 'master' into better-reimport-support 2020-06-05 20:59:55 +09:00
smoogipoo
bb89114b70 Show a loading spinner on multiplayer lounge loads 2020-06-05 20:52:27 +09:00
Jack Boswell
978380a7fb
Merge branch 'master' into rebind-song-select 2020-06-05 22:35:44 +12:00
smoogipoo
0107e9ba16 Change lookups to use SingleOrDefault() 2020-06-05 19:18:00 +09:00