|
|
152475858b
|
Merge branch 'master' into fix-downloads-during-import
|
2018-01-22 14:25:24 +09:00 |
|
|
|
20be4bbbcd
|
Merge branch 'master' into better-direct-progress-bar
|
2018-01-22 14:25:23 +09:00 |
|
|
|
3d4e2d400c
|
Remove unused using
|
2018-01-22 13:52:10 +09:00 |
|
|
|
53e40a77dc
|
Don't show error messages when a download is user-cancelled
Resolves #1941.
|
2018-01-22 13:25:49 +09:00 |
|
|
|
88beee2d1f
|
Keep downloads active until their associated import operation finishes
This avoids race conditions where a second download can potentially be started while the first is still active.
|
2018-01-22 13:20:04 +09:00 |
|
|
|
9ac035f3d5
|
Merge branch 'bdl-cache-changes' into ruleset-configs
|
2018-01-22 13:11:45 +09:00 |
|
|
|
060d80efbe
|
Continue showing progress bar on direct panels when importing
Previously the progrress bar would fade out once downloads completed, which felt unintuitive.
|
2018-01-22 13:05:07 +09:00 |
|
|
|
b4e1872322
|
osu!-side changes in-line with framework BDL cache changes
|
2018-01-22 12:56:30 +09:00 |
|
|
|
4875443e12
|
Resolve merge conflicts
|
2018-01-21 18:11:43 +03:00 |
|
|
|
596044e19d
|
show beatmapsets with pending deletion in osu!direct
|
2018-01-19 17:25:32 +01:00 |
|
|
|
feb79ff9e7
|
Merge branch 'master' into mania_stage_fix
|
2018-01-19 20:08:24 +08:00 |
|
|
|
652f273961
|
Ensure previews stop playing when they are removed from the draw hierarchy
|
2018-01-19 15:46:42 +09:00 |
|
|
|
250e936099
|
Merge branch 'master' into preview-fixes
|
2018-01-19 00:03:47 +09:00 |
|
|
|
56619ae926
|
use ternary expression
|
2018-01-18 15:53:53 +01:00 |
|
|
|
a94ea7025e
|
Register/Unregister -> BeginTracking/StopTracking and add exceptions
|
2018-01-18 18:45:48 +09:00 |
|
|
|
dee298c395
|
No more statics + better unregistration
|
2018-01-18 17:40:05 +09:00 |
|
|
|
7ceed8b5eb
|
Stop any playing preview when closing the direct overlay
Resolves #1925
|
2018-01-18 17:28:56 +09:00 |
|
|
|
7910b47868
|
Move ConfigManager registration/dependency injection to RulesetContainer
|
2018-01-18 17:00:23 +09:00 |
|
|
|
c2c478750d
|
Remove generics from OSD registration methods
|
2018-01-18 16:57:32 +09:00 |
|
|
|
09dfea7e29
|
Use tracked settings from ConfigManager changes
|
2018-01-18 15:26:03 +09:00 |
|
|
|
65bac6d31a
|
return preview instead of nothing if it exists already
allows listening to it again after reaching the end
|
2018-01-17 20:36:47 +01:00 |
|
|
|
f86cb30e47
|
prevent negative width on progress bar
|
2018-01-17 20:35:28 +01:00 |
|
|
|
6c67f96fdb
|
fix ci error
|
2018-01-18 02:01:01 +09:00 |
|
|
|
864d106635
|
Merge branch 'master' into fix-replays
|
2018-01-18 00:49:02 +09:00 |
|
|
|
a05032779f
|
Remove unneeded event binding
|
2018-01-18 00:04:33 +09:00 |
|
|
|
3b291abf60
|
Merge branch 'master' of https://github.com/ppy/osu into mania_stage_fix
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game/Rulesets/UI/Playfield.cs
|
2018-01-17 22:27:32 +09:00 |
|
|
|
c79603290d
|
Move TriggerChange to LoadComplete()
|
2018-01-17 21:52:57 +09:00 |
|
|
|
e7524445ee
|
Use Restart()
|
2018-01-17 21:33:19 +09:00 |
|
|
|
54ed608ddb
|
Mute global track volume when a beatmap preview is playing
|
2018-01-17 21:26:12 +09:00 |
|
|
|
d96234bf40
|
Enforce that there's only one configmanager per ruleset
|
2018-01-17 21:08:23 +09:00 |
|
|
|
92da02db87
|
Add extension to filename
|
2018-01-17 21:07:37 +09:00 |
|
|
|
9f4ebad6e3
|
Add mania config manager
|
2018-01-17 20:21:25 +09:00 |
|
|
|
379688e2f2
|
Add todo
|
2018-01-17 20:15:17 +09:00 |
|
|
|
da22b3ec49
|
No more sorting
|
2018-01-17 20:12:39 +09:00 |
|
|
|
0b7e1ce667
|
Add a way to have ruleset-specific configs
|
2018-01-17 19:45:18 +09:00 |
|
|
|
be225eff90
|
Merge branch 'master' into fix-replays
|
2018-01-17 18:01:41 +09:00 |
|
|
|
a01e46bb68
|
Fix ScoreStore replays not getting users
|
2018-01-17 17:55:55 +09:00 |
|
|
|
2ebb3d6e0e
|
Fix ReplayLoader not being treated as having a replay loaded
Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.
|
2018-01-17 17:37:14 +09:00 |
|
|
|
52b48f2b7e
|
Fix replays not correctly considering negative time diffs
|
2018-01-17 15:23:07 +09:00 |
|
|
|
5212194e3f
|
Merge remote-tracking branch 'ppy/master' into fix-cursor-hiding
|
2018-01-17 00:44:42 +09:00 |
|
|
|
5e1cd8ddc4
|
Apply conditionals directly rather than using an in-between property
|
2018-01-16 20:34:40 +09:00 |
|
|
|
e7a0a02466
|
Don't limit keyboard input based on menu button scale
|
2018-01-16 20:34:40 +09:00 |
|
|
|
39af9321cf
|
Remove unnecessary overrides
|
2018-01-16 20:34:40 +09:00 |
|
|
|
02564db43f
|
Merge remote-tracking branch 'origin/master' into fix-cursor-hiding
|
2018-01-16 20:20:47 +09:00 |
|
|
|
9b33499fe7
|
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
|
2018-01-16 20:04:34 +09:00 |
|
|
|
d8275c4f9b
|
Fix beatmap query not including beatmap files
|
2018-01-16 18:20:46 +09:00 |
|
|
|
5edff5c5fc
|
Merge branch 'master' into fix-cursor-hiding
|
2018-01-16 18:15:22 +09:00 |
|
|
|
56df27fcc2
|
Merge branch 'master' into fix-event-bindings
|
2018-01-16 17:49:01 +09:00 |
|
|
|
976f7cec39
|
Merge branch 'master' into playfield-judgements
|
2018-01-16 15:26:13 +09:00 |
|
|
|
807e455a58
|
Merge branch 'master' into more-nested-playfields
|
2018-01-16 14:50:09 +09:00 |
|
