1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 00:22:57 +08:00
Commit Graph

1880 Commits

Author SHA1 Message Date
Dean Herbert
a1d94d7adf
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-05 20:48:30 +09:00
Dean Herbert
d1f03ebf0c Update in line with framework 2018-01-05 20:29:14 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
1571c10c42 Fix up replay settings sliderbar formatting 2018-01-05 14:37:32 +09:00
smoogipoo
b84da31174 Change in-line with framework 2018-01-05 14:26:46 +09:00
smoogipoo
5eb2dc3d64 Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
Dean Herbert
532c455f92
Merge branch 'master' into change-audio-settings-icon 2018-01-03 14:34:21 +09:00
Dan Balasescu
fa6db30d30
Fix broken xmldoc param 2018-01-03 13:12:49 +09:00
Dean Herbert
0e1b033008 Improve mod cycling logic further 2018-01-02 16:55:03 +09:00
Dean Herbert
f72239ef7a Centralise deselect logic and add animation to deselection 2018-01-02 16:09:22 +09:00
Dean Herbert
71bcebe7e1 Fix selections occurring even though buttons aren't selected 2018-01-02 16:08:48 +09:00
Dean Herbert
c0dd812a4c Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods 2018-01-02 15:33:08 +09:00
Dan Balasescu
5f3dbfef47
Merge branch 'master' into hide-unavailable-functions 2018-01-02 12:59:12 +09:00
Dan Balasescu
91c49913c9
Merge branch 'master' into focused-overlay-improvements 2018-01-02 12:44:09 +09:00
Dean Herbert
2354163900 Change icon for audio settings 2018-01-02 12:30:55 +09:00
Aergwyn
ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
Dean Herbert
1c80f3e918 Disallow selection of non-implemented mods 2017-12-31 04:28:51 +09:00
Dean Herbert
33dbd1b1a7 Remove search button on toolbar 2017-12-31 03:47:50 +09:00
Aergwyn
138d78309f add HitCount enum and replace string usage with enum 2017-12-30 18:07:30 +01:00
Aergwyn
f7fe083018 add tooltip to country flags 2017-12-30 14:59:35 +01:00
Dean Herbert
f56e8121da Fix settings overlay pass-through logic 2017-12-30 22:13:05 +09:00
Dean Herbert
8733f809a5 Remove chat overlay local override 2017-12-30 21:10:57 +09:00
Dean Herbert
e332683d18 Fix music controller draggability 2017-12-30 21:10:40 +09:00
Dean Herbert
442a649c63 Make all FocusedOverlays hide on clicks outside of themselves
Also allows wheel events to pass through around them.
2017-12-30 20:45:41 +09:00
smoogipoo
616ad5b723 Cleanups 2017-12-30 16:55:01 +09:00
smoogipoo
714d93dd92 Merge remote-tracking branch 'origin/master' 2017-12-30 16:17:14 +09:00
jai_
9660e0885b
correctly name tooltip interface 2017-12-29 19:20:37 +00:00
jai_
6de41ba172
Trim whitespace 2017-12-29 19:16:43 +00:00
jai_
b1dd64983d
Add tooltip text to supporter icon 2017-12-29 19:05:50 +00:00
Dan Balasescu
dcd994e65b
Merge branch 'master' into better-notification-delays 2017-12-27 23:58:04 +09:00
Dan Balasescu
996e156fd0
Merge branch 'master' into fix-notification-scheduled-events 2017-12-27 23:27:23 +09:00
Dan Balasescu
3bfa6bd9fd
Merge branch 'master' into better-notification-delays 2017-12-27 23:26:57 +09:00
Dan Balasescu
3de07ddba8
Merge branch 'master' into fix-progress-notifications-close 2017-12-27 21:43:58 +09:00
Dean Herbert
9a4b2f0d1d Apply workaround at two levels 2017-12-27 21:19:06 +09:00
Dean Herbert
7d0c94fd01 Fix notification overlay layout and scheduled tasks being delayed
Closes #1295
2017-12-27 19:42:44 +09:00
Dean Herbert
2a7147240f Fix progress notifications not creating their completion notification early enough
FIxes notification overlay thinking it has no notifications left and closing.
2017-12-27 13:25:42 +09:00
Dean Herbert
94449ed597
Merge branch 'master' into notification-verbosity 2017-12-26 20:48:59 +09:00
Dean Herbert
35ae5173cd
Merge branch 'master' into better-notification-delays 2017-12-26 20:48:41 +09:00
Dan Balasescu
460eeafd32
Merge branch 'master' into quieter-notifications 2017-12-26 18:18:28 +09:00
Dean Herbert
ab6c93fba4
Merge branch 'master' into notification-verbosity 2017-12-26 16:14:24 +09:00
Dean Herbert
3524ad3dc2 Merge remote-tracking branch 'upstream/master' into better-notification-delays 2017-12-26 16:10:57 +09:00
Dan Balasescu
f7a54a203b
Merge branch 'master' into beatmap-import-prompt 2017-12-26 16:00:37 +09:00
Dean Herbert
24d8d357d0 Only bounce and flash notification count when increasing 2017-12-26 15:54:37 +09:00
Dean Herbert
45b3acdd6f Fix progress notifications not closing properly when opening their continuation 2017-12-26 15:54:33 +09:00
Dean Herbert
ed1df94f77 Fix unread light not turning off 2017-12-26 15:54:28 +09:00
Dan Balasescu
ef0031a719
Merge branch 'master' into popup-word-wrap 2017-12-26 15:47:58 +09:00
Dan Balasescu
d089e27cad
Merge branch 'master' into osu-prefixed-text 2017-12-26 15:40:29 +09:00
Dan Balasescu
ad811961a7
Merge branch 'master' into quieter-notifications 2017-12-26 15:30:12 +09:00
Dean Herbert
0886107ec9 Connect counter with button display 2017-12-26 01:56:57 +09:00
Dean Herbert
1fc240f6c5 Expose unread notification count 2017-12-26 01:50:05 +09:00