Dean Herbert
|
65097fddc1
|
Hide music controller when exiting via Alt-F4
Closes #4764.
|
2019-05-12 22:34:58 +09:00 |
|
Paul Teng
|
1c3b768266
|
Use Precision.AlmostBigger
|
2019-05-12 09:02:22 -04:00 |
|
Dean Herbert
|
ce0e4c506e
|
Merge branch 'master' into dev
|
2019-05-12 21:45:52 +09:00 |
|
Paul Teng
|
1a6c8e91a5
|
Compare Health with small value
|
2019-05-12 08:44:20 -04:00 |
|
Dean Herbert
|
82599127fd
|
Merge branch 'master' into patch-1
|
2019-05-12 20:30:25 +09:00 |
|
Paul Teng
|
7adaa09263
|
Move tab channel class into tab item class
|
2019-05-12 06:31:11 -04:00 |
|
Paul Teng
|
8957ad5a7e
|
Instantiate channel in tab item
|
2019-05-12 06:26:03 -04:00 |
|
Paul Teng
|
d53fb9a5c8
|
Check against type instead of channel name
|
2019-05-12 06:11:16 -04:00 |
|
Paul Teng
|
496a9dd41d
|
Create separate type for Join-Channel button
|
2019-05-12 06:02:21 -04:00 |
|
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
|
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
|
790700d8bf
|
Use more correct calculation
|
2019-05-12 15:40:58 +09:00 |
|
Joehu
|
175daac16a
|
Close beatmap options when suspending
|
2019-05-11 21:26:42 -07:00 |
|
Joehu
|
29cec54b3c
|
Fix beatmap carousel overlapping beatmap info wedge
|
2019-05-11 20:08:45 -07:00 |
|
Paul Teng
|
c508b8ed6b
|
Trim whitespace
|
2019-05-11 19:21:12 -04:00 |
|
Paul Teng
|
3971a49549
|
Ignore Add-channel button
|
2019-05-11 19:16:15 -04:00 |
|
Paul Teng
|
6cf1ca288f
|
Do not try to join the Add-channel button
|
2019-05-11 19:13:48 -04: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
|
4abd5c78cd
|
Merge branch 'master' into fix-score-deletion
|
2019-05-10 19:09:18 +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 |
|
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
|
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
|
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 |
|
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 |
|
Dean Herbert
|
24e64c1333
|
Add proper co-dependent beatmap/score deletion via events
|
2019-05-09 15:15:28 +09:00 |
|
Dean Herbert
|
6ebd13c733
|
Allow Delete and Undelete operations to run silently when needed
|
2019-05-09 15:15:02 +09:00 |
|
Dean Herbert
|
c8f9354327
|
Remove incorrect deletion include
This was causing deletions of scores without considering that scores are now managed by a ScoreManager (and have their own data dependencies).
|
2019-05-09 15:13:35 +09:00 |
|
Dan Balasescu
|
2e50c1ce48
|
Merge branch 'master' into zoomablescrollcontainer-fix
|
2019-05-09 14:09:47 +09:00 |
|
Dan Balasescu
|
22940373a0
|
Merge branch 'master' into zoomablescrollcontainer-fix
|
2019-05-09 13:54:21 +09:00 |
|
smoogipoo
|
5c6b4d923f
|
Reorder methods
|
2019-05-09 13:53:53 +09:00 |
|
smoogipoo
|
35624a5d1c
|
Invert scheduling order
|
2019-05-09 13:42:04 +09:00 |
|
smoogipoo
|
3fed165b74
|
Cleanup some schedules
|
2019-05-09 13:33:18 +09:00 |
|
smoogipoo
|
c69d813745
|
Fix bindable potentially being set from background thread
|
2019-05-09 13:32:18 +09:00 |
|
David Zhao
|
d625f3c104
|
Private method
|
2019-05-09 13:21:01 +09:00 |
|
Dean Herbert
|
869136b2fb
|
Fix possible cross-thread config cache access (#4730)
Fix possible cross-thread config cache access
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-09 11:16:48 +09:00 |
|
Dean Herbert
|
9457a6128e
|
Fix game pausing when made inactive while watching a replay
|
2019-05-09 10:57:55 +09:00 |
|
Dean Herbert
|
a5b07347e9
|
Merge branch 'master' into fix-ruleset-crossthread
|
2019-05-09 10:49:26 +09:00 |
|
Dean Herbert
|
31c91746a5
|
Merge branch 'master' into fix-ruleset-crossthread
|
2019-05-09 10:13:25 +09:00 |
|
smoogipoo
|
5128dc32e4
|
Remove unnecessary fillmode
|
2019-05-08 23:13:21 +09:00 |
|
smoogipoo
|
17a9f191cd
|
Fix incorrect texture name usage for some rank icons
|
2019-05-08 23:08:08 +09:00 |
|
Dean Herbert
|
83663467ce
|
Update dependencies
|
2019-05-08 21:08:46 +09:00 |
|
Dean Herbert
|
4f697e2bd5
|
Add licence header
|
2019-05-08 19:35:20 +09:00 |
|
Dean Herbert
|
6dea16f365
|
Move action and hotkey specification local
|
2019-05-08 19:29:43 +09:00 |
|
Dean Herbert
|
c91b9c6032
|
Add missing button
|
2019-05-08 19:27:53 +09:00 |
|
smoogipoo
|
39efa2d173
|
Fix possible cross-thread config cache access
|
2019-05-08 19:05:00 +09:00 |
|
Dean Herbert
|
772eb460fb
|
Move button definitions to their respective classes
|
2019-05-08 19:03:26 +09:00 |
|
Dean Herbert
|
0693290ad4
|
Merge remote-tracking branch 'upstream/master' into refactor-select-footer
|
2019-05-08 18:43:21 +09:00 |
|
Dean Herbert
|
b33372ca62
|
Don't expand mods in button on hover
|
2019-05-08 18:43:15 +09:00 |
|
Dean Herbert
|
8906eb874a
|
Fix CI issues
|
2019-05-08 18:43:06 +09:00 |
|
Dean Herbert
|
9a9ac05cd9
|
Fix post-merge issues
|
2019-05-08 18:42:54 +09:00 |
|
Dean Herbert
|
bace829629
|
Add ability to avoid expand animation in ModDisplay
|
2019-05-08 18:42:26 +09:00 |
|
Dan Balasescu
|
6ab83f8825
|
Merge branch 'master' into flashlight-dim
|
2019-05-08 13:37:21 +09:00 |
|
David Zhao
|
ff3c226596
|
Give ZoomableScrollContainer an initial width
|
2019-05-08 13:37:03 +09:00 |
|
smoogipoo
|
117f8bdd01
|
Merge remote-tracking branch 'Joehuu/master' into flashlight-dim
|
2019-05-08 13:25:01 +09:00 |
|
Dean Herbert
|
13cf9657a4
|
Merge branch 'master' into fix-updateable-background-crash
|
2019-05-08 13:17:28 +09:00 |
|
smoogipoo
|
a00e2b18a9
|
Fix background unloading/reloading sometimes crashing
|
2019-05-07 17:24:05 +09:00 |
|
smoogipoo
|
99f2ee0e48
|
Fix CI issues
|
2019-05-07 15:09:03 +09:00 |
|
Dan Balasescu
|
288b3deb94
|
Merge branch 'master' into fix-rank-display
|
2019-05-07 15:00:51 +09:00 |
|
Dean Herbert
|
8bc313fb33
|
Merge branch 'master' into fix-new-inspections
|
2019-05-07 14:14:40 +09:00 |
|
Dean Herbert
|
c878d814f6
|
Merge branch 'master' into pause-via-inactive
|
2019-05-07 13:35:23 +09:00 |
|
Dean Herbert
|
f7a570d67a
|
Fix double confirmation
|
2019-05-07 13:34:06 +09:00 |
|
smoogipoo
|
13b9b04bb8
|
Apply more cases/fix some existing ones
|
2019-05-07 13:23:09 +09:00 |
|
smoogipoo
|
d7c09e7dbd
|
Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
|
2019-05-07 13:20:17 +09:00 |
|
Dan Balasescu
|
a1c64d8d26
|
Merge branch 'master' into fix-retry-sound
|
2019-05-07 12:40:01 +09:00 |
|
Dan Balasescu
|
8b9cfadd64
|
Merge branch 'master' into fix-retry-sound
|
2019-05-07 12:37:22 +09:00 |
|
Dean Herbert
|
64bc0f958b
|
Merge branch 'master' into fix-import-crash
|
2019-05-07 12:18:41 +09:00 |
|
smoogipoo
|
f26a1cff6c
|
Fix beatmap import crashing during room creation
|
2019-05-07 12:14:57 +09:00 |
|
David Zhao
|
abc163fa36
|
Fix merge
|
2019-05-07 12:07:45 +09:00 |
|
David Zhao
|
732b0b22a3
|
Merge remote-tracking branch 'upstream/master' into flashlight-dim
|
2019-05-07 12:04:58 +09:00 |
|
Dan Balasescu
|
9d3f6a716a
|
Merge branch 'master' into profile-details-animation
|
2019-05-07 11:44:22 +09:00 |
|
Dean Herbert
|
7fdc79dd68
|
Improve skip boundary logic to be closer to expectations
Supersedes #4693.
Closes #4676.
|
2019-05-05 20:20:41 +09:00 |
|
Dean Herbert
|
3e3f12f277
|
Use more local bindables
|
2019-05-04 17:53:17 +09:00 |
|
Dean Herbert
|
b9a39fb788
|
Fix instant pausing when game becomes inactive
Resolves #4685.
|
2019-05-04 14:54:29 +09:00 |
|
Dean Herbert
|
0fa0271878
|
Add animation when collapsing or expanding the profile details section
|
2019-05-04 11:03:18 +09:00 |
|
Joseph Madamba
|
53accbfce1
|
Merge branch 'master' into switch-centre-profile-info
|
2019-05-03 11:27:52 -07:00 |
|