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

5888 Commits

Author SHA1 Message Date
Dean Herbert
2b1ab3576b
Merge branch 'master' into migrate-country-rank 2021-03-08 11:07:25 +09:00
Salman Ahmed
132fcda089 Force config sensitivity value to local setting bindable
Re-enable the local bindable to update the sensitivity value then change back to whatever state it was in previously.
2021-03-04 17:00:44 +03:00
Dan Balasescu
6d4391de15
Merge pull request #11957 from peppy/move-mouse-settings-load-complete
Move bindable logic in MouseSettings to LoadComplete
2021-03-03 22:43:24 +09:00
Dean Herbert
534e16237a Remove unnecessary intial construction of bindable 2021-03-03 20:36:41 +09:00
Dean Herbert
0f5bce70ad Split confirmation dialog classes apart 2021-03-03 20:34:37 +09:00
Dean Herbert
002646370c Move bindable logic in MouseSettings to LoadComplete 2021-03-03 16:47:42 +09:00
Dean Herbert
7dce9b04fa Add a more basic ConfirmDialog implementation 2021-03-03 14:50:45 +09:00
Bartłomiej Dach
3b125a26a8 Add test coverage 2021-03-02 19:21:03 +01:00
Bartłomiej Dach
40a28367c6 Fix restore-to-default buttons never showing if initially hidden 2021-03-02 18:50:33 +01:00
Dean Herbert
6372a0265a Fix confine mode dropdown becoming visible again after filtering
Changes from a hidden to a disabled state, with a tooltip explaining
why.

Closes #11851.
2021-03-02 17:44:58 +09:00
Salman Ahmed
2609b22d53 Replace usage of CurrentModeRank in line with API change 2021-03-01 23:07:25 +03:00
Bartłomiej Dach
52e81385a6 Fix restore default button mutating transforms during load 2021-02-27 11:39:18 +01:00
Dean Herbert
3e65dfb9e7 Reduce allocation overhead when notification overlay has visible notifications 2021-02-26 17:11:47 +09:00
Dean Herbert
8004652d27
Merge branch 'master' into optimised-has-flag-checks 2021-02-25 21:24:39 +09:00
Dean Herbert
90e8308716 Merge branch 'master' into localisation-refactor-framework 2021-02-25 17:28:55 +09:00
smoogipoo
dff1d80f39 Update HasFlag usages to HasFlagFast 2021-02-25 15:38:56 +09:00
Dean Herbert
2c8e62ae35 Fix toolbar not completing enough of layout to propagate hotkeys to buttons before initial display 2021-02-25 14:52:51 +09:00
Dean Herbert
e82eaffaed Flip order back to original for romanisable strings 2021-02-25 14:14:07 +09:00
Dean Herbert
4cdde42228 Remove unnecessary backing field 2021-02-25 14:08:01 +09:00
Dean Herbert
8a97e2e28d Update LocalisedString usages to RomanisedString 2021-02-22 19:01:42 +09:00
Dean Herbert
1fd76ea3fb Apply changes to UI components overriding functions with changing signatures 2021-02-22 19:01:42 +09:00
smoogipoo
ccb83ef3a3 Fix checkbox not being updated 2021-02-22 15:47:47 +09:00
Dean Herbert
b68dbbceff
Merge branch 'master' into multiplayer-participant-rank 2021-02-19 13:16:44 +09:00
Dan Balasescu
28550f19e8
Merge branch 'master' into online-overlay-login-placeholder 2021-02-19 10:06:25 +09:00
Dean Herbert
10ec4cd8e0 Revert change to loading layer's default state 2021-02-18 22:38:17 +09:00
Salman Ahmed
a407bfe73b Privatize UserRanks and expose a similar CountryRank field instead 2021-02-18 15:37:52 +03:00
Dean Herbert
990c1b1d6e Revert accidental removal of newlines 2021-02-18 18:19:57 +09:00
Dean Herbert
0bd1964d8e Add login placeholder logic to OnlineOverlay
A perfect implementation of this would probably leave the filter/header
content visible, but that requires some re-thinking and restructuring to
how the content is displayed in these overlays (ie. the header
component shouldn't be inside the `ScrollContainer` as it is fixed).

Supersedes and closes #10774.
Closes #933.
Addresses most pieces of #7417.
2021-02-18 18:07:24 +09:00
Dean Herbert
c3f66a0c74 Add login placeholder for chat overlay 2021-02-18 17:46:07 +09:00
Salman Ahmed
a845e96b7a Replace Ranks.Global completely with a GlobalRank property 2021-02-17 08:52:04 +03:00
Joehu
e838a5d9f0 Fix comment edited at date not showing tooltip 2021-02-15 19:04:23 -08:00
Dean Herbert
2e646882fa Merge branch 'master' into non-concurrent-sample-playback 2021-02-15 21:22:21 +09:00
Dean Herbert
de52b8a5ba Fix test failures in PerformFromScreen tests 2021-02-15 17:14:41 +09:00
smoogipoo
c6ed3efa4a Merge branch 'master' into non-concurrent-sample-playback 2021-02-15 14:47:32 +09:00
Joehu
982d8e35ed Fix mod settings showing scrollbar when screen is offset 2021-02-12 10:42:48 -08:00
smoogipoo
d3f0c0730d Merge branch 'master' into non-concurrent-sample-playback 2021-02-12 17:22:15 +09:00
Dan Balasescu
ca091431f4
Merge pull request #11739 from peppy/settings-item-tooltips
Display descriptions in tooltips of mod settings adjustments
2021-02-12 00:18:16 +09:00
Dean Herbert
9fb41dc0b6 Move property to a better place in the class 2021-02-11 16:41:21 +09:00
Dean Herbert
dddd776802 Add the ability for settings items to have tooltips 2021-02-11 16:38:17 +09:00
Dean Herbert
98c5b0220c
Merge pull request #11725 from smoogipoo/freemods-user-settings
Add local user customisation for freemod mod settings
2021-02-11 16:02:24 +09:00
Dean Herbert
cbdc189ab2 Merge branch 'new-overlay-sounds' into update-resources 2021-02-11 14:20:23 +09:00
Dean Herbert
e53242c159 Merge branch 'new-toolbar-sounds' into update-resources 2021-02-11 14:20:21 +09:00
Dean Herbert
4ffb7fb753 Merge branch 'osd-toggle-sounds' into update-resources 2021-02-11 14:20:18 +09:00
Dean Herbert
896f318b56 Rename variable for clarity 2021-02-11 14:18:40 +09:00
Dean Herbert
72562070bc Remove second overload of Close (makes the call structure hard to follow / invoke correctly) 2021-02-11 14:18:00 +09:00
Jamie Taylor
2ee634d173 Create subclass for "Error" notifications to allow them to have a unique pop-in sound 2021-02-11 13:55:43 +09:00
Jamie Taylor
a1ae739a62 Add support for Notification sounds 2021-02-11 13:51:54 +09:00
Jamie Taylor
c12c09ec4d Move logic to LoadComplete instead 2021-02-11 09:57:14 +09:00
Jamie Taylor
63e6ec1c9f Add audio feedback for OSD value changes 2021-02-11 09:23:04 +09:00
smoogipoo
822c66033f Add local-user freemod configuration 2021-02-10 19:56:59 +09:00
Jamie Taylor
4e2ab0bad2 Use a separate sample set for Toolbar buttons 2021-02-10 17:48:36 +09:00
Dean Herbert
9e400acd1a Merge branch 'master' into fix-mod-settings-fuckery 2021-02-10 17:43:03 +09:00
Jamie Taylor
3eda78c363 Use unique samples for Dialog, NowPlaying, SettingsPanel and WaveOverlay pop-in/pop-out 2021-02-10 16:04:47 +09:00
Dean Herbert
b3b0d97354 Avoid potential feedback from bindable event binds 2021-02-10 15:33:04 +09:00
Dean Herbert
67c1c4c1eb Copy settings before applying selection 2021-02-10 15:30:17 +09:00
Dean Herbert
435c85a2e7 Avoid executing selection twice on ModSelectOverlay load 2021-02-10 15:13:09 +09:00
Dean Herbert
a39263423c Fix externally changed settings from being reset when ModSelectOverlay is initialised 2021-02-10 15:12:29 +09:00
Dean Herbert
75bc9f607e Rename wrongly named method 2021-02-10 14:55:15 +09:00
Dean Herbert
e44667e5e0
Use MinValue instead
Co-authored-by: Salman Ahmed <slmanarendo1950@gmail.com>
2021-02-10 11:31:34 +09:00
Andrei Zavatski
d9dcf8a042 Fix incorrect header depth in OnlineOverlay 2021-02-09 20:30:31 +03:00
Dan Balasescu
92599aa02b
Merge branch 'master' into user-beatmap-downloading-states-2 2021-02-09 21:06:09 +09:00
Dan Balasescu
15b3747945
Merge pull request #11716 from peppy/defer-playlist-load
Defer playlist load to improve load time of the now playing overlay
2021-02-09 20:59:51 +09:00
Dean Herbert
d8d830db6e Defer playlist load to improve load time of the now playing overlay 2021-02-09 19:46:57 +09:00
Dean Herbert
1670766633 Avoid unbinding external events 2021-02-09 18:42:15 +09:00
Dean Herbert
178d88bcf1 Change BackgroundColour into a property 2021-02-09 18:32:44 +09:00
Dean Herbert
b5fa950800 Remove unnecessary depth specification 2021-02-09 18:30:05 +09:00
Dean Herbert
3206c7cbae
Merge branch 'master' into overlay-header-refactor 2021-02-09 18:20:07 +09:00
Dean Herbert
8204d360a8 Always reset local user settings when a mod is deselected in ModSelectOverlay 2021-02-09 13:44:42 +09:00
Dean Herbert
f338fa114b
Merge branch 'master' into user-beatmap-downloading-states-2 2021-02-05 18:02:40 +09:00
Dean Herbert
3e750feaa4 Subclass LocalPlayerModSelectOverlay to correctly deselect incompatible mods on free mod selection 2021-02-05 16:42:35 +09:00
Dean Herbert
9e9e382bee Merge branch 'master' into user-beatmap-downloading-states-2 2021-02-05 15:27:17 +09:00
Dean Herbert
0750c3cb6a Add back immediate deselection flow to ensure user selections can occur without contention 2021-02-04 23:44:46 +09:00
Dean Herbert
8f2f1a444f Avoid resetting selection on deselecting incompatibile types 2021-02-04 19:55:09 +09:00
Dean Herbert
bf239f8bef Flush animation on closing mod overlay 2021-02-04 19:12:37 +09:00
Dean Herbert
a2674f3c3f Add comments 2021-02-04 18:58:56 +09:00
Dean Herbert
223b858227 Ramp the animation speed 2021-02-04 18:56:40 +09:00
Dean Herbert
f23ca7c7cf Centralise selection animation logic 2021-02-04 18:10:55 +09:00
Dean Herbert
4bfe3aabdc Simplify sound debounce logic 2021-02-04 17:06:11 +09:00
smoogipoo
f25535548a Fix buzzing on select all/deselect all 2021-02-02 21:20:16 +09:00
smoogipoo
643c0605d8 Implement the freemod selection overlay 2021-02-02 21:14:38 +09:00
smoogipoo
8b3a85daa7 Merge branch 'refactor-mod-sections' into freemod-select-overlay 2021-02-02 21:09:51 +09:00
smoogipoo
728f8599b2 Move incompatible mod deselection to SoloModOverlay 2021-02-02 21:06:32 +09:00
smoogipoo
e58ece9e10 Make ModSelectOverlay abstract 2021-02-02 21:06:04 +09:00
smoogipoo
50e92bd0ed Fix selection not being preserved when IsValidMod changes 2021-02-02 20:50:54 +09:00
smoogipoo
10ceddf3ff Make IsValidMod adjustable 2021-02-02 20:47:50 +09:00
smoogipoo
75f81bfa06 Add back mod validation 2021-02-02 20:35:41 +09:00
smoogipoo
6d620264f4 Allow mod buttons to not be stacked 2021-02-02 20:27:41 +09:00
smoogipoo
3741f05ab3 Refactor mod sections and make them overridable 2021-02-02 20:11:40 +09:00
Dean Herbert
a76314a876 Use Update instead of UpdateAfterChildren (no need for the latter) 2021-02-02 15:57:17 +09:00
Dean Herbert
bb0753f68d Use a better method of cancelling user scroll 2021-02-02 15:44:03 +09:00
Dean Herbert
398ab9c2c2 Use UserTrackingScrollContainer instead 2021-02-02 15:29:38 +09:00
Salman Ahmed
5c28c030c8 Unconditionally set "autoscroll" state 2021-02-01 22:08:57 +03:00
Salman Ahmed
15fcabb128
Add documentation to auto-scroll leniency
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-02-01 22:04:44 +03:00
Salman Ahmed
49e62c3a4b
Apply documentation changes
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-02-01 11:02:08 +03:00
Salman Ahmed
e806e5bcd1 Improve robustness of chat auto-scrolling logic
Fix auto-scrolling state changing by old messages removal logic
2021-01-31 23:45:49 +03:00
Dean Herbert
18e6afbec0 Ensure the item is present before trying to select it 2021-01-29 19:17:12 +09:00
Dean Herbert
1ce383fc20 Merge branch 'master' into fix-skin-dropdown-update-crash 2021-01-29 19:16:20 +09:00
Bartłomiej Dach
2c08ce05fa Remove game-local enum [Order] attribute
In favour of the newly-added framework one.
2021-01-27 22:29:52 +01:00
Dean Herbert
67014018fc
Merge pull request #11589 from MiraiSubject/osu-mod-icon-fallbacks
Allow tournament client to use default mod icons if custom icons are not present
2021-01-26 19:57:21 +09:00
Dean Herbert
a5f3418e56 Avoid tooltip display 2021-01-26 19:11:19 +09:00
Dean Herbert
fedcbf79fa
Merge pull request #11572 from EVAST9919/comment-pill
Make VotePill background transparent for own comments
2021-01-26 18:57:00 +09:00
Salman Ahmed
93bb2611d6 Merge branch 'fix-beatmap-listing' into fix-beatmap-listing-2 2021-01-26 09:43:49 +03:00
Dean Herbert
ca0242debe Tidy up logic to correctly expire in cases where expiry is expected 2021-01-26 15:42:48 +09:00
Salman Ahmed
0d8d0d6852 Apply alternative way of fixing 2021-01-26 01:03:29 +03:00
Salman Ahmed
c317d60169 Add offline test scene for beatmap listing overlay 2021-01-26 00:03:20 +03:00
Salman Ahmed
75d6dbdbb7 Fix beatmap listing placeholder potentially getting disposed 2021-01-26 00:03:20 +03:00
Salman Ahmed
9efce5717f Fix beatmap listing placeholder disappearing on second time display 2021-01-26 00:03:20 +03:00
Dean Herbert
bb8113fb51 Fix mod select footer not animating correctly on first reveal 2021-01-25 14:47:47 +09:00
Andrei Zavatski
e9d10bb6e7 Revert "Minor refactoring"
This reverts commit 3d42cc1f91.
2021-01-22 22:49:49 +03:00
Andrei Zavatski
3d42cc1f91 Minor refactoring 2021-01-22 22:27:26 +03:00
Bartłomiej Dach
360f26c13d Merge branch 'master' into scroll-to-20 2021-01-22 19:58:36 +01:00
Andrei Zavatski
20161aea6a Show LoginOverlay if not logged-in when clicking on a pill 2021-01-22 21:47:53 +03:00
Andrei Zavatski
6379381f95 Make VotePill background transparent for own comments 2021-01-22 20:46:20 +03:00
Dean Herbert
fca6b15d2f Fix local echo messages remaining permanently dimmed when chatting via multiplayer 2021-01-22 16:05:45 +09:00
Andrei Zavatski
2eba2a9abf Rename FriendsButton to FollowersButton 2021-01-21 23:40:23 +03:00
Andrei Zavatski
c631354b57 Rename property 2021-01-21 23:39:19 +03:00
Andrei Zavatski
4555b9ff70 Make ProfileHeaderButton height defined 2021-01-21 22:56:12 +03:00
Andrei Zavatski
e87197c7fc Adjust text size 2021-01-21 22:48:31 +03:00
Andrei Zavatski
343166f158 Make CreateIcon a property 2021-01-21 22:47:44 +03:00
Andrei Zavatski
a7c22ebe88 Implement MappingSubscribersButton component 2021-01-21 22:02:54 +03:00
Andrei Zavatski
2aa1df9ea4 Implement ProfileHeaderStatisticsButton component 2021-01-21 21:38:52 +03:00
Andrei Zavatski
05d3914fee Rename friends tooltip to followers 2021-01-21 21:26:33 +03:00
Dean Herbert
a6516e3be5 Merge branch 'master' into scroll-to-20 2021-01-21 14:28:17 +09:00
Andrei Zavatski
65ece1aa72 Mark OverlayHeader as NotNull in FullscreenOverlay 2021-01-21 07:50:41 +03:00
Dean Herbert
7c4a072568 Merge branch 'master' into scroll-to-20 2021-01-21 13:48:26 +09:00
Andrei Zavatski
da0066e7b0 Merge master with conflicts resolved 2021-01-21 07:30:47 +03:00
Dan Balasescu
c3675293fa
Merge branch 'master' into beatmapset-refactor 2021-01-21 12:38:34 +09:00
Dan Balasescu
95f52ae054
Merge pull request #11536 from rednir/sort-skins-alphabetically
Sort SkinSection in alphabetical order
2021-01-20 21:49:31 +09:00
Dan Balasescu
455383c3c0
Merge pull request #11528 from peppy/fix-autoplay-in-multiplayer
Fix multiplayer mod select showing autoplay as a choice
2021-01-20 21:49:16 +09:00
Dan Balasescu
12f2067357
Merge branch 'master' into sort-skins-alphabetically 2021-01-20 21:15:16 +09:00
Andrei Zavatski
2ca3ccad06 Move all the content to BeatmapSetHeaderContent drawable 2021-01-20 04:56:46 +03:00
Andrei Zavatski
94fee3800d Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmapset-refactor 2021-01-20 04:32:56 +03:00
Bartłomiej Dach
3b49b7461e Schedule entire operation for safety
Also removes a redundant list copy.
2021-01-19 19:35:53 +01:00
Bartłomiej Dach
78e590d25d Refactor skin sorting method
* Rename to `sortUserSkins` to convey meaning better.
* Sort in-place instead of slicing the list.
* Change to `void` to avoid misleading users that the method returns
  a new list instance.
* Fix typo in comment.
2021-01-19 18:36:42 +01:00
Bartłomiej Dach
b00c6a1d60 Make first non-default skin index a property
The previous code was very brittle - it was not always updating
properly, and seems to have worked either by a carefully crafted set of
circumstances, or just plain coincidence.

Having this be a get-only property avoids potential error in the future
caused by not updating the index properly, at the expense of an added
linear lookup.
2021-01-19 18:31:37 +01:00
rednir
206a0b8bac Fix firstNonDefault staying as -1 2021-01-19 16:55:50 +00:00
rednir
a880b8d21d Satisfy AppVeyor 2021-01-19 16:11:16 +00:00
rednir
b265d2dab4 Remove another whitespace 2021-01-19 14:16:22 +00:00
rednir
1d4c813ff6 Merge branch 'sort-skins-alphabetically' of https://github.com/rednir/osu into sort-skins-alphabetically 2021-01-19 14:03:31 +00:00
rednir
31e61326e1 Only user skins are sorted 2021-01-19 14:00:17 +00:00
rednir
f1894a8bac fixed itemUpdated() 2021-01-19 12:17:56 +00:00
smoogipoo
de9d075f94 Initial sample + samplechannel rework 2021-01-19 17:11:40 +09:00
Andrei Zavatski
f0add0a7cf Make BeatmapSetOverlay use OverlayHeader 2021-01-19 01:34:37 +03:00
rednir
0b65c0cd25 Remove whitespace 2021-01-18 20:17:42 +00:00
rednir
da89426a3b Merge branch 'master' of https://github.com/ppy/osu into sort-skins-alphabetically 2021-01-18 20:09:15 +00:00
rednir
7476cb3047 Sort SkinSection in alphabetical order 2021-01-18 19:51:42 +00:00
Andrei Zavatski
c6b0f3c247 Implement TabbableOnlineOverlay component 2021-01-18 21:22:50 +03:00
Dean Herbert
0560eb4120 Reduce final fill alpha of main menu confirm-to-exit 2021-01-18 18:22:21 +09:00
Dean Herbert
0b165dce4b Fix multiplayer mod select showing autoplay as a choice 2021-01-18 17:50:32 +09:00
Andrei Zavatski
6e34ab5d15 Rename WebOverlay to OnlineOverlay 2021-01-18 11:13:38 +03:00