Andrei Zavatski
|
3227dc87fb
|
Don't use CancelDelayedTasks to avoid cancelling unwanted tasks
|
2019-09-06 22:56:46 +03:00 |
|
Andrei Zavatski
|
157502339e
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into friends-sorting
|
2019-09-06 22:30:10 +03:00 |
|
Dan Balasescu
|
f51ff55328
|
Merge pull request #6020 from peppy/volume-at-pause
Allow global actions to propagate through pause screen
|
2019-09-06 20:03:52 +09:00 |
|
Dan Balasescu
|
f47f0e797c
|
Merge branch 'master' into volume-at-pause
|
2019-09-06 19:47:37 +09:00 |
|
Dan Balasescu
|
ae083ccc1f
|
Merge pull request #6022 from peppy/fix-drag-out-chat
Fix dragging from inside to outside an overlay incorrectly hiding
|
2019-09-06 19:45:36 +09:00 |
|
Dean Herbert
|
95baae5088
|
Fix dragging from inside to outside an overlay incorrectly hiding
|
2019-09-06 18:27:54 +09:00 |
|
Dean Herbert
|
88d0756107
|
Allow global actions to propagate through pause screen
|
2019-09-06 17:17:30 +09:00 |
|
Dean Herbert
|
e5c3a906d7
|
Merge pull request #5637 from iiSaLMaN/stop-counting-to-score-after-fail
Disallow adding to score after the player has failed
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-09-06 17:11:26 +09:00 |
|
Dean Herbert
|
b89fb5cdf7
|
Fix failing test
|
2019-09-06 16:51:30 +09:00 |
|
Dean Herbert
|
6ce36bd39e
|
Merge branch 'master' into stop-counting-to-score-after-fail
|
2019-09-06 16:12:53 +09:00 |
|
Dean Herbert
|
a50284a5eb
|
Merge pull request #6019 from peppy/hit-window-refactor
Refactor HitWindows for legibility
|
2019-09-06 16:10:04 +09:00 |
|
Dean Herbert
|
75476df1af
|
Use float types for chat overlay height (#5960)
Use float types for chat overlay height
|
2019-09-06 16:08:16 +09:00 |
|
Dean Herbert
|
985375d1c6
|
Remove private field xmldoc
|
2019-09-06 15:47:01 +09:00 |
|
Dean Herbert
|
b3f61abd49
|
Use float types for cursor sizes (#5958)
Use float types for cursor sizes
|
2019-09-06 15:45:44 +09:00 |
|
Dean Herbert
|
4a1c90a048
|
Remove judgementOccurred from DrawableHitObject (#5986)
Remove judgementOccurred from DrawableHitObject
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-09-06 15:42:37 +09:00 |
|
Dean Herbert
|
4031f51745
|
More permissive IsHitResultAllow by default
|
2019-09-06 15:37:30 +09:00 |
|
Dean Herbert
|
6cdc87bd29
|
Fix allowed results omissions
|
2019-09-06 15:37:20 +09:00 |
|
Dean Herbert
|
c379480e7b
|
Merge branch 'master' into remove-judgement-occurred
|
2019-09-06 15:32:34 +09:00 |
|
Dean Herbert
|
f925e781a9
|
Refactor HitWindows for legibility
|
2019-09-06 15:24:14 +09:00 |
|
Dean Herbert
|
fbdef97498
|
Fix fallback to default combo colours not working (#6009)
Fix fallback to default combo colours not working
|
2019-09-06 12:36:39 +09:00 |
|
Dean Herbert
|
404ad3834d
|
Merge pull request #6008 from peppy/fix-sample-fallback
Add back missing sample fallback to default skin
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-09-06 12:36:31 +09:00 |
|
Dean Herbert
|
e1c50da05e
|
Merge pull request #6018 from ppy/dependabot/nuget/Humanizer-2.7.2
Bump Humanizer from 2.6.2 to 2.7.2
|
2019-09-06 12:18:01 +09:00 |
|
Dean Herbert
|
f4f9519761
|
Add todo comment
|
2019-09-06 12:16:20 +09:00 |
|
Dean Herbert
|
bf6f803e69
|
Nest temporary class
|
2019-09-06 12:12:27 +09:00 |
|
Dean Herbert
|
7d1f5310d2
|
Don't implement anything
|
2019-09-06 12:03:29 +09:00 |
|
dependabot-preview[bot]
|
43aed7fea7
|
Bump Humanizer from 2.6.2 to 2.7.2
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.6.2 to 2.7.2.
- [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.6.2...v2.7.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-09-06 02:58:58 +00:00 |
|
Dan Balasescu
|
5dbdce17a7
|
Merge branch 'master' into fix-sample-fallback
|
2019-09-06 11:27:39 +09:00 |
|
Dan Balasescu
|
d1f04639fc
|
Merge pull request #6010 from peppy/fix-config-disposal
Dispose config managers ahead of time to avoid database errors
|
2019-09-06 11:24:54 +09:00 |
|
Dean Herbert
|
50985d1b1d
|
Fix disposal logic
|
2019-09-06 10:43:19 +09:00 |
|
Dean Herbert
|
d6cdde552d
|
Add comment explaining dispose logic
|
2019-09-06 01:14:37 +09:00 |
|
Dean Herbert
|
5b094f8e1d
|
Actually register the RulesetConfigCache as a component
|
2019-09-06 01:13:58 +09:00 |
|
Dean Herbert
|
dafe9da851
|
Dispose config managers ahead of time to avoid database errors
|
2019-09-06 00:22:35 +09:00 |
|
Dean Herbert
|
a0aeccf232
|
Fix fallback to default combo colours not working
|
2019-09-05 23:24:13 +09:00 |
|
Dean Herbert
|
60c2d113b8
|
Fix typo
|
2019-09-05 23:07:03 +09:00 |
|
Dean Herbert
|
0a6c42972c
|
Add back missing sample fallback to default skin
|
2019-09-05 23:01:35 +09:00 |
|
Dean Herbert
|
9d0151f19f
|
Merge pull request #5969 from peppy/skin-configuration-refactor
Refactor skin configuration lookups to be more flexible
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-09-05 17:28:37 +09:00 |
|
Dean Herbert
|
986ac08397
|
Fix pause menu keyboard navigation being affected by initial cu… (#6002)
Fix pause menu keyboard navigation being affected by initial cursor hover
|
2019-09-05 17:27:48 +09:00 |
|
smoogipoo
|
90985b6af6
|
Add missing license header
|
2019-09-05 17:01:14 +09:00 |
|
Dan Balasescu
|
f729282c73
|
Merge branch 'master' into skin-configuration-refactor
|
2019-09-05 16:56:05 +09:00 |
|
smoogipoo
|
8e204ba2e9
|
Refactor tests
|
2019-09-05 16:55:28 +09:00 |
|
Dean Herbert
|
3c1a95d486
|
Don't redraw certain buffered containers on scale change (#5987)
Don't redraw certain buffered containers on scale change
|
2019-09-05 16:54:16 +09:00 |
|
Dean Herbert
|
696802e674
|
Don't use in music player for now
|
2019-09-05 16:52:53 +09:00 |
|
smoogipoo
|
bda21998c4
|
Add helper method to make direct casts be used
|
2019-09-05 16:48:56 +09:00 |
|
Dean Herbert
|
174f8ddb31
|
Remove incorrect usages
|
2019-09-05 16:37:47 +09:00 |
|
Dean Herbert
|
55c6feab64
|
Update framework
|
2019-09-05 16:33:14 +09:00 |
|
Dean Herbert
|
a1d7291ffa
|
Fix pause menu keyboard navigation being affected by initial cursor hover
|
2019-09-05 16:31:10 +09:00 |
|
Dean Herbert
|
c2d48656be
|
Use DummyAPIAccess for non-online tests (#5550)
Use DummyAPIAccess for non-online tests
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-09-05 14:43:58 +09:00 |
|
smoogipoo
|
99579255ad
|
Force glowing sprite text to never redraw
|
2019-09-05 14:41:02 +09:00 |
|
Dean Herbert
|
c0bcbfd892
|
Merge branch 'master'
Conflicts:
osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
|
2019-09-05 14:40:30 +09:00 |
|
smoogipoo
|
2e6af84ca8
|
Don't redraw leaderboard scores
|
2019-09-05 14:39:02 +09:00 |
|