1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 18:47:27 +08:00
Commit Graph

29629 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
smoogipoo
0107e9ba16 Change lookups to use SingleOrDefault() 2020-06-05 19:18:00 +09:00
smoogipoo
caf94df0d0 Merge branch 'master' into multiplayer-beatmap-checksum 2020-06-05 19:16:05 +09:00
Bartłomiej Dach
896177801a Avoid creating copies of node samples every time 2020-06-05 00:07:27 +02:00
Bartłomiej Dach
4c6116e6e7 Fix compilation failure in Android test project 2020-06-04 23:50:58 +02:00
Bartłomiej Dach
c4cae006aa Correctly slice node sample list when converting 2020-06-04 22:47:39 +02:00
Bartłomiej Dach
ac019bddd6 Only play samples at start of hold note in mania maps 2020-06-04 22:33:34 +02:00
Bartłomiej Dach
35544ede50 Add failing test cases 2020-06-04 22:33:30 +02:00
Bartłomiej Dach
6b88141e58 Add mania sample conversion test 2020-06-04 21:53:37 +02:00
Dean Herbert
5d1770dec8
Merge pull request #9212 from smoogipoo/fix-scorepanel-input
Fix score panel not receiving input in some places
2020-06-05 00:26:02 +09:00
Dean Herbert
bd2e4c50dd
Merge pull request #9211 from smoogipoo/change-date-format
Change format of date on score panel
2020-06-04 23:31:28 +09:00
Dean Herbert
2ec7059ac4
Merge pull request #9213 from smoogipoo/fix-keybinding-crash
Fix crash when double-clicking clear binding button
2020-06-04 23:31:02 +09:00
smoogipoo
9c1542f897 Fix crash when pressing clear button twice 2020-06-04 22:17:00 +09:00
smoogipoo
afcefe01bf Fix score panel not receiving input in some places 2020-06-04 21:48:55 +09:00
smoogipoo
5d7bb8cb4e Change format of date on score panel 2020-06-04 21:33:38 +09:00
Bartłomiej Dach
af3daaaeaf Add reference to contributing guidelines in README 2020-06-03 23:44:02 +02:00
Bartłomiej Dach
ddf5282d0e Move items from README.md to contributing guidelines 2020-06-03 23:44:02 +02:00
Bartłomiej Dach
c2fd2b8616 Add notes about draft PRs & pushing 2020-06-03 23:43:32 +02:00
Bartłomiej Dach
8529486a5c Merge branch 'master' into contributing-guidelines 2020-06-03 23:09:35 +02:00
Dean Herbert
66ec2afe5c Remove broken import test 2020-06-03 23:38:40 +09:00
Dean Herbert
5ed3cd205f Simplify reuse check using FileInfo IDs 2020-06-03 23:35:56 +09:00
Dan Balasescu
c4698e61ec
Merge pull request #9195 from peppy/fix-multi-chat-history
Fix chat history not being loaded for multiplayer matches
2020-06-03 22:49:27 +09:00
Dean Herbert
f6d9f0597b Add implicit join logic for multiplayer rooms 2020-06-03 21:28:29 +09:00
Dean Herbert
25160dc220 Fix test name 2020-06-03 19:15:52 +09:00
Dean Herbert
012933545e Add test coverage 2020-06-03 18:33:41 +09:00
Dean Herbert
c155ab8339 Check filenames and timestamps before reusing an already imported model 2020-06-03 18:03:10 +09:00
Dean Herbert
3c7e5a5b42 Fix ChannelManager not being loaded in tests 2020-06-03 18:00:31 +09:00
Dean Herbert
1ba3f0ac14 Fix chat history not being loaded for multiplayer matches 2020-06-03 17:31:55 +09:00