Dean Herbert
|
038e49701e
|
Move conditional to within BreakPeriod
|
2019-05-12 16:25:25 +09:00 |
|
Dean Herbert
|
1391aa342c
|
Merge branch 'master' into break-pause
|
2019-05-12 16:15:24 +09:00 |
|
Dean Herbert
|
df4e08dd9b
|
Fix pauses being triggered in unexpected scenarios (#4750)
Fix pauses being triggered in unexpected scenarios
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-12 16:07:37 +09:00 |
|
Dean Herbert
|
3566da73cc
|
Merge branch 'master' into fix-more-pause-cases
|
2019-05-12 15:57:45 +09:00 |
|
Dean Herbert
|
9add2562f9
|
Close beatmap options when suspending (#4761)
Close beatmap options when suspending
|
2019-05-12 15:50:10 +09:00 |
|
Dean Herbert
|
71d3c9c495
|
Fix beatmap carousel overlapping beatmap info wedge (#4760)
Fix beatmap carousel overlapping beatmap info wedge
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-12 15:49:50 +09:00 |
|
Dean Herbert
|
790700d8bf
|
Use more correct calculation
|
2019-05-12 15:40:58 +09:00 |
|
Dean Herbert
|
9925aafa98
|
Merge remote-tracking branch 'upstream/master' into fix-carousel-sizing
|
2019-05-12 15:39:55 +09:00 |
|
Joehu
|
175daac16a
|
Close beatmap options when suspending
|
2019-05-11 21:26:42 -07:00 |
|
Dean Herbert
|
f5d7330a20
|
Fix player loader testcase potentially failing (#4720)
Fix player loader testcase potentially failing
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-12 13:18:38 +09:00 |
|
Joehu
|
29cec54b3c
|
Fix beatmap carousel overlapping beatmap info wedge
|
2019-05-11 20:08:45 -07:00 |
|
smoogipoo
|
bde2d552b6
|
Merge remote-tracking branch 'origin/master' into fix-more-pause-cases
# Conflicts:
# osu.Game.Tests/Visual/Gameplay/TestCasePause.cs
|
2019-05-10 22:16:59 +09:00 |
|
smoogipoo
|
01eb1a34a9
|
Remove unused variable
|
2019-05-10 22:15:33 +09:00 |
|
Dean Herbert
|
ad93eda399
|
Allow song progress bar to show current position during a seek (#4746)
Allow song progress bar to show current position during a seek
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-05-10 21:10:11 +09:00 |
|
Dan Balasescu
|
c157f3e817
|
Merge pull request #4743 from peppy/fix-score-deletion
Fix score deletion not considering ScoreManager ownership
|
2019-05-10 19:25:42 +09:00 |
|
Dan Balasescu
|
4abd5c78cd
|
Merge branch 'master' into fix-score-deletion
|
2019-05-10 19:09:18 +09:00 |
|
Dan Balasescu
|
101889cff9
|
Merge pull request #4753 from peppy/fix-failing-pause-tests
Attempt to fix failing tests by delaying starting of the gameplay clock
|
2019-05-10 19:08:42 +09:00 |
|
smoogipoo
|
3fe61c4a7e
|
Trim whitespace
|
2019-05-10 18:48:39 +09:00 |
|
Dan Balasescu
|
425154c264
|
Merge branch 'master' into progress-bar-show-seek
|
2019-05-10 18:24:15 +09:00 |
|
Dan Balasescu
|
fe7ea1e900
|
Merge branch 'master' into fix-score-deletion
|
2019-05-10 18:24:04 +09:00 |
|
Dean Herbert
|
af3a75307d
|
Merge branch 'master' into fix-failing-pause-tests
|
2019-05-10 18:22:20 +09:00 |
|
Dan Balasescu
|
378f8103fb
|
Merge pull request #4752 from smoogipoo/fix-cancellation-usages
Use nullable cancellation tokens
|
2019-05-10 18:21:53 +09:00 |
|
smoogipoo
|
3352252e00
|
Fix testcase regression
|
2019-05-10 18:21:07 +09:00 |
|
Dean Herbert
|
97796a8578
|
Attempt to fix failing tests by delaying starting of the gameplay clock
|
2019-05-10 18:10:07 +09:00 |
|
smoogipoo
|
d2479acbf2
|
Fix incorrect value being clamped
|
2019-05-10 18:04:58 +09:00 |
|
Dan Balasescu
|
4776fc75b9
|
Merge branch 'master' into fix-score-deletion
|
2019-05-10 18:00:43 +09:00 |
|
smoogipoo
|
ad4b4f3422
|
Use nullable cancellation tokens
|
2019-05-10 17:42:45 +09:00 |
|
Dean Herbert
|
a44296a6db
|
Merge branch 'master' into progress-bar-show-seek
|
2019-05-10 17:27:49 +09:00 |
|
Dean Herbert
|
fdf67aaa11
|
Clamp values
|
2019-05-10 17:18:39 +09:00 |
|
Dean Herbert
|
3860282ace
|
Add cancellation support to storyboard/hitobject loading (#4751)
Add cancellation support to storyboard/hitobject loading
|
2019-05-10 17:15:38 +09:00 |
|
Dean Herbert
|
150b74dc2b
|
Merge branch 'master' into player-load-cancellations
|
2019-05-10 17:15:27 +09:00 |
|
Dean Herbert
|
21ab628f41
|
Merge branch 'master' into player-load-cancellations
|
2019-05-10 16:58:36 +09:00 |
|
smoogipoo
|
f6dfcc4dcf
|
Remove unnecessary Storyboard disposal
|
2019-05-10 16:31:22 +09:00 |
|
smoogipoo
|
d25d39b315
|
Add cancellation to storyboard/hitobject loading
|
2019-05-10 16:31:09 +09:00 |
|
Dan Balasescu
|
03c949c396
|
Merge pull request #4745 from peppy/fix-long-skip-performance
Fix long skip performance
|
2019-05-10 16:27:11 +09:00 |
|
Dan Balasescu
|
32808a8a59
|
Merge branch 'master' into fix-long-skip-performance
|
2019-05-10 16:10:50 +09:00 |
|
smoogipoo
|
6a957ad27f
|
Fix pause triggered when already paused
|
2019-05-10 15:51:12 +09:00 |
|
smoogipoo
|
7c105fd99f
|
Fix testcase players pausing on window unfocus
|
2019-05-10 15:39:25 +09:00 |
|
Dean Herbert
|
3c796bcfda
|
Merge branch 'master' into fix-player-testcase
|
2019-05-10 13:20:22 +09:00 |
|
Dan Balasescu
|
5fa721fdab
|
Merge pull request #4744 from nyquillerium/result-count
Fix incorrect judgement counts for rewinding
|
2019-05-10 12:31:16 +09:00 |
|
David Zhao
|
9480c74fcc
|
Merge remote-tracking branch 'upstream/master' into result-count
|
2019-05-10 11:20:16 +09:00 |
|
David Zhao
|
5c096cbc91
|
Revert mirroring condition too
|
2019-05-09 18:59:00 +09:00 |
|
David Zhao
|
9e0af723cc
|
Split out affectscombo change
|
2019-05-09 18:56:19 +09:00 |
|
Dean Herbert
|
9248e6290c
|
Use FrameStabilityClock to denote current position on song progress
|
2019-05-09 18:09:26 +09:00 |
|
Dean Herbert
|
5942072128
|
Add a tween when clicking to seek
|
2019-05-09 18:07:38 +09:00 |
|
Dean Herbert
|
3bcfc86b9c
|
Allow custom MaxCatchUpFrames to be specified
Also adjusts the default to allow for smoother seeking.
|
2019-05-09 16:39:03 +09:00 |
|
Dean Herbert
|
66594b7a1b
|
Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start
|
2019-05-09 16:39:03 +09:00 |
|
David Zhao
|
b0e34d86d5
|
Subtract a result from count if its been reverted
|
2019-05-09 16:16:20 +09:00 |
|
David Zhao
|
39fb5712f1
|
Only combo-incrementing results add to result count
|
2019-05-09 15:31:37 +09:00 |
|
Dean Herbert
|
516186c945
|
Merge branch 'master' into fix-score-deletion
|
2019-05-09 15:21:05 +09:00 |
|