Dean Herbert
95f941163b
Merge branch 'master' into direct-show-deleted-sets
2018-01-22 17:08:10 +09:00
Dan Balasescu
73799832ef
Merge branch 'master' into direct-show-deleted-sets
2018-01-22 16:54:32 +09:00
Dean Herbert
a931d6e381
Merge branch 'master' into fix-user-download-cancel
2018-01-22 16:27:26 +09:00
Aergwyn
82c8822888
we need to go back
...
reverted change and instead check `DeletePending` when retrieving existing online IDs
2018-01-22 08:04:14 +01:00
Dean Herbert
56c001fd29
Merge branch 'master' into fix-downloads-during-import
2018-01-22 15:43:39 +09:00
Dan Balasescu
152475858b
Merge branch 'master' into fix-downloads-during-import
2018-01-22 14:25:24 +09:00
Dan Balasescu
20be4bbbcd
Merge branch 'master' into better-direct-progress-bar
2018-01-22 14:25:23 +09:00
Dean Herbert
3d4e2d400c
Remove unused using
2018-01-22 13:52:10 +09:00
Dean Herbert
53e40a77dc
Don't show error messages when a download is user-cancelled
...
Resolves #1941 .
2018-01-22 13:25:49 +09:00
Dean Herbert
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
Dean Herbert
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
Aergwyn
596044e19d
show beatmapsets with pending deletion in osu!direct
2018-01-19 17:25:32 +01:00
Dean Herbert
652f273961
Ensure previews stop playing when they are removed from the draw hierarchy
2018-01-19 15:46:42 +09:00
Dan Balasescu
250e936099
Merge branch 'master' into preview-fixes
2018-01-19 00:03:47 +09:00
Aergwyn
56619ae926
use ternary expression
2018-01-18 15:53:53 +01:00
Dean Herbert
7ceed8b5eb
Stop any playing preview when closing the direct overlay
...
Resolves #1925
2018-01-18 17:28:56 +09:00
Aergwyn
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
Aergwyn
f86cb30e47
prevent negative width on progress bar
2018-01-17 20:35:28 +01:00
Dean Herbert
864d106635
Merge branch 'master' into fix-replays
2018-01-18 00:49:02 +09:00
smoogipoo
a05032779f
Remove unneeded event binding
2018-01-18 00:04:33 +09:00
smoogipoo
c79603290d
Move TriggerChange to LoadComplete()
2018-01-17 21:52:57 +09:00
Dean Herbert
e7524445ee
Use Restart()
2018-01-17 21:33:19 +09:00
Dean Herbert
54ed608ddb
Mute global track volume when a beatmap preview is playing
2018-01-17 21:26:12 +09:00
smoogipoo
379688e2f2
Add todo
2018-01-17 20:15:17 +09:00
smoogipoo
da22b3ec49
No more sorting
2018-01-17 20:12:39 +09:00
Dan Balasescu
be225eff90
Merge branch 'master' into fix-replays
2018-01-17 18:01:41 +09:00
smoogipoo
a01e46bb68
Fix ScoreStore replays not getting users
2018-01-17 17:55:55 +09:00
smoogipoo
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
smoogipoo
52b48f2b7e
Fix replays not correctly considering negative time diffs
2018-01-17 15:23:07 +09:00
Dean Herbert
5212194e3f
Merge remote-tracking branch 'ppy/master' into fix-cursor-hiding
2018-01-17 00:44:42 +09:00
Dean Herbert
5e1cd8ddc4
Apply conditionals directly rather than using an in-between property
2018-01-16 20:34:40 +09:00
Dean Herbert
e7a0a02466
Don't limit keyboard input based on menu button scale
2018-01-16 20:34:40 +09:00
Dean Herbert
39af9321cf
Remove unnecessary overrides
2018-01-16 20:34:40 +09:00
smoogipoo
02564db43f
Merge remote-tracking branch 'origin/master' into fix-cursor-hiding
2018-01-16 20:20:47 +09:00
Dean Herbert
9b33499fe7
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
2018-01-16 20:04:34 +09:00
smoogipoo
d8275c4f9b
Fix beatmap query not including beatmap files
2018-01-16 18:20:46 +09:00
Dean Herbert
5edff5c5fc
Merge branch 'master' into fix-cursor-hiding
2018-01-16 18:15:22 +09:00
Dean Herbert
56df27fcc2
Merge branch 'master' into fix-event-bindings
2018-01-16 17:49:01 +09:00
Dean Herbert
976f7cec39
Merge branch 'master' into playfield-judgements
2018-01-16 15:26:13 +09:00
Dean Herbert
807e455a58
Merge branch 'master' into more-nested-playfields
2018-01-16 14:50:09 +09:00
smoogipoo
0459f0a069
Invert CanShowCursor conditional to fix cursor not showing in VisualTests
2018-01-16 13:40:02 +09:00
Dan Balasescu
480a75b8d9
Merge branch 'master' into hr-crashing-game
2018-01-16 13:18:02 +09:00
TocoToucan
c3ca40dcff
Local functions related CI fixes
2018-01-15 23:27:00 +03:00
TocoToucan
3c11978cfa
Use local functions
2018-01-15 21:42:17 +03:00
aQaTL
65ecc18141
Cap ApproachRate in HardRock mod at 10.0f
2018-01-15 16:11:00 +01:00
smoogipoo
8c5ef0a330
Remove base OnJudgement from Playfield to properly accomodate nested playfields
2018-01-15 20:48:57 +09:00
smoogipoo
c32ff9c43b
Move nested playfields to the base Playfield
2018-01-15 20:39:57 +09:00
smoogipoo
0ae0dac192
Fix DrawableHitObject not binding nested hitobject events
2018-01-15 20:35:38 +09:00
Dean Herbert
053a29f9a7
Make judgements visually smaller
...
This is a temporary change based on people's feedback. Makes judgements feel a lot better.
nb: This is one of my changes that I've had deployed sinfce the end-of-year 2017 build.
2018-01-15 17:41:17 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering
2018-01-15 15:54:18 +09:00
