1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:43:20 +08:00
Commit Graph

23179 Commits

Author SHA1 Message Date
Dan Balasescu
7ecd1ea0e9
Merge branch 'master' into fix-ios-import 2019-11-05 14:51:30 +09:00
Dan Balasescu
af7322a763
Merge pull request #6685 from peppy/game-handles-links
Move link handling code to OsuGame
2019-11-05 12:51:18 +09:00
Dan Balasescu
23ad516348
Merge branch 'master' into game-handles-links 2019-11-05 12:33:32 +09:00
Dan Balasescu
48711299f8
Merge pull request #6699 from peppy/fix-slider-creation
Fix slider creation regressing with path selection changes
2019-11-05 11:56:48 +09:00
Dan Balasescu
84f0f691d7
Merge branch 'master' into fix-slider-creation 2019-11-05 11:32:59 +09:00
Dean Herbert
66253a0bd4 Handle selection on mouse down instead of click
This is how other elements work, and feels better with drag preselection
2019-11-05 02:21:50 +09:00
Dean Herbert
eb1ec78b33
Disable retry hotkey overlay when viewing results from leaderbo… (#6702)
Disable retry hotkey overlay when viewing results from leaderboard
2019-11-04 12:34:18 +09:00
Bartłomiej Dach
539f8ad6dd Remove overlay when viewing leaderboard scores
Do not add the hold-to-retry hotkey overlay if the user has navigated
to the results screen from the leaderboard and not from gameplay.
2019-11-04 01:57:31 +01:00
Bartłomiej Dach
3ec9580ba8 Add test for retry overlay presence
Add visual tests checking presence (or lack thereof) of the
hold-to-retry overlay in the results screen.
2019-11-04 01:55:30 +01:00
Dean Herbert
6c74563703
Highlight user's top score on beatmap leaderboard (#6693)
Highlight user's top score on beatmap leaderboard

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-04 09:45:38 +09:00
Dean Herbert
1a7b803d4d Change colour to green to match web implementation 2019-11-04 08:39:51 +09:00
Dean Herbert
c71a082ffe
Merge branch 'master' into user-score-highlight 2019-11-04 08:18:18 +09:00
Dean Herbert
bcf8a6d514 Fix slider creation regressing with path selection changes 2019-11-03 19:59:37 +09:00
Dean Herbert
1155aacd90
Update sliders when control points change (#6680)
Update sliders when control points change
2019-11-03 19:05:48 +09:00
Dean Herbert
92ed6d16d7
Implement slider control point selection (#6678)
Implement slider control point selection

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-03 19:04:32 +09:00
Dean Herbert
4dbdfcdd3c Change control to toggle rather than always select 2019-11-03 18:41:29 +09:00
Dean Herbert
6bc62385b6
Merge branch 'master' into slider-controlpoint-selection 2019-11-03 15:28:50 +09:00
Dean Herbert
fe3583b6ee Move schedule call 2019-11-03 13:16:54 +09:00
Dean Herbert
5127b52c25 Merge remote-tracking branch 'upstream/master' into game-handles-links 2019-11-03 13:04:18 +09:00
Dean Herbert
cacb036c79
Add retry button and hotkey support to results screen (#6691)
Add retry button and hotkey support to results screen

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-02 21:41:00 +09:00
Dean Herbert
6dde755ef2
Merge branch 'master' into add-retry-button 2019-11-02 21:23:16 +09:00
Dean Herbert
fd13f0bc55
Move ReplayDownloadButton to correct namespace (#6689)
Move ReplayDownloadButton to correct namespace
2019-11-02 21:22:23 +09:00
Dean Herbert
551032803d
Fix GameplayClockContainer operating on beatmap's track after s… (#6688)
Fix GameplayClockContainer operating on beatmap's track after screen exited
2019-11-02 21:22:13 +09:00
Dan Balasescu
8a5d3ab40a
Merge branch 'master' into add-retry-button 2019-11-02 10:51:14 +09:00
Dan Balasescu
5be7d439ae
Add null check for nullable dependency 2019-11-02 10:32:23 +09:00
Ganendra Afrasya
8da15f6897 Fix all score are highlighted on local scope 2019-11-01 23:19:15 +07:00
Ganendra Afrasya
ce3b34a768 Fix UserTopScoreContainer is also tinted 2019-11-01 23:00:55 +07:00
Ganendra Afrasya
d9a91100fb Add tint to user's score container background 2019-11-01 22:47:23 +07:00
Dan Balasescu
036e67bbc2
Merge pull request #6676 from peppy/fix-multi-logout-crash
Fix multi logout crash
2019-11-01 17:13:16 +09:00
Dean Herbert
156d0ae9b9
Remove braces
Co-Authored-By: Salman Ahmed <email@iisalman.me>
2019-11-01 16:08:44 +09:00
Dean Herbert
0820fde743
Hide resume overlay when re-pausing gameplay (#6611)
Hide resume overlay when re-pausing gameplay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-01 15:57:12 +09:00
Dean Herbert
daa0ebe2b5 Add xmldoc 2019-11-01 15:51:45 +09:00
Dean Herbert
14453da1d2 Centralise MakeCurrent call 2019-11-01 15:51:10 +09:00
Dean Herbert
c532f77657 Add hold-to-retry support to results 2019-11-01 15:49:42 +09:00
Dean Herbert
84d17f3702 Add retry button 2019-11-01 15:41:51 +09:00
Dean Herbert
e23ea94383 Add one more level of null check 2019-11-01 15:33:38 +09:00
Dean Herbert
14fec6f1f3 Move ReplayDownloadButton to correct namespace 2019-11-01 15:06:36 +09:00
Dean Herbert
05002ea3e8 Move Show/Hide code to PopIn/PopOut 2019-11-01 14:50:38 +09:00
Dean Herbert
dcc8f6e827 Better group cancel conditional 2019-11-01 14:43:52 +09:00
Dean Herbert
d089e47a56
Merge branch 'master' into master 2019-11-01 14:15:57 +09:00
Dean Herbert
ac02bb005d Fix GameplayClockContainer operating on beatmap's track after scren exited 2019-11-01 14:11:18 +09:00
Dan Balasescu
9b9366e2d7
Merge branch 'master' into fix-multi-logout-crash 2019-11-01 13:55:28 +09:00
Dean Herbert
7c3dd36add
Fix scrolling hitobjects expiring too soon (#6687)
Fix scrolling hitobjects expiring too soon
2019-11-01 13:03:51 +09:00
Dan Balasescu
770726cc95
Merge branch 'master' into fix-multi-logout-crash 2019-11-01 12:46:26 +09:00
Dan Balasescu
b0737535d1
Merge pull request #6677 from peppy/catch-api-request-exceptions
Cover all non-APIAccess APIRequest calls with exception handling
2019-11-01 12:36:42 +09:00
smoogipoo
0171b2ae7c Fix scrolling hitobjects expiring too soon 2019-11-01 12:10:03 +09:00
Dean Herbert
fcba0c4fdf Merge branch 'game-handles-links' into fix-ios-import 2019-11-01 11:42:27 +09:00
Dean Herbert
f038c579f0 Protect against requests to show overlays before the target overlay is ready 2019-11-01 11:41:00 +09:00
Dean Herbert
898520935e Move link handling code to OsuGame
This allows for future calls from arguments / associations
2019-11-01 11:40:51 +09:00
Dean Herbert
68cf23d3e4 Merge remote-tracking branch 'upstream/master' into fix-ios-import 2019-11-01 11:37:32 +09:00