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

29780 Commits

Author SHA1 Message Date
smoogipoo
f9db37a1de Split out types 2020-06-15 21:48:59 +09:00
smoogipoo
41cec2c216 Merge branch 'master' into results-screen-statistics 2020-06-15 20:13:09 +09:00
Dean Herbert
afbc3a87a9
Merge pull request #9291 from smoogipoo/tournament-songbar-temp-fix
Apply temporary fix for tournament song bar disappearance
2020-06-15 19:43:36 +09:00
Dean Herbert
6460d9beab
Merge pull request #9270 from cl8n/genre-language-updates
Add new beatmap genres and languages
2020-06-15 19:22:12 +09:00
smoogipoo
d57b58a7dd Add temporary fix for tournament song bar disappearance 2020-06-15 18:47:55 +09:00
Dean Herbert
ad5bd1f0c0 Update in line with other/unspecified switch
See 289f0f0a20.
2020-06-15 18:45:52 +09:00
Dean Herbert
7e0dc97fb4 Merge branch 'master' into genre-language-updates 2020-06-15 18:45:21 +09:00
Dean Herbert
99121c7316
Merge pull request #9289 from ppy/dependabot/nuget/Microsoft.Build.Traversal-2.0.50
Bump Microsoft.Build.Traversal from 2.0.48 to 2.0.50
2020-06-15 18:41:34 +09:00
dependabot-preview[bot]
f4b57933c3
Bump Microsoft.Build.Traversal from 2.0.48 to 2.0.50
Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.0.48 to 2.0.50.
- [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.48...Microsoft.Build.Traversal.2.0.50)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-15 08:54:34 +00:00
Dan Balasescu
c09868780e
Merge pull request #8778 from frenzibyte/test-scene-create-ruleset
Add method of creating a ruleset for testing with in OsuTestScene
2020-06-15 17:22:54 +09:00
Dean Herbert
7e206ad2bd
Merge pull request #9285 from Joehuu/home-shortcut
Add shortcut to go home
2020-06-15 16:40:38 +09:00
Dan Balasescu
904b688b4b
Merge branch 'master' into test-scene-create-ruleset 2020-06-15 16:40:02 +09:00
Dean Herbert
1770b70b81 Change implementation to ensure flashBackground is not present by default 2020-06-15 16:14:35 +09:00
Dean Herbert
fe62b26d73 Merge branch 'master' into home-shortcut 2020-06-15 15:51:24 +09:00
Dan Balasescu
73ec39307a
Merge pull request #9273 from bdach/fix-double-comments
Fix comments from multiple maps potentially showing on beatmap set overlay
2020-06-15 15:47:28 +09:00
Dean Herbert
92e7ef6ecb
Merge branch 'master' into home-shortcut 2020-06-15 15:34:01 +09:00
Dan Balasescu
9b31f8889b
Merge branch 'master' into fix-double-comments 2020-06-15 15:21:34 +09:00
Joehu
941fdf5e76 Fix flash background naming 2020-06-14 22:16:17 -07:00
Joehu
b41567c66c Split hover and flash to separate boxes 2020-06-14 22:02:21 -07:00
Dan Balasescu
6d38c4003e
Merge pull request #9287 from peppy/fix-zero-time-storyboard-sample
Fix storyboard sample playback failing when expected to play at 0ms
2020-06-15 12:13:08 +09:00
Dan Balasescu
f8badd77d6
Merge pull request #9275 from H2n9/osu-modtimeramp
Add an adjust pitch setting to ModTimeRamp
2020-06-15 11:56:45 +09:00
Dan Balasescu
95d828cb1f
Merge pull request #9282 from peppy/fix-editor-timeline-drag-scroll
Fix drag scroll in editor timeline no longer working correctly
2020-06-15 11:47:09 +09:00
Dan Balasescu
ac414a5db8
Merge pull request #9281 from peppy/fix-gameplay-elapsed-time
Fix gameplay clock not correctly reporting elapsed time
2020-06-15 11:22:55 +09:00
Dan Balasescu
b8bd28b7d9
Merge branch 'master' into osu-modtimeramp 2020-06-15 11:20:28 +09:00
Dean Herbert
fdf7c56ba2 Add test coverage 2020-06-15 11:20:20 +09:00
Dan Balasescu
6948aff16c
Merge pull request #9272 from peppy/fix-local-score-display
Fix crash on local score display
2020-06-15 10:59:34 +09:00
Dean Herbert
978636b90c Fix storyboard sample playback failing when expected to play at 0ms 2020-06-15 09:38:33 +09:00
Joehu
1f7679e829 Fix home button not flashing when pressing shortcut 2020-06-14 11:24:23 -07:00
Joehu
b8fa1a2c41 Add shortcut to go home 2020-06-14 11:22:38 -07:00
Bartłomiej Dach
e6ddd0380e Rename bool arguments for readability 2020-06-14 18:50:07 +02:00
Bartłomiej Dach
5f0a345eeb Unify method naming 2020-06-14 18:48:49 +02:00
Bartłomiej Dach
9907b4763b Remove redundant default argument value 2020-06-14 18:39:41 +02:00
Dean Herbert
0d53d0ffc8 Fix back-to-front math 2020-06-15 00:46:20 +09:00
Dan Balasescu
ae851eacbe
Merge branch 'master' into fix-local-score-display 2020-06-14 14:10:23 +09:00
Dean Herbert
abe07b742e Fix drag scroll in editor timeline no longer working correctly 2020-06-14 13:20:58 +09:00
Dean Herbert
1164a10483 Add test coverage 2020-06-14 11:35:49 +09:00
Dean Herbert
7b95c55afb Fix HardwareCorrectionOffsetClock breaking ElapsedTime readings 2020-06-14 11:33:59 +09:00
Ronnie Moir
dc5bb12fa8 Use local helper for selecting adjusted property 2020-06-13 16:32:43 +01:00
Ronnie Moir
77eb428184 Use consistent setting casing 2020-06-13 16:30:21 +01:00
Ronnie Moir
201bfda338 Give ModTimeRamp an adjust pitch setting.
Implement in ModWindDown and ModWindUp
2020-06-13 15:16:27 +01:00
Dean Herbert
a8e83c5be5
Merge pull request #9264 from mcendu/mania-custom-judgement-sprite-path
Add support for custom file paths for mania hit judgement
2020-06-13 22:03:06 +09:00
Dean Herbert
b9e247da8f Simplify lookup code 2020-06-13 21:19:06 +09:00
Dean Herbert
8402d4a5f3 Remove newline 2020-06-13 21:18:56 +09:00
Bartłomiej Dach
aab606b237 Cancel scheduled asynchronous load of comments 2020-06-13 13:00:05 +02:00
Bartłomiej Dach
e8046654c8 Add failing test case 2020-06-13 12:59:43 +02:00
mcendu
4eeb22ca18 rename a few variables and fix typo 2020-06-13 18:47:40 +08:00
mcendu
5655e090d1 revert movement of is mania skin check statements 2020-06-13 18:45:06 +08:00
Bartłomiej Dach
619c541cf5 Rewrite test to use dummy API 2020-06-13 12:42:06 +02:00
Dean Herbert
c490dba7b3 Fix crash on local score display 2020-06-13 18:18:46 +09:00
Dan Balasescu
dd1fbccdf4
Merge branch 'master' into mania-custom-judgement-sprite-path 2020-06-13 17:34:10 +09:00