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
b9a579b624
Merge branch 'master' into fix-control-point-ordering
2019-05-10 16:18:22 +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
Dean Herbert
66ebdbbe4c
Fix control points with same timestamp potentially being parsed incorrectly
2019-05-08 18:13:07 +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
Dean Herbert
41ab82cdc3
Merge branch 'master' into refactor-select-footer
2019-05-03 21:46:41 +09:00
LeNitrous
31341bfeb1
use SongSelect's SelectedMods property to ensure it exists
2019-05-03 16:51:33 +08:00
LeNitrous
009eaa647a
fixes to FooterButtonRandom
2019-05-03 16:38:15 +08:00
Dean Herbert
6bdaca1e3b
Fix mod equality checks not working as intended
2019-05-03 10:09:47 +09:00
Joehu
ac31a9640a
Add number sign to centre info rankings
2019-05-02 03:47:20 -07:00
Joehu
c6992bd6f9
Switch hidden/expanded centre profile header information
2019-05-02 03:37:15 -07:00
Dean Herbert
6a4dc5e25c
Improve xmldoc slightly
2019-05-02 14:03:58 +09:00
Dean Herbert
1817f7bc12
Merge branch 'master' into sh-xh-grading-2
2019-05-02 13:27:12 +09:00
Dean Herbert
975f6e2c5d
Merge pull request #4694 from peppy/update-framework
...
Update framework
2019-05-02 13:13:15 +09:00
Dean Herbert
015b5cecb5
Update framework
2019-05-02 12:53:59 +09:00
jorolf
b61807da40
Add number sign inside ToString
...
Co-Authored-By: Joehuu <madamba.joehu@outlook.com>
2019-05-01 17:55:30 -07:00
Joehu
6b7397b9cf
Check for null instead of not null
2019-04-30 22:07:06 -07:00
Joehu
9b2d5727cd
Fix wrong check
2019-04-30 21:54:25 -07:00
Joehu
1408513ebd
Use similar check used on tooltip
2019-04-30 21:51:56 -07:00
Joehu
3cd6ccfc3d
Add number sign in front of profile rankings
2019-04-30 20:47:44 -07:00
iiSaLMaN
ddd9262384
fix xmldoc
2019-04-30 19:08:31 +03:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2
2019-04-30 18:55:35 +03:00
iiSaLMaN
148f4c4ce0
Pass Rank.Value instead
...
Passing Rank.Value along each iteration instead of calculating.
2019-04-30 18:49:31 +03:00
iiSaLMaN
e0abd0b2c1
fix comment
2019-04-30 18:44:31 +03:00
iiSaLMaN
665558c297
Remove unnecessary comment
2019-04-30 18:44:06 +03:00
iiSaLMaN
5d50316ae7
Add xmldoc
2019-04-30 18:12:27 +03:00
Dean Herbert
5a9277ec0e
Merge branch 'master' into fix-retry-sound
2019-04-28 23:38:14 +09:00
Dean Herbert
f9f6e1f04a
Clamp values to avoid potentially weird element
2019-04-28 20:13:36 +09:00
Dean Herbert
8ab5149336
SupporterLevel -> SupportLevel
2019-04-28 20:11:36 +09:00
Dean Herbert
27ba89444e
Remove unnecessary using statements
2019-04-28 01:08:14 +09:00
Dean Herbert
fa340a9eff
Merge branch 'master' into profile-header-update
2019-04-27 23:48:23 +09:00
Dean Herbert
db75516e79
Merge branch 'master' into fix-lead-in-issues
2019-04-27 21:01:21 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability
2019-04-27 18:41:19 +09:00
Dean Herbert
41d0b00120
Update framework
2019-04-27 16:43:23 +09:00
iiSaLMaN
b08fb5136e
Merge branch 'master' into sh-xh-grading-2
2019-04-26 10:38:10 +03:00
smoogipoo
32e71a6314
Fix incorrect seeking behaviour of TrackVirtualManual
2019-04-26 16:15:42 +09:00
smoogipoo
50a775145c
Separate variables
2019-04-26 13:56:26 +09:00
smoogipoo
2f4bf423a4
Renamespace
2019-04-26 13:51:39 +09:00
smoogipoo
7047303b0f
Add tooltips to all buttons
2019-04-26 13:29:58 +09:00
Dean Herbert
a680a38e81
Merge pull request #4675 from nyquillerium/playerloader-tracking
...
Prevent PlayerLoader from tracking the logo after it has been exited.
2019-04-26 13:21:13 +09:00
smoogipoo
4adf590036
Combine hover/active state handling in tab control
2019-04-26 12:41:00 +09:00
smoogipoo
d5b91c6455
Cleanup top header container + user handling
2019-04-26 12:32:15 +09:00
smoogipoo
838325fed4
Remove HasTooltipContainer, use separate composites
2019-04-26 11:58:45 +09:00
David Zhao
9ce7d0416b
Fix framework version
2019-04-25 23:16:08 +09:00
David Zhao
9da13cb463
Merge branch 'master' into flashlight-dim
2019-04-25 23:15:15 +09:00
KingLuigi4932
619071b7ee
Unnecessary 'using' directive
2019-04-25 14:23:00 +03:00
smoogipoo
f8c5ee457b
Reduce tabcontrol spacing
2019-04-25 20:09:42 +09:00
smoogipoo
8329e53b6c
Remove extra space from header title
2019-04-25 20:08:14 +09:00
smoogipoo
2caea38f8c
Cleanup centre header container
2019-04-25 20:05:59 +09:00
KingLuigi4932
4e0f21102b
Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2
2019-04-25 14:04:12 +03:00
iiSaLMaN
45d9f42c98
Merge branch 'master' into sh-xh-grading-2
2019-04-25 14:01:38 +03:00
KingLuigi4932
c6b3197dd0
Add AdjustRank and use it in Hidden Mod
2019-04-25 13:56:57 +03:00
smoogipoo
9d5b81165e
Adjust button stylings
2019-04-25 19:51:05 +09:00
smoogipoo
0eca9b9683
Center -> centre
2019-04-25 18:43:29 +09:00
smoogipoo
b33c0e9a93
Cleanup bottom header container
2019-04-25 18:42:19 +09:00
smoogipoo
1766ed8f9e
Fix warnings/remove obsolete usages
2019-04-25 18:05:46 +09:00
smoogipoo
3b0d4c1bad
Merge branch 'turn-on-warnings' into profile-header-update
2019-04-25 17:43:10 +09:00
smoogipoo
0bd35ab7bb
Turn on warnings, resolve issues
2019-04-25 17:36:17 +09:00
Dean Herbert
6fdcd98caa
Don't play screen "back" sample when retrying
2019-04-25 14:15:07 +09:00
Dan Balasescu
b911322c92
Merge branch 'master' into fix-lead-in-issues
2019-04-25 12:34:29 +09:00
Dan Balasescu
9fa8f62077
Merge branch 'master' into update-framework
2019-04-25 12:25:17 +09:00
Dean Herbert
8dc7fd8223
Update framework
2019-04-25 12:16:12 +09:00
iiSaLMaN
d3bc443810
Merge branch 'master' into sh-xh-grading-2
2019-04-25 06:11:07 +03:00
Dean Herbert
4f31eee5ad
Merge branch 'master' into flashlight-dim
2019-04-24 17:01:11 +09:00
David Zhao
8222923ab8
Only track logo if we're still the current screen
2019-04-24 16:20:51 +09:00
iiSaLMaN
c5ca337e66
Merge branch 'master' into sh-xh-grading-2
2019-04-24 10:08:08 +03:00
Dean Herbert
bb69330e9f
Call ProcessFrame on the userOffsetClock after a seek
...
Without doing this, GameplayClock can be left in an incorrect state after a seek (due to the userOffsetClock being its own FramedClock).
2019-04-24 15:28:14 +09:00
Dean Herbert
efaedafc08
Fix (legacy) AudioLeadIn being used incorrectly.
...
This lead-in is intended to specify a value before zero, not a value before the start time.
Also removes an unnecessary ProcessFrame call (it happens within Seek itself).
2019-04-24 15:28:14 +09:00
Dean Herbert
60328cf1fb
Ensure FrameStabilityContainer's ElapsedTime is zero on initial seek
2019-04-24 15:25:53 +09:00
Dean Herbert
80e1568e97
Fix FrameStabilityContainer performing frame-stable seeks
2019-04-24 15:25:52 +09:00
iiSaLMaN
a29c7d81ee
Merge branch 'master' into sh-xh-grading-2
2019-04-23 10:31:17 +03:00
Joehu
0838206ddd
Shorten multiplayer header to multi
2019-04-22 22:44:43 -07:00
David Zhao
9890884726
Remove fade in, update comment
2019-04-23 14:23:09 +09:00
