1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 10:47:24 +08:00
Commit Graph

1691 Commits

Author SHA1 Message Date
Andrei Zavatski
cb98b07e33 Merge master with conflicts resolved 2019-09-13 10:45:01 +03:00
Dean Herbert
a05ae2c1b2 Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6082 2019-09-13 15:53:11 +09:00
Dean Herbert
e2e87d5268
Merge branch 'master' into properly-fix-dialog-double-samples 2019-09-13 14:53:29 +09:00
Dean Herbert
0e679fb468 Use colour constant rather than opacity helper function 2019-09-13 14:06:19 +09:00
Dean Herbert
b917f29cfe Make GradientLineTabControl abstract 2019-09-13 13:59:06 +09:00
Andrei Zavatski
b17d097a39 Simplify colour usage in GradientLine 2019-09-12 17:17:57 +03:00
Dean Herbert
2cb084666b
Merge branch 'master' into rankings-scope-selector 2019-09-12 22:37:14 +09:00
Andrei Zavatski
b657e31f93 Merge dependent changes 2019-09-12 05:26:10 +03:00
Andrei Zavatski
c3c2efe35c Add ability to override text in PageTabItem 2019-09-12 05:03:59 +03:00
Joehu
e0bf579b18 Properly fix dialog overlay playing double samples on show/hide 2019-09-11 15:35:47 -07:00
Dean Herbert
55a071e8ba Use BindValueChanged 2019-09-11 19:12:55 +09:00
Dean Herbert
be66c0e912 Fix potential of toggle between load and LoadComplete 2019-09-11 19:06:31 +09:00
Dean Herbert
2c09efa23b Handle changes to OverlayActivationMode 2019-09-11 17:34:28 +09:00
Dean Herbert
825a34ecd3 Early return to avoid other potential fail cases 2019-09-11 17:34:03 +09:00
Dean Herbert
f53410a42a Merge remote-tracking branch 'upstream/master' into re-order-events 2019-09-11 16:48:44 +09:00
Andrei Zavatski
03bd7ca8e7 Implement RankingsScopeSelector 2019-09-10 04:20:32 +03:00
Andrei Zavatski
65869c7ebb Refactor LeaderboardScopeSelector for more extensibility 2019-09-10 04:04:37 +03:00
Dean Herbert
95baae5088 Fix dragging from inside to outside an overlay incorrectly hiding 2019-09-06 18:27:54 +09:00
Dean Herbert
b3f61abd49
Use float types for cursor sizes (#5958)
Use float types for cursor sizes
2019-09-06 15:45:44 +09:00
smoogipoo
99579255ad Force glowing sprite text to never redraw 2019-09-05 14:41:02 +09:00
smoogipoo
2e6af84ca8 Don't redraw leaderboard scores 2019-09-05 14:39:02 +09:00
smoogipoo
a87a1e6031 Don't redraw certain buffered containers on scale change 2019-09-04 19:38:12 +09:00
Dean Herbert
4c563232d6 HoverClickSounds should handle click event instead of MouseUp 2019-09-04 11:37:19 +09:00
Dean Herbert
53fe290ef3
Merge branch 'master' into back-button-part-2 2019-09-03 19:44:30 +09:00
Dean Herbert
e98059267d Improve xmldoc 2019-09-03 19:21:24 +09:00
Dean Herbert
299d528654 Simplify implementation 2019-09-03 19:20:23 +09:00
Dean Herbert
e88965b433 Merge remote-tracking branch 'upstream/master' into consistent-mod-button-sounds 2019-09-03 19:18:59 +09:00
smoogipoo
eab06995d0 Add some whitespace 2019-09-03 11:37:56 +09:00
jorolf
3b769128a8 Add a 60bpm beat when no beatmap is playing 2019-09-03 00:57:29 +02:00
iiSaLMaN
cb55159b28 Use float types for cursor sizes 2019-09-03 01:28:51 +03:00
Bartłomiej Dach
53c254c6a5 Replace Array.IndexOf() with Contains() 2019-09-02 19:01:36 +02:00
Bartłomiej Dach
fc48b190fe Fix inaccurate xmldoc 2019-09-01 13:32:53 +02:00
Bartłomiej Dach
c4dc34eefd Consolidate HoverClickSounds constructors
As suggested in review, merge both HoverClickSounds constructors into
one accepting optional arguments. Due to existing usages the parameter
is added as second and supplied by name in ModButton.
2019-09-01 13:10:11 +02:00
Bartłomiej Dach
658e0edc3e Handle other button clicks in HoverClickSounds
As suggested in review, remove previously introduced HoverMouseUpSounds
and instead change effect playing logic in HoverClickSounds by moving it
out of OnClick() to OnMouseUp().

Users of the class can either use the existing constructor to play
the effect only on left click or use the newly introduced constructor
with the MouseButton[] parameter to specify which button clicks should
trigger the sound.
2019-08-31 20:16:16 +02:00
Bartłomiej Dach
a1c72db5f6 Fix inconsistent sound effects on mod buttons
Because HoverClickSounds.OnClick() does not fire upon right clicking
on mod buttons, the sound effects that play on left and right click
were inconsistent. Introduce HoverMouseUpSounds drawable that allows
to play the click sound effect upon mouse up events for an arbitrary
set of mouse buttons and use it on mod buttons.
2019-08-31 17:01:12 +02:00
Andrei Zavatski
94512fea8e Apply naming suggestions 2019-08-31 16:20:33 +03:00
Andrei Zavatski
fa3591e5ec Add setting to turn on/off the video 2019-08-31 00:42:20 +03:00
Dean Herbert
03a4acaf4c Fix drags outside of overlay container bounds not hiding overlay 2019-08-29 12:07:58 +09:00
Dean Herbert
dfdf3f5e96 Merge remote-tracking branch 'upstream/master' into humanizer-fallback 2019-08-28 20:15:32 +09:00
Dean Herbert
b59973c712 Update in line with framework changes 2019-08-27 18:43:58 +09:00
Dean Herbert
82209aed82
Merge branch 'master' into humanizer-fallback 2019-08-22 17:58:40 +09:00
Andrei Zavatski
727a6abaf7 Simplify caching 2019-08-21 12:16:30 +03:00
Dean Herbert
fd26ef739a Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-08-21 15:23:54 +09:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Dan Balasescu
01df3c982a
Merge branch 'master' into fix-tooltips-not-displaying 2019-08-19 12:51:06 +09:00
Dean Herbert
a51fbfa31b Fix osu! default tooltips not displaying 2019-08-19 10:46:28 +09:00
Dean Herbert
4fa9abeece Replace DifficultyColouredContainer with a more scalable solution 2019-08-17 15:16:24 +09:00
Dean Herbert
d771c271a3 Merge remote-tracking branch 'upstream/master' into fix-checkbox-sounds 2019-08-16 19:32:01 +09:00
Dean Herbert
d732d276b1 Make activation delay customisable 2019-08-16 13:21:41 +09:00
Dean Herbert
ef5ed915e5 Reduce delay for hold-to-confirm controls 2019-08-15 17:14:00 +09:00
Dean Herbert
f7a92487ef Fix checkbox sounds playing too often 2019-08-15 14:09:30 +09:00
David Zhao
4a28bdd384 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-08-13 12:26:12 +09:00
Dean Herbert
c0f0fbbaa9 Rename variable and add xmldoc 2019-08-13 00:14:37 +09:00
Andrei Zavatski
9c36cb4af4 Use existing AccentColour logic instead of weird BoxColour 2019-08-12 14:33:30 +03:00
Andrei Zavatski
fc521ac93b Expose BoxColour property 2019-08-12 13:08:15 +03:00
Andrei Zavatski
144d41f143 Add ability to not add all the items if enum 2019-08-12 12:33:01 +03:00
Dean Herbert
d0f2d22995
Merge branch 'master' into fix-storyboard-not-shown-on-disabled-user-dim 2019-08-12 05:46:15 +09:00
Dean Herbert
684c37bf05 Rename class to better match usage 2019-08-11 16:19:40 +09:00
Lucas A
d55f9404da Fix CI issues 2019-08-10 14:23:37 +02:00
Lucas A
8eb3409a64 Add missing licence header 2019-08-10 14:03:44 +02:00
Lucas A
b0a7177987 Add ScreenTitleIcon class, used for displaying custom specific icons on overlays. 2019-08-10 13:26:19 +02:00
Dean Herbert
90b1fe81f3 Update cached usage in line with framework changes 2019-08-09 19:12:29 +09:00
Dean Herbert
7e9c100c9b Apply new resharper refactors 2019-08-09 12:29:33 +09:00
iiSaLMaN
565034e658 Remove unnecessary using directive 2019-08-08 22:14:51 +03:00
iiSaLMaN
0fcc6c1676 Add DimLevel property 2019-08-08 22:13:48 +03:00
iiSaLMaN
a3d90da7d4 Remove unnecessary check 2019-08-08 17:29:52 +03:00
iiSaLMaN
88b9942b2a Move EnableUserDim check to defualt value of ShowDimContent 2019-08-08 17:07:06 +03:00
iiSaLMaN
d5b26b86da Fix storyboard not showing on disabled user dim 2019-08-07 22:18:10 +03:00
Dean Herbert
6ed9c983ff Rename shear variable 2019-08-07 12:36:00 +09:00
David Zhao
ac0abe0692 Use newly exposed UpdateState 2019-08-06 14:21:34 +09:00
David Zhao
28825d4077 Merge remote-tracking branch 'upstream/master' into re-order-events 2019-08-06 14:00:35 +09:00
Joehu
11aa3544c4 Fix shear width naming 2019-08-05 20:57:17 -07:00
Joehu
ee6a90c48d Fix back button hover sounds playing in unclickable area 2019-08-05 20:43:30 -07:00
Andrei Zavatski
fd44ca3233 Rename Animation to Layer 2019-08-04 13:54:23 +03:00
Andrei Zavatski
a30d7912b1 Move DimmedLoadingAnimation to it's own file 2019-08-04 11:09:12 +03:00
Joehu
b244b2fe3d Add hover click sounds to leaderboard mod filter 2019-08-02 21:13:29 -07:00
Roman Kapustin
852079d438 Remove redundant ScreenshotManager.Update override 2019-08-01 01:35:42 +03:00
David Zhao
f81e691bf5 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-07-31 16:03:14 +09:00
David Zhao
1956098166 Add a fallback for humanizer localization failure 2019-07-30 14:06:08 +09:00
David Zhao
6d1203a599 Move screen pushes into function, rename receptor 2019-07-30 12:00:04 +09:00
Dean Herbert
cec26a270e Fix using right mouse button to drag at song select seeking incorrectly with many beatmaps loaded
Closes #5195
2019-07-30 07:04:16 +09:00
David Zhao
e8c039bb8a Use a receptor model instead 2019-07-29 18:45:16 +09:00
David Zhao
4b5fb84888
Rewrite comment 2019-07-29 11:02:44 +09:00
David Zhao
1b0f7b0459 more detailed explanation 2019-07-26 19:05:55 +09:00
David Zhao
6e09d857fd Fix ValueChanged events being called out of order 2019-07-26 19:00:07 +09:00
Dean Herbert
9ef858806b Fix existing usage of Path 2019-07-26 17:48:19 +09:00
Joehu
3b0a482743 Fix font weight of leaderboard mod filter 2019-07-25 23:10:00 -07:00
Dean Herbert
9665a94f4a
Ignore shift-delete PlatformAction in SearchTextBox (#5372)
Ignore shift-delete PlatformAction in SearchTextBox

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-23 17:11:09 +09:00
Dean Herbert
e81ef4bf33 Rewrite comment 2019-07-23 16:44:19 +09:00
David Zhao
4d8e2a78d1 update with new framework changes and update comment 2019-07-23 15:31:09 +09:00
smoogipoo
776757545d Fix FTB causing flashlight to block vision correctly 2019-07-23 15:17:02 +09:00
David Zhao
3e4ebd3c7a
Merge branch 'master' into shift-delete 2019-07-23 13:25:12 +09:00
David Zhao
e628e44d8e
update comment 2019-07-23 13:25:03 +09:00
Dean Herbert
9e34582c17
Merge branch 'master' into separate-glowing-text-from-leaderboardscore 2019-07-23 11:31:47 +09:00
iiSaLMaN
32e9547ce9 Trim whitespace 2019-07-22 23:16:54 +03:00
iiSaLMaN
081355e3d1 Use IHasText and simplify properties 2019-07-22 23:12:09 +03:00
Dean Herbert
07a0df7c4f Fix bracket precedence 2019-07-22 18:29:04 +09:00
iiSaLMaN
affd0b2878 Fix build issues 2019-07-21 12:34:52 +03:00
iiSaLMaN
57fc5cbda8 Fix CI issues 2019-07-21 12:29:06 +03:00
iiSaLMaN
87fb22352c glowingText -> blurredText 2019-07-21 12:28:55 +03:00