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

29828 Commits

Author SHA1 Message Date
Dean Herbert
add1265d53 Block screen suspend while gameplay is active 2020-06-18 23:48:00 +09:00
Dan Balasescu
26ea75519c
Merge pull request #9299 from peppy/fix-android-build-number-parsing
Fix regression in android build parsing behaviour
2020-06-16 21:28:16 +09:00
Dan Balasescu
c5358cbb6b
Remove blank line 2020-06-16 21:01:10 +09:00
Dean Herbert
115ea244be Add note about substring usage 2020-06-16 20:20:46 +09:00
Dean Herbert
3f1b9edabe Fix regression in android build parsing behaviour 2020-06-16 20:19:56 +09:00
Dan Balasescu
66544aa72a
Merge pull request #9293 from peppy/update-framework
Update framework
2020-06-16 17:53:43 +09:00
Dean Herbert
c3d4ffed00 Update framework 2020-06-16 16:46:33 +09:00
Dean Herbert
8f7f6881d3 Merge branch 'master' into update-framework 2020-06-16 16:46:22 +09:00
Dean Herbert
c79d8a4251 Update ChannelTabControl in line with TabControl changes 2020-06-16 00:18:09 +09:00
Dan Balasescu
6db585f2bf
Merge pull request #9292 from peppy/score-results-screen
Load imported replays to results screen rather than gameplay
2020-06-15 23:26:20 +09:00
Dan Balasescu
b4dfd2bbaa
Merge branch 'master' into score-results-screen 2020-06-15 22:58:33 +09:00
Dan Balasescu
84596a166b
Merge pull request #8965 from Craftplacer/update-button
Add "Check for updates" button
2020-06-15 22:55:04 +09:00
Dean Herbert
97067976f7 Add null check 2020-06-15 22:23:06 +09:00
Dean Herbert
53b7057ee0 Don't show update button when updates are not feasible 2020-06-15 22:19:11 +09:00
Dean Herbert
d2155c3da3 Fix thread safety 2020-06-15 22:19:02 +09:00
Dean Herbert
2a6faf6a8e Merge branch 'master' into update-button 2020-06-15 22:06:02 +09:00
Dean Herbert
1ce374ae2f Update framework 2020-06-15 20:34:46 +09:00
Dean Herbert
17a70bf6ee Add test coverage 2020-06-15 20:32:27 +09:00
Dean Herbert
90d69c1216 Allow legacy score to be constructed even if replay file is missing 2020-06-15 20:31:47 +09:00
Dean Herbert
c3c5a99a22 Load imported scores to results screen rather than gameplay 2020-06-15 20:23:35 +09:00
Dan Balasescu
83f26bcb81
Merge pull request #8709 from frenzibyte/cache-ruleset-dependencies-for-tests
Cache ruleset dependencies for test scenes that require it
2020-06-15 20:17:11 +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
Dan Balasescu
dadbcfd9f2
Merge branch 'master' into cache-ruleset-dependencies-for-tests 2020-06-15 19:32:31 +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
Salman Ahmed
f14774e795
Rename to TestSceneRulesetDependencies, mark as headless and avoid throwing
Avoid throw not implemented exceptions from TestRuleset since it's now set as the global ruleset bindable automatically by base, throwing to innocent components is probably not needed.
2020-06-15 11:49:50 +03:00
Salman Ahmed
eb64c4752c
Merge remote-tracking branch 'upstream/master' into cache-ruleset-dependencies-for-tests 2020-06-15 11:31:12 +03:00
Salman Ahmed
60381d5817
Remove IRulesetTestScene and use OsuTestScene.CreateRuleset() instead 2020-06-15 11:30:48 +03: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