Salman Ahmed
a42c79895d
Remove unnecessary private field
2019-07-06 18:38:41 +03:00
Dean Herbert
be2d0048db
Merge branch 'master' into buttonsystem-entermode
2019-07-07 00:01:41 +09:00
Dean Herbert
d2d280eb5e
Remove unnecessary fading in UpdateableBeatmapBackgroundSprite ( #5273 )
...
Remove unnecessary fading in UpdateableBeatmapBackgroundSprite
2019-07-06 23:55:16 +09:00
Salman Ahmed
dfabed3d85
Merge branch 'master' into applicable-to-hud
2019-07-06 16:30:02 +03:00
Salman Ahmed
040dbfd2c1
Merge branch 'master' into remove-unnecessary-fading
2019-07-06 15:59:44 +03:00
Dean Herbert
2827149041
Add missing wait step in TestScenePlayerLoader ( #5270 )
...
Add missing wait step in TestScenePlayerLoader
2019-07-06 21:56:17 +09:00
Dean Herbert
ea911b2fd2
Ensure intro restarts track
2019-07-06 19:05:42 +09:00
Dean Herbert
6bee26cfc9
Rename to match
2019-07-06 19:05:37 +09:00
Dean Herbert
58183ad3d5
Change intro test to test full intro screen
2019-07-06 19:05:12 +09:00
iiSaLMaN
6fd3ad5c1d
Remove unnecessary fading
2019-07-06 12:10:30 +03:00
Dean Herbert
64de3840b0
Add missing wait step in TestScenePlayerLoader
2019-07-06 15:25:53 +09:00
Dean Herbert
8aac0ab0ce
Make mods filter on beatmap leaderboards functional ( #5253 )
...
Make mods filter on beatmap leaderboards functional
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-06 14:31:21 +09:00
Dean Herbert
2149d639de
Merge branch 'master' into leaderboard-mod-filter
2019-07-06 13:27:49 +09:00
iiSaLMaN
530e07110f
Use a descriptive name for the setting
2019-07-06 06:32:25 +03:00
Dean Herbert
71e40b4684
Force SQLite to multithreading mode
2019-07-06 12:32:16 +09:00
Dean Herbert
a7977ad557
Allow PlayerLoader to proceed even if the mouse is hovering an… ( #5263 )
...
Allow PlayerLoader to proceed even if the mouse is hovering an overlay panel
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-06 01:06:18 +09:00
Lucas A
5f8bd6eca7
Fix CI issues + minor issues
2019-07-05 16:51:15 +02:00
Dan Balasescu
3a9f16ccf2
Merge branch 'master' into idle-still-starts
2019-07-06 00:08:59 +09:30
Dan Balasescu
b8d3db4d37
Merge pull request #5244 from peppy/changelog-comments
...
Add messaging telling users how to leave changelog comments
2019-07-06 00:08:53 +09:30
Lucas A
89acd9da3e
Add game-wide jukebox keybindings handling to OsuGame
2019-07-05 16:33:13 +02:00
Lucas A
5cad2b2192
Add missing function to MusicController
2019-07-05 16:28:37 +02:00
Lucas A
c9e44e5e34
Add OsdIconToast + test
2019-07-05 16:25:09 +02:00
Lucas A
b5bd863dd0
Add methods to MusicController to play or pause, select next or previous track
2019-07-05 16:21:50 +02:00
Lucas A
70372dd03d
Add global actions for game-wide music jukebox manipulation
2019-07-05 16:14:04 +02:00
Dan Balasescu
f32796db5c
Merge branch 'master' into changelog-comments
2019-07-05 23:42:46 +09:30
Lucas A
df75f9d312
Revert changes made by VS to csproj
2019-07-05 16:08:02 +02:00
Lucas A
bc60b1dc13
Add test for empty OsdToast
2019-07-05 16:04:47 +02:00
Lucas A
4f0429d046
Add OsdTrackedSettingToast
2019-07-05 16:03:46 +02:00
Lucas A
6288cc6e5c
Refactor OnScreenDisplay to allow displaying of custom messages on OSD
2019-07-05 16:03:22 +02:00
Dean Herbert
2432878614
Add local score import from stable ( #5072 )
...
Add local score import from stable
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-05 16:24:39 +09:00
David Zhao
a259247a98
use const
2019-07-05 16:07:17 +09:00
Dean Herbert
598b0d668b
Merge branch 'master' into import-stable-scores
2019-07-05 15:54:33 +09:00
Dean Herbert
2626a26485
Add a check if the locally available score has files ( #5260 )
...
Add a check if the locally available score has files
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-05 15:54:27 +09:00
Dean Herbert
39bd5e6478
Add test
2019-07-05 15:50:31 +09:00
Dean Herbert
b54c0176eb
Merge branch 'master' into disable-own-replays
2019-07-05 15:41:43 +09:00
Dean Herbert
7ce2e1c5ee
Lock WorkingBeatmap cache to avoid threading issues ( #5243 )
...
Lock WorkingBeatmap cache to avoid threading issues
2019-07-05 15:41:35 +09:00
Dean Herbert
b902457f8d
Allow PlayerLoader to proceed even if the mouse is hovering an overlay panel
2019-07-05 15:32:07 +09:00
smoogipoo
5862eb172a
Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders
...
# Conflicts:
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2019-07-05 15:48:04 +09:30
Dean Herbert
49eb8b0b53
Merge branch 'master' into lock-working-cache
2019-07-05 15:14:07 +09:00
Dean Herbert
655e96b2c1
Stop import failures from being added to the imported model list ( #5262 )
...
Stop import failures from being added to the imported model list
2019-07-05 15:13:46 +09:00
smoogipoo
3d12c709a5
Add test case
2019-07-05 15:40:47 +09:30
Dean Herbert
04c0ce1ea3
Merge branch 'master' into import-stable-scores
2019-07-05 14:48:55 +09:00
Dean Herbert
df7d31350c
Stop import failures from being added to the imported model list
2019-07-05 14:47:55 +09:00
Dean Herbert
d5a9542743
Fix incorrect xmldoc in DownloadTrackingComposite ( #5261 )
...
Fix incorrect xmldoc in DownloadTrackingComposite
2019-07-05 14:43:28 +09:00
Dean Herbert
adf6d6c942
Update initial run import process to include scores
2019-07-05 14:25:52 +09:00
Dean Herbert
80d8ce8392
Fix GetStableImportPaths xmldoc
2019-07-05 14:21:56 +09:00
Dean Herbert
87c8fd0035
Fix path specification not being cross-platform compliant
2019-07-05 14:15:29 +09:00
Dean Herbert
99da04527d
Replays -> scores
2019-07-05 14:07:14 +09:00
Dean Herbert
ba8df3ba92
Clean up stable lookup and mutate logic
2019-07-05 13:59:31 +09:00
Dean Herbert
8346c50ce1
Rename delete method and improve xmldoc
2019-07-05 13:55:25 +09:00
