1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 13:53:20 +08:00
Commit Graph

17836 Commits

Author SHA1 Message Date
David Zhao
dba4ccdf74 Add back flashlight testcase 2019-04-12 14:53:23 +09:00
David Zhao
846a4835ca Invert flashlight dim 2019-04-12 11:23:40 +09:00
David Zhao
664a4ba540 Implement flashlight dimming on slider slide 2019-04-12 10:47:22 +09:00
Dan Balasescu
67a03bbc90
Merge pull request #4583 from peppy/fix-offset-seek-handling
Fix gameplay offset handling on seeks
2019-04-09 15:48:52 +09:00
Dan Balasescu
3073508a23
Merge branch 'master' into fix-offset-seek-handling 2019-04-09 15:40:48 +09:00
Dean Herbert
ca251d8fa3
Merge pull request #4612 from smoogipoo/fix-osuscreen-dependencies
Fix OsuScreenDependencies using the incorrect parent
2019-04-09 12:28:32 +08:00
smoogipoo
ca9f172a96 Use var 2019-04-09 12:58:10 +09:00
smoogipoo
93b6cc00df Fix OsuScreenDependencies using the incorrect parent 2019-04-09 12:56:23 +09:00
Dean Herbert
f2f60f6d03
Merge pull request #4603 from Game4all/invert-login-notification-depth
Switch NotificationOverlay and LoginOverlay depth order
2019-04-07 21:17:36 +09:00
Lucas A
e948b11756
Merge branch 'master' into invert-login-notification-depth 2019-04-07 14:03:01 +02:00
Dean Herbert
869744b1ae
Merge pull request #4596 from Ferdi265/master
BeatmapLeaderboard: fix local scores not being sorted
2019-04-07 20:56:03 +09:00
Ferdinand Bachmann
d431ca4efc
BeatmapLeaderboard: use OrderByDescending instead of negation
(suggested by peppy)
2019-04-07 13:26:35 +02:00
Lucas A
3f2e6a9376 Allow loginOverlay to be null if there's no cached instance in DI (for testing cases) 2019-04-06 18:52:30 +02:00
Lucas A
394f14965b Make appveyor happy with whitespaces 2019-04-06 18:23:56 +02:00
Lucas A
59410dbe3b Open login overlay when notification asking for signing in to play multi is clicked 2019-04-06 18:05:13 +02:00
Lucas A
d5b7865ab8 Invert notification and loginOverlay depth order 2019-04-06 17:40:48 +02:00
theFerdi265
cb3532e7d4 BeatmapLeaderboard: fix local scores not being sorted 2019-04-06 00:53:02 +02:00
Dean Herbert
1b7d8b7dcf
Merge pull request #4555 from Joehuu/fix-blocked-volume-overlay
Fix volume overlay being blocked by other floating overlays

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-05 21:14:05 +09:00
Dean Herbert
dec16d9eb3
Merge branch 'master' into fix-blocked-volume-overlay 2019-04-05 21:01:58 +09:00
Dean Herbert
284b2d3fc6
Merge pull request #4589 from nyquillerium/button_fix
Fix visual issue with rapidly switching between menu button states

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-05 20:59:54 +09:00
Dean Herbert
f93504c65a
Merge branch 'master' into button_fix 2019-04-05 20:47:08 +09:00
Dean Herbert
8c7973f343
Merge pull request #4211 from EVAST9919/update-beatmap-scores-design
Update beatmap scores design

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-05 20:46:54 +09:00
Dean Herbert
88445647c8
Merge branch 'master' into update-beatmap-scores-design 2019-04-05 18:27:30 +09:00
David Zhao
0208526837 Fix button system visual issue 2019-04-05 18:21:54 +09:00
Joehu
debda7ae7d Fix volume overlay container reference 2019-04-05 00:05:42 -07:00
Joehu
53906e87ec Split floatingOverlayContent 2019-04-05 00:00:21 -07:00
Dean Herbert
a34a511f22 Update framework 2019-04-05 14:55:25 +09:00
smoogipoo
15fbb6f176 Use common AddUserLink method 2019-04-05 14:15:36 +09:00
smoogipoo
a6bf076dc7 Adjust green colour 2019-04-04 17:58:34 +09:00
smoogipoo
e13fffaca3 Make ScoreTable use TableContainer 2019-04-04 17:53:23 +09:00
Dean Herbert
1709e22763
Merge branch 'master' into fix-blocked-volume-overlay 2019-04-04 17:28:46 +09:00
Dean Herbert
35c4ee7452
Merge pull request #4133 from Aergwyn/toggle-cursor-trail
Add setting to toggle gameplay cursor trail

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-04 17:28:21 +09:00
Dean Herbert
9802d8ab11
Rename setting 2019-04-04 17:18:53 +09:00
Dean Herbert
d54750aa37 Remove incorrect class 2019-04-04 17:10:29 +09:00
Dean Herbert
109f577b59 Merge remote-tracking branch 'upstream/master' into toggle-cursor-trail 2019-04-04 17:09:38 +09:00
Dean Herbert
224c8d0f99
Merge pull request #4585 from Eclmist/bugfix/4584
Hides "Details" button when OnlineBeatmapID is null

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-04 01:54:22 +09:00
Dean Herbert
0919980cdd
Merge branch 'master' into bugfix/4584 2019-04-04 01:08:39 +09:00
Samuel Van Allen
bb516da5b6 Removed redundant empty argument list 2019-04-03 22:57:05 +08:00
Samuel Van Allen
3660924441 Trimmed whitespace 2019-04-03 22:40:20 +08:00
Samuel Van Allen
4d60f6fb6a Use collection initializer and added missing blank line 2019-04-03 22:37:50 +08:00
Dean Herbert
6a5d913d37
Merge pull request #4581 from Eclmist/bugfix/4575
Avoid presenting beatmap when already at requested beatmap
2019-04-03 23:29:30 +09:00
Dean Herbert
2efab0ccbf
Merge branch 'master' into bugfix/4575 2019-04-03 23:08:02 +09:00
Samuel Van Allen
55a6e43778 Check against databasedSet instead of function param 2019-04-03 21:49:33 +08:00
Samuel Van Allen
73c7c6c316 Hides "Details" button when OnlineBeatmapID is null 2019-04-03 21:44:36 +08:00
Dean Herbert
84da708d44 Fix nullref 2019-04-03 18:46:08 +09:00
Dean Herbert
cb417ebd77 Player -> User 2019-04-03 18:44:19 +09:00
Dean Herbert
a15a9bd03a Rewrite updateDisplay logic to not fail on some cases 2019-04-03 18:29:46 +09:00
Dean Herbert
5c3c08566f DrawableTopScore can be composite 2019-04-03 18:20:03 +09:00
Dean Herbert
5d37851d34 Rename and move test to correct location 2019-04-03 18:14:59 +09:00
smoogipoo
3b7d26cca8 Remove custom styled text 2019-04-03 17:49:01 +09:00