1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 00:27:25 +08:00
Commit Graph

1841 Commits

Author SHA1 Message Date
Joehu
74176a6954 Remove redundant ternary expression 2019-12-01 12:54:37 -08:00
Joehu
3b88afd069 Fix overlays closing when dragging from in/out or out/in 2019-12-01 12:02:47 -08:00
Albie
7864899249
Merge branch 'master' into cinema-mod 2019-11-28 16:42:01 +00:00
Dean Herbert
bb0a4db847 Fix failing tests 2019-11-29 01:17:58 +09:00
Dean Herbert
56e8a1fdd5 Merge remote-tracking branch 'upstream/master' into reduce-background-blur-scale 2019-11-28 22:02:31 +09:00
Dean Herbert
46379902be
Merge branch 'master' into hover-debounce 2019-11-28 20:44:32 +09:00
Min
92ab8026a0
Completely remove click sound debounce 2019-11-28 16:03:59 +11:00
Dean Herbert
2865f32052 Fix nullref on clicking links in tests 2019-11-28 00:13:44 +09:00
phosphene47
786fb9ede3 Split click and hover and disable click debounce 2019-11-28 00:44:01 +11:00
phosphene47
d4afea0b5e Use double instead of TimeSpan 2019-11-27 23:06:07 +11:00
phosphene47
037d927e45 TimeSpans can be negative! 2019-11-27 22:51:27 +11:00
phosphene47
b126700f01 Debounce hover sounds 2019-11-27 22:47:00 +11:00
smoogipoo
d1e3718038 Reduce the scale of background blurs 2019-11-27 15:04:09 +09:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Albie
0a70ec0b11
Merge branch 'master' into cinema-mod 2019-11-25 07:25:30 +00:00
Dean Herbert
36cabe72cf Make DimmedLoadingLayer block input when active 2019-11-25 11:49:54 +09:00
Berkan Diler
fccdbffa93 Use MathF instead of Math- functions when possible
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
Albie
b8e5796af5 add forced video/storyboard and disabled dim for mod inside new interface 2019-11-24 07:37:06 +00:00
Dean Herbert
57d38c5c74 Add final newline 2019-11-22 02:39:54 +09:00
Dean Herbert
f390e558c7 Combine and simplify beatmap change logic 2019-11-22 02:32:02 +09:00
Dean Herbert
a97d760afa Merge remote-tracking branch 'upstream/master' into menu-background-modes 2019-11-22 02:23:02 +09:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Berkan Diler
66a3837ff4 Fix CI 2019-11-20 14:25:44 +01:00
Berkan Diler
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
Huo Yaoyuan
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Huo Yaoyuan
53bc2dcab7 Use costum displaying text for inherited references. 2019-11-18 15:29:18 +08:00
Huo Yaoyuan
b04bca7db6 Reference elements in origin definition. 2019-11-17 20:55:40 +08:00
Huo Yaoyuan
f05b83d7d4 Use typeparamref. 2019-11-17 20:48:23 +08:00
Dean Herbert
ce60f8262c
Merge branch 'master' into sharpen 2019-11-13 15:38:59 +09:00
Dean Herbert
da819261e0 Shrink and darken loading layer to better suit button 2019-11-12 21:38:16 +09:00
Huo Yaoyuan
7d7b9e36b2 Use compound assignment. 2019-11-12 19:53:50 +08:00
Dean Herbert
52ab309295
Merge branch 'master' into stateful-menu-items 2019-11-12 10:31:50 +09:00
Dean Herbert
5bb65d0716 Rename button class 2019-11-12 10:21:06 +09:00
Huo Yaoyuan
e9b8cbb516 Apply other styles. 2019-11-11 20:27:04 +08:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
bed62e0d2f Rename ThreeState -> TernaryState and add basic tests 2019-11-11 18:56:18 +09:00
Dean Herbert
c0f6e4687a
Merge branch 'master' into stateful-menu-items 2019-11-11 18:33:50 +09:00
Dean Herbert
c70c05c896
Less sickening parallax (#6743)
Less sickening parallax
2019-11-08 19:15:25 +09:00
Dean Herbert
8bcbc93501 Fix tournament buttons playing sound effects 2019-11-08 17:00:47 +09:00
smoogipoo
a2c265c147 Separate ThreeStates into its own file 2019-11-08 13:23:13 +09:00
smoogipoo
011bf09516 Add xmldocs and cleanup 2019-11-08 13:23:13 +09:00
smoogipoo
0a15a13fab Reorder parameters 2019-11-08 13:23:13 +09:00
smoogipoo
30f877c4ab Implement a three-state menu item 2019-11-08 13:23:13 +09:00
smoogipoo
ce08d664a5 Abstract statefulness of new menu item type 2019-11-08 13:23:13 +09:00
smoogipoo
4fe69dbc89 Fix context menu sub-menu display 2019-11-08 13:23:13 +09:00
smoogipoo
c3a3b4091b Add basic implementation of a toggleable menu item 2019-11-07 22:26:35 +09:00
smoogipoo
29672c48e1 Make simple OsuMenuItem ctor invoke the complex one 2019-11-07 16:04:13 +09:00
smoogipoo
20d6eceecf Move DrawableOsuMenuItem out of OsuMenu 2019-11-07 16:03:35 +09:00
Dean Herbert
d400e4a5f6 Add shared constant for parallax amount 2019-11-07 09:30:50 +09:00
Dean Herbert
ee4839b7e7 Reduce delay on parallax 2019-11-06 18:09:36 +09:00
Dean Herbert
4ce3450cfc Move button implementation to OsuButton 2019-11-06 14:08:52 +09:00
Dean Herbert
44d0791676 Update button usage 2019-11-05 16:26:31 +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
Dan Balasescu
514c9f1eef
Merge branch 'master' into bindable-control-points 2019-10-30 16:20:54 +09:00
Dean Herbert
dbee63c1a6
Make OsuButton correctly block hover events (#6636)
Make OsuButton correctly block hover events
2019-10-30 12:38:16 +09:00
Dean Herbert
08040adfad Expose Current bindable in LabelledComponents
Adds a `LabelledDrawable` class for usages where bindables are not present.
2019-10-28 16:24:28 +09:00
Dean Herbert
6980f488dc Make OsuButton correctly block hover events 2019-10-28 16:24:07 +09:00
Dean Herbert
8069674824 Merge remote-tracking branch 'upstream/master' into bindable-control-points 2019-10-28 11:52:04 +09:00
Dean Herbert
8baf569f59 Remove necessity of AutoGenerated flag 2019-10-25 19:58:42 +09:00
Dean Herbert
e987db37ec Add grouping of ControlPoints 2019-10-25 19:52:02 +09:00
Andrei Zavatski
85769982a0 Refactor LoadingButton 2019-10-24 17:49:34 +03:00
Andrei Zavatski
b310fd9d44 Adjust naming inside the LoadingButton 2019-10-23 13:39:42 +03:00
Dean Herbert
40c202c394
Merge branch 'master' into comments-vote-pill 2019-10-23 15:41:54 +09:00
Dean Herbert
21e0bd2a5a Merge branch 'fix-wave-container' into apply-framework-fixes 2019-10-23 15:13:41 +09:00
smoogipoo
851773a842 Apply adjustments for framework changes 2019-10-23 14:04:06 +09:00
Dean Herbert
001eae2c02 Merge remote-tracking branch 'upstream/master' into make-most-textbox-carets-movable 2019-10-22 15:04:16 +09:00
Dean Herbert
5d0d83b6bf Add basic xmldoc 2019-10-22 15:04:10 +09:00
Joehu
f7924d3bad Rename "FixedSearchTextBox" to "SeekLimitedSearchTextBox" 2019-10-21 16:00:09 -07:00
Dean Herbert
b30c84778f Update WaveContainer to support framework changes 2019-10-18 16:13:01 +09:00
Joehu
e5b50b5e1f Fix slider bar regression when using arrows 2019-10-17 13:54:36 -07:00
Andrei Zavatski
6b196a6ce7 CI fixes 2019-10-17 15:24:51 +03:00
Andrei Zavatski
a437ff74cc Move VotePill to it's own file 2019-10-17 14:18:31 +03:00
Andrei Zavatski
d3a8dfd5ff Implement LoadingButton component 2019-10-17 13:57:17 +03:00
smoogipoo
350d139cbf Make chevron icon colour protected 2019-10-16 15:54:00 +09:00
Joehu
649951198e Make most textbox carets movable 2019-10-15 14:47:48 -07:00
Andrei Zavatski
b1f7a673e7 Simplify chevron icon coloring 2019-10-15 00:10:02 +03:00
Andrei Zavatski
d4843285db CI fixes 2019-10-14 17:33:14 +03:00
Andrei Zavatski
a44cc2e70b Implement CommentsShowMoreButton 2019-10-13 14:43:30 +03:00
Dean Herbert
a7b58cad99
Merge branch 'master' into labelled-switch-button 2019-10-04 11:15:54 +08:00
Dan Balasescu
2519fd26a9
Merge pull request #6351 from Joehuu/simplify-exit-logic-of-screens
Simplify exit logic of screens with textboxes using back button receptor
2019-10-02 18:38:06 +09:00
HDragonHR
faf8fe132e Change bindable int to float 2019-10-02 12:26:46 +08:00
Joehu
e3502f5200 Fix typo on Key.Escape comment 2019-10-01 08:37:08 -07:00
Joehu
ff6367fa4b Make back button glow when pressing escape 2019-10-01 08:26:45 -07:00
Joehu
5f700f2ae9 Simplify exit logic of screens with textboxes using back button receptor 2019-10-01 08:26:34 -07:00
Dean Herbert
193a9b0dd7
Merge branch 'master' into labelled-switch-button 2019-09-29 14:56:26 +08:00
Dean Herbert
45f833ceea Add invocation null checks for safety 2019-09-25 22:14:42 +09:00
smoogipoo
9f77a1ef35 Adjust namespaces 2019-09-25 17:53:08 +09:00
smoogipoo
d32a0acd10 Merge remote-tracking branch 'origin/master' into labelled-switch-button 2019-09-25 17:51:12 +09:00
smoogipoo
261ba5c80a Fix button not transforming correctly in some cases 2019-09-25 17:42:27 +09:00
Dean Herbert
654b815b36 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 14:38:39 +09:00
LeNitrous
851e42a444 avoid memory leak 2019-09-24 22:57:29 +08:00
LeNitrous
0bc59e17dc remove Seasonal and apply suggestions 2019-09-24 21:56:32 +08:00
LeNitrous
03947e5b85 change background for ScalingContainer 2019-09-24 19:49:46 +08:00
Dean Herbert
f493f1c71d Move new components to v2 namespace 2019-09-24 19:00:26 +09:00
LeNitrous
b8d147a3b4 introduce main menu background modes 2019-09-24 17:42:06 +08:00
smoogipoo
028c958431 Initial implementation of a switch button 2019-09-24 18:39:11 +09:00
Dean Herbert
50d4206c45 Fix exit scenarios 2019-09-19 20:17:58 +09:00
Dean Herbert
177a789d79 Add setting to adjust hold-to-confirm activation time 2019-09-19 14:06:25 +09:00
Roman Kapustin
8456861b8d Wait for cursor hiding using ManualResetEventSlim 2019-09-14 17:08:56 +03:00
Andrei Zavatski
437e121056 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video 2019-09-13 13:39:58 +03:00
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