1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 13:47:33 +08:00
Commit Graph

13005 Commits

Author SHA1 Message Date
Dean Herbert
f51be4c4fe Adjust transitions a tad 2019-06-25 20:23:34 +09:00
Andrei Zavatski
bae0258d8d Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-25 14:16:05 +03:00
Dean Herbert
75b78d5e27
Reduce size of dropdown chevron (#5150)
Reduce size of dropdown chevron

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-25 20:05:52 +09:00
Dean Herbert
28cfccbd64
Use OsuScrollContainer for osu menus (#5094)
Use OsuScrollContainer for osu menus

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-25 20:05:09 +09:00
Dan Balasescu
7794fab7c9
Merge branch 'master' into reduce-dropdown-chevron-size 2019-06-25 19:58:37 +09:00
Dan Balasescu
0f31d17129
Merge branch 'master' into reduce-background-brightness 2019-06-25 19:45:15 +09:00
Dean Herbert
a3de369c20 Reduce size of dropdown chevron 2019-06-25 19:32:00 +09:00
Dean Herbert
8c02709d74
Merge branch 'master' into fix-dropdown-styling 2019-06-25 19:28:37 +09:00
Dean Herbert
445660d066
Merge pull request #5148 from peppy/update-framework
Update framework
2019-06-25 19:28:17 +09:00
Dan Balasescu
c6965a40dc
Merge branch 'master' into reduce-background-brightness 2019-06-25 19:18:28 +09:00
Dan Balasescu
47974ca854
Merge branch 'master' into beatmap-overlay-load 2019-06-25 19:05:17 +09:00
Dan Balasescu
ffcd3529a6
Merge branch 'master' into cancel-api-callback 2019-06-25 18:43:33 +09:00
smoogipoo
aa81c95f30 Remove unnecessary extra property 2019-06-25 18:38:14 +09:00
Dean Herbert
fe290ead63 Update framework 2019-06-25 18:38:11 +09:00
smoogipoo
5b294ba419 Adjust backbutton animation 2019-06-25 18:33:35 +09:00
smoogipoo
531b107a98 Exit match before exiting multiplayer 2019-06-25 18:33:26 +09:00
smoogipoo
1a26608ba9 Close mod select before exiting song selection 2019-06-25 18:33:21 +09:00
smoogipoo
d9927204f8 Relieve OsuScreen of back button input duties 2019-06-25 18:33:18 +09:00
smoogipoo
f53d2fbe76 Scale backbutton along with screens 2019-06-25 18:33:13 +09:00
smoogipoo
8c96e4c1fa Move back button to OsuGame 2019-06-25 18:33:08 +09:00
Dean Herbert
7bc7df2249 Reduce background brightness at PlayerLoader 2019-06-25 17:22:10 +09:00
Dean Herbert
93b6d5b7e3 Fix keybindings being offset 2019-06-25 17:16:19 +09:00
Dean Herbert
ba2f22be47 Improve loading state of BeatmapSet header 2019-06-25 14:47:29 +09:00
Dean Herbert
90acc9b6ca Avoid calling api request callback after user cancel 2019-06-25 13:52:43 +09:00
smoogipoo
fb94cd43a4 Remove unnecessary local item storage in SettingsDropdown 2019-06-25 12:00:05 +09:00
Dean Herbert
cc1e67dc6c
Merge branch 'master' into fix-avatar-display-update-2 2019-06-25 10:18:46 +09:00
jorolf
4d8f49b9bc update code to work with https://github.com/ppy/osu-framework/pull/2568 2019-06-24 23:17:07 +02:00
Andrei Zavatski
b7d15982d7 Remove useless parentheses 2019-06-24 23:30:35 +03:00
Andrei Zavatski
4a05c560cf Remove unwanted class and move the bind logic outside the RulesetSelector 2019-06-24 23:13:28 +03:00
Andrei Zavatski
9dedd62d9a Revert a hotfix in multi screen
since it's been fixed in a framework
2019-06-24 22:57:18 +03:00
Andrei Zavatski
35516e7304 Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-24 22:52:24 +03:00
HoLLy
236d5a9abc Remove leftover TransformDuration overrides 2019-06-24 18:26:25 +02:00
HoLLy
739077ef4f Only hide UpdateableAvatar/Flag immediately 2019-06-24 18:24:31 +02:00
HoLLy
7734c4b41a Fix code style 2019-06-24 18:09:42 +02:00
Dean Herbert
6a541d9a10
Merge branch 'master' into user_profile_modes 2019-06-25 00:59:51 +09:00
Dean Herbert
c0b5153094
Merge branch 'master' into music-effect-arrow-keys-hover 2019-06-24 21:49:45 +09:00
Dean Herbert
88b182ab3f
Merge branch 'master' into generic-download-model-manager 2019-06-24 18:35:58 +09:00
Dean Herbert
f91467eddc Fix licence header 2019-06-24 18:34:23 +09:00
Dean Herbert
bd2f34a102
Merge branch 'master' into quickEscape 2019-06-24 18:21:39 +09:00
Dean Herbert
2ea5165803 Change case to match; change hotkey to be more globally usable (previous has conflict on macOS) 2019-06-24 18:19:17 +09:00
Dean Herbert
fad1ced1b5 Add correct conditionals to allow exit 2019-06-24 18:15:27 +09:00
Dean Herbert
d70248338d Merge remote-tracking branch 'upstream/master' into quickEscape 2019-06-24 18:14:48 +09:00
HoLLy
aed83471f4 Replace Reset with overridden TransformImmediately/TransformDuration 2019-06-24 10:51:45 +02:00
Dean Herbert
2473a9487a Add missing using 2019-06-24 17:38:11 +09:00
Dean Herbert
6e2138491b
Merge branch 'master' into useroverlay-tabs 2019-06-24 17:27:47 +09:00
Dean Herbert
1830362337 Move task out of ctor to avoid initialisation ordering issues 2019-06-24 17:10:50 +09:00
Dean Herbert
36d54fdbfc
Merge branch 'master' into skinnable-sprite 2019-06-24 16:33:17 +09:00
Dean Herbert
06eaba766b Move method below ctor 2019-06-24 15:27:46 +09:00
Dean Herbert
9593e66a96 Add some more xmldoc 2019-06-24 15:25:01 +09:00
Dan Balasescu
18d64df0c4
Merge branch 'master' into add-numberbox 2019-06-24 15:22:30 +09:00
Dean Herbert
3f22c0a311 Add SkinnableSprite implementation 2019-06-24 15:17:35 +09:00
Joehu
7ac6558f59 Allow controlling music and effect volume by arrow keys when hovering 2019-06-23 22:53:02 -07:00
Dan Balasescu
5f05b9ac0b
Merge branch 'master' into async-beatmap-load 2019-06-24 14:24:07 +09:00
Dean Herbert
6d864cb47e Load beatmap content asynchronously in the background 2019-06-24 13:38:30 +09:00
Dan Balasescu
00a2aa7881
Merge branch 'master' into useroverlay-overall-improvements 2019-06-24 13:28:17 +09:00
smoogipoo
5272b3a929 Use .Darken() instead of hex-based colour 2019-06-24 13:27:58 +09:00
Dean Herbert
1057301322
Fix multiplayer create button appearing in match song selection (#5132)
Fix multiplayer create button appearing in match song selection
2019-06-24 12:31:39 +09:00
smoogipoo
8d6fc3edf0 Fix multiplayer create button appearing in match song selection 2019-06-24 11:54:41 +09:00
Dean Herbert
c988dfbdaa Make things a bit more sensible 2019-06-24 11:43:34 +09:00
Andrei Zavatski
bbdb114f04 Add missing blank line 2019-06-24 02:09:00 +03:00
Andrei Zavatski
35db20a337 Remove useless bindable check 2019-06-24 02:01:00 +03:00
Andrei Zavatski
94e819578e Finally fix the problem when we can't apply a ruleset in the multi screen
because it's disabled
2019-06-24 01:55:35 +03:00
Andrei Zavatski
60ff497add Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-24 01:06:54 +03:00
mulraf
dfb791ed3e Update PopupDialog.cs
Changed Spacings
2019-06-23 22:59:14 +02:00
mulraf
7bbd6b810f Update PopupDialog.cs
New here, i never really programmed on a big project like this. It looks kinda makeshift and i hope it doesn't cause any other issues but i've seen nothing and it fixed the issue for me. It was all dialog boxes that got cut off at the top (so also deleting all beatmaps etc.)
2019-06-23 20:33:43 +02:00
Andrei Zavatski
8430ac6d1c remove unused using 2019-06-23 19:19:36 +03:00
Andrei Zavatski
1c20df780a Adjust triangles colour 2019-06-23 17:08:18 +03:00
Andrei Zavatski
4963d4e8df CI fixes 2019-06-22 03:08:18 +03:00
Andrei Zavatski
3723ea05de Adjust Title style 2019-06-22 02:52:07 +03:00
Andrei Zavatski
4cd3b15f6e Add triangles 2019-06-22 02:40:33 +03:00
Andrei Zavatski
dbf53e9bda Use correct background colour for sections 2019-06-22 02:06:30 +03:00
Andrei Zavatski
132cb8f473 Add spacing between sections 2019-06-22 01:11:04 +03:00
HoLLy
f072a53e93 Merge remote-tracking branch 'origin/master' into import-stable-scores 2019-06-21 17:42:59 +02:00
HoLLy
d99f4d1a87 Change import button to mention replays instead of scores 2019-06-21 17:42:54 +02:00
HoLLy
802da225d4 Move responsibility for selecting paths to model managers 2019-06-21 17:32:47 +02:00
Joehu
36f59ec86d Remove unused using 2019-06-21 08:29:45 -07:00
Joehu
74e99b2915 Remove unused parameter 2019-06-21 08:11:10 -07:00
Joehu
1d6b6a7828 Fix audio being dimmed on preview tracks 2019-06-21 08:06:57 -07:00
HoLLy
f1f03dd541 Remove async from Import method 2019-06-21 17:01:11 +02:00
HoLLy
fafec00667 Reset top score avatar before updating it 2019-06-21 16:47:19 +02:00
iiSaLMaN
bd842f2a8c
Update tooltip text 2019-06-21 16:38:16 +03:00
Dean Herbert
3ad74e2ff3
Merge branch 'master' into update-framework 2019-06-21 22:24:57 +09:00
Dean Herbert
ca2a3937ea
Fix audio not dimming after race condition (#5049)
Fix audio not dimming after race condition
2019-06-21 22:24:36 +09:00
Dean Herbert
859afefb79
Prevent non-combo affecting judgements from triggering sudden death (#5095)
Prevent non-combo affecting judgements from triggering sudden death
2019-06-21 22:24:00 +09:00
Unknown
1bc1e2459e add SettingsNumberBox and use it in tournament tools 2019-06-21 15:04:52 +02:00
Unknown
16a4805f1f add OsuNumberBox with basic tests 2019-06-21 15:04:52 +02:00
KingLuigi4932
13f6c6a87e Update framework 2019-06-21 15:23:35 +03:00
Dean Herbert
cff5ddb137
Merge branch 'master' into fix-inactive-audio-race 2019-06-21 21:09:12 +09:00
Dean Herbert
f766068e17
Remove local implementation of bindable in OsuCheckbox (#5046)
Remove local implementation of bindable in OsuCheckbox
2019-06-21 21:08:09 +09:00
Dean Herbert
763e000bf1
Merge branch 'master' into not-available-to-download 2019-06-21 20:54:35 +09:00
Dean Herbert
abd0c2bb1a
Move NotificationSection strings to constructor (#5078)
Move NotificationSection strings to constructor
2019-06-21 20:47:31 +09:00
iiSaLMaN
0cc7a604ed
Update font sizes 2019-06-21 14:18:20 +03:00
iiSaLMaN
a1c58b164c
Merge branch 'master' into not-available-to-download 2019-06-21 14:16:31 +03:00
Andrei Zavatski
29305ca0eb fix broken layout 2019-06-21 13:24:12 +03:00
Andrei Zavatski
7680f6cbf4 Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-tabs 2019-06-21 13:06:44 +03:00
Dan Balasescu
67246eddd4
Merge branch 'master' into fix-chat-test-scene 2019-06-21 16:34:35 +09:00
Dan Balasescu
681a123560
Merge branch 'master' into add-spacing-user-profile-ranks 2019-06-21 16:06:49 +09:00
Dean Herbert
ae084157e4
Add tournament streaming and management toolchain (#3491)
Add tournament streaming and management toolchain
2019-06-21 16:02:35 +09:00
Dean Herbert
6627cdefd2
Merge branch 'master' into tournament-tools 2019-06-21 15:52:47 +09:00
Dean Herbert
540b61da0a Add some spacing between user profile ranks 2019-06-21 15:27:19 +09:00
Dean Herbert
5ed6c09aa9
Merge branch 'master' into key-binding-fixes 2019-06-21 15:12:37 +09:00
Dean Herbert
6c5599f874 Fix chat being dismissed in test scene when it shouldn't 2019-06-21 15:09:54 +09:00
Dean Herbert
666d5744cd Fix unbinding not working correctly 2019-06-21 14:43:00 +09:00
David Zhao
de59e038ac Prevent non-combo affecting judgements from triggering sudden death 2019-06-21 14:29:16 +09:00
Dan Balasescu
c79c4641f3
Merge branch 'master' into use-modelbackeddrawable 2019-06-21 14:26:07 +09:00
Dean Herbert
a6e5c6a62a Add cancel/clear buttons in place of instructional text 2019-06-21 13:50:05 +09:00
Dan Balasescu
73d307114f
Merge branch 'master' into notification-overlay-always-present 2019-06-21 13:12:04 +09:00
Dan Balasescu
cbc1eff8f1
Merge branch 'master' into chat-async-improvements 2019-06-21 12:59:58 +09:00
Dan Balasescu
8ab7a8641b
Add comment for why it's not a fill flow 2019-06-21 12:42:35 +09:00
Dan Balasescu
0571bbd555
Merge branch 'master' into carousel-gradient 2019-06-21 12:40:24 +09:00
smoogipoo
7054f54a64 Use OsuScrollContainer for osu menus 2019-06-21 12:33:49 +09:00
Dan Balasescu
61d8cb628a
Merge branch 'master' into music-controller-always-present 2019-06-21 11:57:36 +09:00
Dan Balasescu
6deee968ac
Merge branch 'master' into modselect-async-improvements 2019-06-21 11:42:25 +09:00
Dan Balasescu
4d02e17539
Merge branch 'master' into remove-debug-utils 2019-06-21 11:10:59 +09:00
KingLuigi4932
13578e5c21 Add the null conditional operator back 2019-06-20 19:43:31 +03:00
KingLuigi4932
d754819453 Small changes 2019-06-20 19:09:40 +03:00
Dean Herbert
fa263b91a7 Attempt to fix tests 2019-06-21 00:12:39 +09:00
Dean Herbert
f2200594c9 Remove necessity for MusicController to be always visible 2019-06-20 23:40:25 +09:00
Dean Herbert
52ca5f9c00 Fix mod icons in ModSelect being loaded in a blocking fashion 2019-06-20 23:06:07 +09:00
Dean Herbert
74fabf8db4 Improve ChatOverlay load behaviour 2019-06-20 23:02:02 +09:00
Dean Herbert
4a25a84975 Fix DrawableChannel async flow 2019-06-20 23:01:39 +09:00
Dean Herbert
4ef165fdac Fix ChatLine not being correctly loaded asynchronously 2019-06-20 23:01:02 +09:00
Dean Herbert
21a1fd738b Remove the necessity for NotificationOverlay to always be present
Now it will only become present when there is a pending notification.
2019-06-20 19:06:21 +09:00
Dean Herbert
9a663715cd Make get methods of ProgressNotification return correct values immediately
Previously they were only updated after the resultant schedule ran. This would not bode well when the overlay containing them is not present.
2019-06-20 19:05:33 +09:00
Dean Herbert
6bc2cf85d1 Move NotificationSection strings to constructor 2019-06-20 17:41:12 +09:00
David Zhao
65c84428cc Fix position of gradient in beatmap carousel 2019-06-20 15:05:15 +09:00
Joehu
ca919f02e6 Remove bad words on code comments 2019-06-19 21:33:58 -07:00
Dean Herbert
97d65783db Remove osu!-side DebugUtils 2019-06-20 12:48:45 +09:00
Dean Herbert
133c1fc0f1
Merge branch 'master' into remove-osu-checkbox-bindable 2019-06-20 11:33:39 +09:00
Dean Herbert
7482ecb8e7
Fix beatmap set cover goes out of its container (#5073)
Fix beatmap set cover goes out of its container
2019-06-20 11:21:22 +09:00
Andrei Zavatski
0da8a483c5 Fix scores header is visible even if no scores are loaded 2019-06-19 23:14:53 +03:00
HoLLy
99f1a94797 Fix notification progress bar 2019-06-19 20:50:50 +02:00
HoLLy
c1c19243cd Change FirstOrDefault back to First 2019-06-19 20:40:30 +02:00
HoLLy
8d62ce8967 Remove now unneeded check against file extension 2019-06-19 20:38:43 +02:00
HoLLy
0cb66d522a Check if path can be imported before trying 2019-06-19 20:36:00 +02:00
iiSaLMaN
ee2268caba
Enable masking for the beatmap set cover 2019-06-19 21:20:00 +03:00
HoLLy
ef2e93d5c7 Improve handling of null models when importing 2019-06-19 19:29:47 +02:00
KingLuigi4932
5f5441c692 Add ShowPlaceholderOnNull in updateable flag + do not show placeholders in some overlays 2019-06-19 20:17:02 +03:00
iiSaLMaN
865af00ab6
Merge branch 'master' into header-improvements 2019-06-19 20:00:28 +03:00
Dean Herbert
08cf8dd299 Adjust for readability 2019-06-20 01:39:54 +09:00
Dean Herbert
2773cfba42
Merge branch 'master' into andy840119/_20190614_hidden_nod_label_when_empty 2019-06-20 01:35:24 +09:00
HoLLy
15c75b4442 Add basic score import from stable 2019-06-19 18:33:51 +02:00
Dean Herbert
6f3cb80076
Merge branch 'master' into fix-inactive-audio-race 2019-06-20 01:33:47 +09:00
KingLuigi4932
9f25d3cd72 More changes and improvements 2019-06-19 17:55:36 +03:00
iiSaLMaN
3e285e5dde
Separate beatmap info container from details (avoid overlapping) 2019-06-19 17:47:47 +03:00
iiSaLMaN
15229f3a23
Make header expandable 2019-06-19 17:45:39 +03:00
iiSaLMaN
5fb4f2fadf
Add TOP_PADDING 2019-06-19 17:38:43 +03:00
naoey
4b46601eae
Remove redundant variable, handle all request failures 2019-06-19 19:43:09 +05:30
KingLuigi4932
a6c268ef5c Move the horizontal margin into the sprite text itself 2019-06-19 15:05:53 +03:00
KingLuigi4932
475b40cc02 Remove empty line 2019-06-19 14:47:29 +03:00
KingLuigi4932
4600336581 Use TextFlowContainer + small changes 2019-06-19 14:43:18 +03:00
Andrei Zavatski
17749e84f9 Merge remote-tracking branch 'refs/remotes/ppy/master' into user-online-fix 2019-06-19 12:17:31 +03:00
Andrei Zavatski
1c44fa84fb Fix colour issues 2019-06-19 12:15:32 +03:00
Andrei Zavatski
c8604b2c17 Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-tabs 2019-06-19 12:08:34 +03:00
Dean Herbert
dd926f55bd Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-19 14:55:34 +09:00
Dean Herbert
3043f42eb5
Merge branch 'master' into fix-multiplayer-audio 2019-06-19 14:36:05 +09:00
Dean Herbert
b51aad7433
Merge branch 'master' into fix-multiplayer-audio 2019-06-19 13:36:25 +09:00
Dean Herbert
f26fe53feb Fix startup crash if main menu does not load fast enough 2019-06-19 13:16:19 +09:00
Dean Herbert
6426983de0 Move logic out of update (and simplify, hopefully) 2019-06-19 13:15:58 +09:00
Dean Herbert
fbd9ebf02d
Merge pull request #5054 from peppy/settings-item-unbind-previous-bindable
Unbind from previous bindable when rebinding a SettingsItem
2019-06-19 13:09:19 +09:00
Dean Herbert
26c32ceeb1
Merge branch 'master' into generic-download-model-manager 2019-06-19 12:50:54 +09:00
Dan Balasescu
aef29e2767
Merge branch 'master' into remote-unused-property 2019-06-19 11:18:12 +09:00
KingLuigi4932
6e28294182 Fix another test 2019-06-19 04:27:31 +03:00
KingLuigi4932
97dd34e26c Seperate updateable from drawable 2019-06-19 03:50:16 +03:00
KingLuigi4932
3876442143 More simplifies + fix test 2019-06-19 03:37:08 +03:00
KingLuigi4932
a0609f28d7 Revert some changes + simplify BeatmapNotAvailable 2019-06-19 01:43:28 +03:00
iiSaLMaN
5278c5f365
Merge branch 'master' into not-available-to-download 2019-06-19 01:14:32 +03:00
Dean Herbert
bc8ce5d188
Merge branch 'master' into use-modelbackeddrawable 2019-06-19 06:27:36 +09:00
Andrei Zavatski
2fb1052a1e Add missing space 2019-06-18 21:04:36 +03:00
KingLuigi4932
a5adc89839 Update framework 2019-06-18 20:37:56 +03:00
Dean Herbert
1bcff8a3e2 Make generic covariant 2019-06-19 01:57:38 +09:00
Dean Herbert
341dc74834 Simplify download method 2019-06-19 01:41:19 +09:00
Dean Herbert
f2e0ced052 Move private event handling logic to bottom of class 2019-06-19 01:32:37 +09:00
Dean Herbert
d65c20bbdc
Merge branch 'master' into generic-download-model-manager 2019-06-19 01:29:06 +09:00
Andrei Zavatski
03d560ed41 Initial implementation 2019-06-18 19:13:21 +03:00
Andrei Zavatski
3c3757f12e Make ProfileTabControl based on OverlayTabControl 2019-06-18 16:23:57 +03:00
Andrei Zavatski
a7306248d1 Implement OverlayTabControl class
An abstraction for OverlayHeaderTabControl
2019-06-18 16:20:35 +03:00
Shane Woolcock
17d103181c Merge branch 'master' into android 2019-06-18 20:05:14 +09:30
Dean Herbert
4911bf1157 Revert unnecessary changes to APIBeatmap 2019-06-18 18:03:16 +09:00
Dean Herbert
6823ba1ab0 Unbind from previous bindable when rebinding a SettingsItem 2019-06-18 14:24:44 +09:00
Dean Herbert
5bb8649f3b Remove unused property from chat message 2019-06-18 14:22:59 +09:00
Dean Herbert
07ea0f9755 Make OsuButton non-abstract again 2019-06-18 14:16:54 +09:00
Dean Herbert
40eb6f4986 Undo ordering change to OsuFont 2019-06-18 14:15:22 +09:00
Dean Herbert
584113997a Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-18 14:15:06 +09:00
Andrei Zavatski
413c2158e2 Simplify bindables usage 2019-06-18 01:11:05 +03:00
Andrei Zavatski
c95e3da3ec Implement a BindableRulesetSelector 2019-06-18 00:23:00 +03:00
Andrei Zavatski
cecbcd21b2 Merge remote-tracking branch 'upstream/master' into toolbar-rulesets-refactor 2019-06-17 23:12:55 +03:00
KingLuigi4932
d6a39b8a2a Fix CI issues + slight change 2019-06-17 22:33:27 +03:00
KingLuigi4932
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
KingLuigi4932
d665f1fe4b Seperate drawable and updateable flag from Country + Use UpdateableFlag 2019-06-17 20:57:57 +03:00
KingLuigi4932
794ba17a2f Seperate UpdateableRank from DrawableRank and use it 2019-06-17 20:04:09 +03:00
Dean Herbert
c32d17d16a Fix audio not dimming after race condition
Also adjusts transition slightly for smoother effect.
2019-06-18 01:32:52 +09:00
Lucas A
04dc1c1744
Fix typo in comment
Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>
2019-06-17 16:44:53 +02:00
Dean Herbert
3a04684efb Add region 2019-06-17 23:25:16 +09:00
Dean Herbert
ad4c9babe7 Adjust naming and transitions 2019-06-17 23:24:52 +09:00
iiSaLMaN
0c299d651f
Merge branch 'master' into use-modelbackeddrawable 2019-06-17 17:06:10 +03:00
Dean Herbert
26d5c2d85a Remove local implementation of bindable in OsuCheckbox 2019-06-17 19:37:24 +09:00
Lucas A
d7d6feb001 Fade volume in / out when game window becomes active / inactive 2019-06-17 12:31:23 +02:00
Dean Herbert
b259710a62 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-17 19:30:17 +09:00
Dean Herbert
84a0b948e1 Fix typo in VersionNavigation class name 2019-06-17 16:32:38 +09:00
iiSaLMaN
3087099b32
Use ModelBackedDrawable in DrawableRank 2019-06-17 07:34:35 +03:00
iiSaLMaN
4cb9563af2
Use ModelBackedDrawable in UpdateableAvatar 2019-06-17 07:16:38 +03:00
iiSaLMaN
98f8b1d59a
Use ModelBackedDrawable in DrawableFlag 2019-06-17 06:44:24 +03:00
smoogipoo
c1d2fff651 Use RestartPoint 2019-06-17 12:44:19 +09:00
smoogipoo
bc35a30a25 Fix audio being dimmed during multiplayer 2019-06-17 12:27:53 +09:00
andy840119
4e85481fd4 Merge branch 'master' of https://github.com/ppy/osu into andy840119/_20190614_hidden_nod_label_when_empty 2019-06-16 13:27:15 +09:00
andy840119
84b4e877f8 using FadeTo instead of show/hide
headerLabel.FadeTo() is still remain because effect can be visible when expand== true
2019-06-16 13:27:01 +09:00
Joehu
1a9efb3d7a Fix editor play button 2019-06-15 11:05:58 -07:00
smoogipoo
d693b2a329 Fix multiplayer score submission failing silently 2019-06-16 00:31:14 +09:00
smoogipoo
2e7922c3f9 Fix 0-length sliders not getting correct lengths 2019-06-15 23:53:28 +09:00
Dean Herbert
d7bea3aa18 Update framework 2019-06-15 19:38:05 +09:00
Dean Herbert
38616a2bb5
Merge branch 'master' into fix-beatmapoverlay-graphs 2019-06-15 18:37:01 +09:00
naoey
4a16ac53ba
Remove extra newline 2019-06-15 12:28:23 +05:30
Dean Herbert
7d49028a60
Merge branch 'master' into change-download-extension 2019-06-15 15:37:19 +09:00
Dean Herbert
4882283084
Merge branch 'master' into generic-download-model-manager 2019-06-15 15:35:08 +09:00
Dean Herbert
2b48f5d3e0 Tidy up updateMetrics flow 2019-06-15 14:45:51 +09:00
andy840119
1a73178260 using FadeTo() instead of FadeIn()/FadeOut() 2019-06-15 13:28:03 +08:00
Dean Herbert
587edcb716
Merge branch 'master' into fix-beatmapoverlay-graphs 2019-06-15 13:42:13 +09:00
Dean Herbert
0ca33e16dd Update framework 2019-06-14 23:25:29 +09:00
Dean Herbert
1b75fbed9a Merge remote-tracking branch 'upstream/master' into update-scrollcontainer 2019-06-14 23:25:17 +09:00
Dean Herbert
cf713fbacc
Merge branch 'master' into fix-stacking-shaking 2019-06-14 22:16:35 +09:00
Dean Herbert
bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
Dean Herbert
15b9b53d35 Fix IconButtons not being scaled correctly 2019-06-14 13:40:32 +09:00
為什麼
9114c8dee7 remve unnecessary effect. 2019-06-14 11:44:03 +08:00
為什麼
0db9816321 expanded -> expand 2019-06-14 11:23:41 +08:00
為什麼
c30e467717 oops 2019-06-14 11:12:30 +08:00
andy840119
3a14794c43 use show/hide instead because FillFlowContainer's spacing 2019-06-14 01:43:20 +09:00
andy840119
4f0aff3d9c hide label when mod is empty 2019-06-14 01:12:56 +09:00
naoey
3c2a2b2390
Move doc to interface 2019-06-13 21:28:32 +05:30
KingLuigi4932
155f7c7e03 Use OsuTextFlowContainer for multi-lines 2019-06-13 17:32:27 +03:00
naoey
aa7cae0879
Rephrase xmldoc 2019-06-13 16:55:41 +05:30
naoey
52c7ed9960
Add ability to change the flie extension of API download requests 2019-06-13 16:16:48 +05:30
Dean Herbert
8d0d1ca378
Merge branch 'master' into tournament-tools 2019-06-13 19:44:43 +09:00
Dean Herbert
9e4f2c7eb9 Move font local 2019-06-13 19:41:01 +09:00
smoogipoo
389997dbc4 Fix metrics being populated with null ratings 2019-06-13 19:14:58 +09:00
Dean Herbert
ee9d82f0fe Revert right click handling for now 2019-06-13 19:10:57 +09:00
Dean Herbert
d744c900c2 Fix incorrect unbind logic 2019-06-13 19:04:59 +09:00
smoogipoo
39f9deea96 Add success rate test scene 2019-06-13 18:44:00 +09:00
smoogipoo
6b615d763a Fix potential nullref 2019-06-13 18:43:51 +09:00
smoogipoo
f2b5f274cf Add details test scene + fix metrics not getting updated correctly 2019-06-13 18:31:39 +09:00
smoogipoo
7af2d650cd Fix potential nullref 2019-06-13 18:31:12 +09:00
smoogipoo
f54f6e552b Fix beatmap details potentially using the incorrect metrics 2019-06-13 18:04:42 +09:00
smoogipoo
dd7335079f Fix beatmap set overlay not showing ratings 2019-06-13 17:01:57 +09:00
smoogipoo
583bb53f53 Remove GetBeatmapDetailsRequest 2019-06-13 16:57:19 +09:00
smoogipoo
0a79b444d9 Move metrics to beatmap set 2019-06-13 16:52:49 +09:00
smoogipoo
f240a157b2 Deserialize API metrics 2019-06-13 16:39:38 +09:00
smoogipoo
aef94ce9f1 Make BeatmapMetrics non-IEnumerables 2019-06-13 16:30:38 +09:00
Dean Herbert
1f24541883 Re-expose OsuButton 2019-06-13 15:43:03 +09:00
smoogipoo
4818187d8f Reset result timeoffset to 0 when rewound 2019-06-13 14:55:52 +09:00
Dean Herbert
830ddbc2de Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-13 12:49:52 +09:00
smoogipoo
27fdda8b91 Don't update hitobject results when rewinding 2019-06-13 12:21:49 +09:00
EVAST9919
e5a6d920cd Implement an abstract RulesetSelector class 2019-06-12 23:23:01 +03:00
EVAST9919
8d8615773c Fix selection is being possible even in disabled state 2019-06-12 20:54:19 +03:00
EVAST9919
3150b5cfb4 Naming adjustments 2019-06-12 20:51:21 +03:00
KingLuigi4932
1a50544c94 Add tests for undownloadable / parts-removed beatmapsets 2019-06-12 20:42:52 +03:00
EVAST9919
065b4cd055 Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-12 20:35:51 +03:00
naoey
7ba676ad31
Rename Info to Model 2019-06-12 21:56:36 +05:30
KingLuigi4932
744f32ab35 Fix little bug 2019-06-12 19:11:05 +03:00
KingLuigi4932
c5c6f6b9e0 Allow for not refetching in ShowBeatmapSet (will be used for tests) 2019-06-12 18:36:47 +03:00
KingLuigi4932
a069a3029e Make DownloadButton accessible by DirectPanel 2019-06-12 18:07:57 +03:00
KingLuigi4932
efd9766fb3 Make Header accessible by BeatmapSetOverlay 2019-06-12 17:37:34 +03:00
naoey
9cd5519da3
Remove unused delegate, use model name in notifications, add more xmldoc
- Applies a `class` constraint to the generic type in `IModelManager`
- Add xmldoc
2019-06-12 19:26:06 +05:30
naoey
c5f1da0f71
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-12 18:20:35 +05:30
Dean Herbert
224e417f68
Merge pull request #5005 from peppy/fix-social-overlay-performance
Fix abysmal load performance when showing the social overlay
2019-06-12 21:14:33 +09:00
Dean Herbert
dab18cb9da
Merge pull request #5004 from smoogipoo/improve-deletion-notification
Improve model deletion notification text
2019-06-12 21:14:18 +09:00
naoey
951a5abccc
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-12 17:41:16 +05:30
smoogipoo
a17d480f51 Use "beatmap" as the model name 2019-06-12 20:41:02 +09:00
Dan Balasescu
169c18d238
Merge branch 'master' into fix-social-overlay-performance 2019-06-12 20:37:15 +09:00
Dean Herbert
021d0273f9
Split out user activity from user status (#4619)
Split out user activity from user status

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-12 20:14:03 +09:00
Dean Herbert
0f000fcc14 Fix abysmal load performance when showing the social overlay 2019-06-12 19:58:26 +09:00
Dean Herbert
b2b3df3885 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-12 18:28:43 +09:00
Dean Herbert
f358fce9ab Move activity (writable) bindable to APIAccess so it correctly transfers between users 2019-06-12 18:04:57 +09:00
Dean Herbert
412c9646ec
Merge branch 'master' into improve-deletion-notification 2019-06-12 17:47:00 +09:00
smoogipoo
d4deac48ee Improve model deletion notification text 2019-06-12 17:27:15 +09:00
smoogipoo
243cd517ad Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
2019-06-12 17:24:16 +09:00
smoogipoo
2a67944889 Remove interlocked within a lock 2019-06-12 17:10:55 +09:00
smoogipoo
fd7dc9504e Remove async when not required 2019-06-12 17:08:50 +09:00
smoogipoo
c4f54d94bc Rename methods 2019-06-12 17:00:38 +09:00
smoogipoo
28f8b04765 Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups 2019-06-12 16:47:56 +09:00
Dan Balasescu
47dad52091
Merge branch 'master' into fix-checkbox-filterability 2019-06-12 16:43:30 +09:00
Dean Herbert
20b43c20c8 Rename variables to remove redundant "screen" terminology 2019-06-12 16:33:15 +09:00
smoogipoo
13234fb4a4 Adjust comments a bit 2019-06-12 16:07:35 +09:00
Dean Herbert
a9c229b1ec Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-12 16:00:35 +09:00
Dean Herbert
fc1f778b82 Remove implicit null 2019-06-12 15:53:53 +09:00
Dean Herbert
94e65a3244 Fix settings checkboxes not being searchable 2019-06-12 15:16:59 +09:00
smoogipoo
5d3fa51360 Merge remote-tracking branch 'origin/master' into selection-update 2019-06-12 15:10:57 +09:00
Dean Herbert
c591a6f1fa Rename request type to be less verbose 2019-06-12 13:30:23 +09:00
Dean Herbert
eaeeffaa86 Rename to DownloadableArchiveModelManager 2019-06-12 13:28:44 +09:00
Dean Herbert
b29b1bf254
Merge branch 'master' into mod-grow-improvement 2019-06-12 13:18:02 +09:00
naoey
ba6546038c
Make ModelInfo and abstract class constructor protected
- Implementing classes would be better off exposing it if necessary under a different name
2019-06-12 00:55:43 +05:30
naoey
7495bc5d3a
Post merge and inverted condition fix 2019-06-12 00:42:05 +05:30
naoey
27ac06e9de
Merge branch 'generic-download-model-manager' into generic-download-tracking-composite 2019-06-12 00:07:44 +05:30
naoey
fe76fa9d75
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-12 00:03:43 +05:30
naoey
c69d3e2d38
Fix doc move derp 2019-06-12 00:02:53 +05:30
naoey
c320b6110c
Rename interface
- Fix wrong inheritance in ArchiveModelManager
- Add license headers
2019-06-11 23:53:37 +05:30
Lucas A
51d428ef94 Refactor UserPanel status display logic 2019-06-11 20:00:14 +02:00
naoey
41da491a7e
Make BeatmapSetInfo equatable 2019-06-11 23:23:40 +05:30
Lucas A
15893bbb75 Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages. 2019-06-11 19:41:48 +02:00
naoey
ab27d82cd5
Make beatmap download buttons inherit BeatmapDownloadTrackingComposite
- Move DownloadTrackingComposite into the online namespace
2019-06-11 23:01:01 +05:30
Lucas A
6c74998487 Set ScreenActivity to InitialScreenActivity only when ScreenActivity hasn't been set manually before. 2019-06-11 19:24:36 +02:00
naoey
4a6074865e
Create interfaces for DownloadTrackingComposite to consume 2019-06-11 22:42:57 +05:30
naoey
d903ad2186
Fix order 2019-06-11 21:30:25 +05:30
naoey
06a558c4b7
Remove unecessary third generic and change usages to match 2019-06-11 21:11:30 +05:30
Dean Herbert
27054a744e Fill in thread pool names 2019-06-12 00:35:13 +09:00
naoey
f4dab4da85
Add method to check if model exists locally already 2019-06-11 20:53:44 +05:30
Dean Herbert
606be3d7ce
Merge branch 'master' into backgrounded-beatmap-status-lookups 2019-06-12 00:22:47 +09:00
Dean Herbert
a690a67a6c
Merge branch 'master' into fullscreen-overlay-surface 2019-06-12 00:07:30 +09:00
naoey
709ca03a08
Remove unused usings 2019-06-11 20:21:06 +05:30
naoey
802f48712d
Add ability to perform a download request with options 2019-06-11 20:14:36 +05:30
naoey
8ff26a8fbc
Add license headers and xmldoc 2019-06-11 19:49:10 +05:30
naoey
341d137f5c
Make BeatmapManager inherit from new base class 2019-06-11 19:36:08 +05:30
naoey
b4de51b612
Create a generic base archive download manager class 2019-06-11 18:29:33 +05:30
Dean Herbert
6a34d5575b Bump framework version 2019-06-11 20:44:11 +09:00
Dean Herbert
00ee45fe46 Merge remote-tracking branch 'origin/update-visibility-container' into update-framework 2019-06-11 19:36:13 +09:00
Dean Herbert
261badc770 Update framework 2019-06-11 19:24:54 +09:00
Dean Herbert
5c2c4f0ada
Merge pull request #4878 from HoLLy-HaCKeR/expose-skills
Expose skills in DifficultyAttributes
2019-06-11 18:47:56 +09:00
Dean Herbert
6973e1af4d
Fix incorrect xmldoc in OsuAnimatedButton (#4984)
Fix incorrect xmldoc in OsuAnimatedButton
2019-06-11 18:45:23 +09:00
Dean Herbert
591be33fc2
Merge branch 'master' into async-results-pages 2019-06-11 18:45:06 +09:00
Dean Herbert
86b6070ae8
Tween track frequency on pause (#4973)
Tween track frequency on pause
2019-06-11 18:44:56 +09:00
iiSaLMaN
1c6a81e2aa
Merge branch 'master' into not-available-to-download 2019-06-11 12:32:46 +03:00
KingLuigi4932
130ff56886 Move logic into BeatmapNotAvailable 2019-06-11 12:29:42 +03:00
smoogipoo
a9758ba813 Merge remote-tracking branch 'origin/master' into fix-checkbox-overlap 2019-06-11 18:26:42 +09:00
smoogipoo
e5417416a2 Remove braces 2019-06-11 18:24:50 +09:00
Arphox
07e17518e9 Fix all "Maintainability" CodeFactor issues 2019-06-11 10:28:16 +02:00
Dean Herbert
8de62b608e Allow FullscreenOverlay to surface to front on subsequent Show requests 2019-06-11 15:22:27 +09:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
Lucas A
141775d98c Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-10 21:41:00 +02:00
iiSaLMaN
94a7794ff7
Fix issue 2019-06-10 21:54:33 +03:00
iiSaLMaN
ae284d1127
Merge branch 'master' into not-available-to-download 2019-06-10 21:39:32 +03:00
KingLuigi4932
75716af25e Forgot to return 2019-06-10 21:14:12 +03:00
KingLuigi4932
70fdd4ba5b Disable download button + Fix AppVeyor Errors 2019-06-10 21:13:37 +03:00
KingLuigi4932
3202110b80 Add a container for Beatmap Availability 2019-06-10 20:17:44 +03:00
Lucas A
2e911d0e96 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-10 19:13:54 +02:00
Dean Herbert
71e15fe0f1 Fix incorrect xmldoc in OsuAnimatedButton 2019-06-11 01:21:01 +09:00
Dean Herbert
e87123342c Load results pages asynchronously
Reduces performance burden when first displaying pages. Closes #4977.
2019-06-10 23:51:09 +09:00
KingLuigi4932
adbf4d374e Redirecting ShowBeatmapSet to FetchAndShowBeatmapSet 2019-06-10 14:15:49 +03:00
Dean Herbert
fc0fc8f164
Merge branch 'master' into backgrounded-beatmap-status-lookups 2019-06-10 19:37:35 +09:00
Dean Herbert
6ca2fcebfc Centalise and prefix all ArchiveModelManager database logging 2019-06-10 19:34:32 +09:00
Dean Herbert
29945f27c5 Fix imported count incrementing on failures 2019-06-10 19:33:55 +09:00
Dean Herbert
54497fb1e7 Fix prefixing spaces in BeatmapInfo's ToString when metadata is not populated yet 2019-06-10 19:33:23 +09:00
KingLuigi4932
3fc604b60a Add Availability to BeatmapSetOnlineInfo 2019-06-10 13:18:38 +03:00
Dean Herbert
6cda2cdb82 Fix exception output to use humanised model name 2019-06-10 18:41:56 +09:00
Dean Herbert
f7a699e4a2 Better documentation for import scheduler singleton 2019-06-10 18:38:03 +09:00
Dean Herbert
d7cb932606
Merge branch 'master' into selection-update 2019-06-10 17:51:40 +09:00
Dean Herbert
c8bd92659b Clean up exception and null handling in Import process 2019-06-10 17:12:37 +09:00
Dean Herbert
559413f766 Avoid using ContinueWith in already async context 2019-06-10 17:12:25 +09:00
Dean Herbert
5b75060b94 Add test for rollback logic correctly dereferencing files 2019-06-10 16:45:45 +09:00
Dean Herbert
02b376d962 Fix rollback logic not necessrily cleaning up file store 2019-06-10 16:14:42 +09:00
Dean Herbert
fae32b3901 Return shorter class name in error messages 2019-06-10 16:14:11 +09:00
Dean Herbert
9bdc8b47bb Remove unnecessary async-await pair 2019-06-10 16:13:51 +09:00
Dean Herbert
f31b19e0d7 Don't unwrap exception manually 2019-06-10 16:02:49 +09:00
EVAST9919
27163c9996 Fix crashes in some cases
When we want to switch ruleset from outside of the selector, but it's
blocked (multiplayer is a good example)
2019-06-10 09:18:48 +03:00
Dean Herbert
e19f4935c3 Fix incorrect undo logic on exception 2019-06-10 14:13:36 +09:00
Dean Herbert
e4bad93b66 Use variable for web request concurrency for clarity 2019-06-10 13:52:09 +09:00
Dean Herbert
b79fdfc12f Fix one more instance of improperly handled cancellation 2019-06-10 13:50:22 +09:00
Dean Herbert
2d1a54e634 Properly implement cancellation 2019-06-10 13:42:38 +09:00
Dean Herbert
b4d2d0bd0b Simplify and combine concurrency of ArchiveModelManager 2019-06-10 13:42:33 +09:00
Dean Herbert
600503ec8e Use Task.Run/Wait to avoid warnings 2019-06-10 13:42:29 +09:00
smoogipoo
f090e292c9 Move ArchiveModelManager import process to async flow 2019-06-10 13:42:22 +09:00
Albert Tang
62639d347f Merge branch 'master' into android 2019-06-09 21:03:48 -05:00
EVAST9919
ec8c09dd39 Fix unability to mannualy switch ruleset 2019-06-10 04:36:34 +03:00
EVAST9919
9b8540d818 Add a testcase 2019-06-10 03:35:00 +03:00
Lucas A
4f6978f2aa Apply review suggestions. 2019-06-09 20:01:19 +02:00
Dean Herbert
5c2ea0b1a7 Move dispose to end of file 2019-06-10 01:14:46 +09:00
Dean Herbert
d964f6ba9e Tween track frequency on pause 2019-06-10 00:56:35 +09:00
EVAST9919
d86e3d0c4c Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-09 18:06:24 +03:00
Dean Herbert
a5007b94db Update resources 2019-06-09 22:31:02 +09:00
iiSaLMaN
3979dab573
Merge branch 'master' into rename-f-to-d 2019-06-09 16:04:26 +03:00
Shane Woolcock
807d434be0 Access WindowModes via IBindableList 2019-06-09 17:52:02 +09:30
Dean Herbert
cd89633dee Rename variable to match 2019-06-09 17:07:23 +09:00
Dean Herbert
d500f3605e Fix checkboxes with long labels overlapping nub 2019-06-09 16:48:03 +09:00
Dean Herbert
126d168527 Merge remote-tracking branch 'upstream/master' into mod-grow-improvement 2019-06-09 16:29:01 +09:00
Ganendra Afrasya
49193a2703 Rename the setting label 2019-06-09 13:12:41 +07:00
Ganendra Afrasya
afc3a08953 Use existing setting instead
Now it read IncreaseFirstObjectVisibility bindable instead
2019-06-09 13:11:40 +07:00
iiSaLMaN
a2b9dba92c
Remove ScoreRank.F 2019-06-08 19:35:29 +03:00
iiSaLMaN
dfbc652803
Use ScoreRank.D instead of F 2019-06-08 19:32:26 +03:00
iiSaLMaN
383b937a7e
Rename F grade to D 2019-06-08 19:10:00 +03:00
EVAST9919
62eadf21c9 Remove useless line 2019-06-08 18:38:52 +03:00
EVAST9919
06dfa42a5a Refactor 2019-06-08 18:27:40 +03:00
EVAST9919
d1d3cfa991 Remove ruleset selector from the user overlay 2019-06-08 11:55:52 +03:00
EVAST9919
ea492772cf Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes 2019-06-08 11:31:28 +03:00
Lucas A
e8c73f3127 Make APIChangelogEntry.Major a non-nullable property 2019-06-08 09:45:34 +02:00
Lucas A
342e39776a Move ChangelogEntries populating logic from constructor to BDL load() to use OsuColour palette +apply review suggestions. 2019-06-07 20:59:56 +02:00
Ganendra Afrasya
f326264a85 Adding increase first object grow mod visibility setting 2019-06-08 00:42:57 +07:00
Lucas A
e5b64bfa39 Highlight major changes in changelog overlay 2019-06-07 18:51:43 +02:00
Dean Herbert
cd4648a647 Update framework 2019-06-07 21:09:59 +09:00
Dan Balasescu
346c4310c3
Merge branch 'master' into fail-animation 2019-06-07 20:48:36 +09:00
Dan Balasescu
6a06ea2aee
Merge branch 'master' into ruleset_fix 2019-06-07 20:36:29 +09:00
Dean Herbert
b28b59a496
Fix paginated layouts only showing one column even if enough space is available for more (#4946)
Fix paginated layouts only showing one column even if enough space is available for more

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-07 20:26:34 +09:00
Dean Herbert
011ccffde7
Add an input source toggle on manual input test scenes (#4945)
Add an input source toggle on manual input test scenes
2019-06-07 20:26:26 +09:00
Dean Herbert
1f0a19deaa
Fix preview tracks muting themselves (#4944)
Fix preview tracks muting themselves
2019-06-07 20:26:12 +09:00
Dan Balasescu
b6896b31c9
Merge branch 'master' into fix-paginated-layout 2019-06-07 20:19:14 +09:00
Dean Herbert
8f30c9b0a3 Fix file layout of ModSelectOverlay 2019-06-07 15:58:24 +09:00
Dean Herbert
7ffc08b187
Merge branch 'master' into master 2019-06-07 15:34:14 +09:00
Dean Herbert
b914bb1e2e Remove key hints for now
A proper design for this will come in the future.
2019-06-07 15:32:48 +09:00
Dean Herbert
0ce5c7468f Use switch and consume/block input 2019-06-07 15:31:23 +09:00
Dean Herbert
2531250f89 Fix paginated layouts only showing one column even if enough space is available for more 2019-06-07 14:58:04 +09:00
Dean Herbert
60b70c0f45 Use lambda for simple functions 2019-06-07 14:11:21 +09:00
Dean Herbert
1374da7c41 Remove all calls to return user input 2019-06-07 12:54:57 +09:00
Dean Herbert
0fc2c596b6 Add toggle for input priority in manual input tests 2019-06-07 12:53:51 +09:00
Dean Herbert
64d5aa318f Apply rebased changes 2019-06-07 11:45:58 +09:00
Dean Herbert
358a08cf9d Merge branch 'master' into OsuHoverContainer 2019-06-07 11:40:33 +09:00
Dean Herbert
9f740f69bb Fix preview tracks muting themselves
Closes #4937
2019-06-07 11:21:10 +09:00
EVAST9919
210437042f Remove useless update calls in ToolbarRulesetSelector 2019-06-07 02:39:36 +03:00
EVAST9919
923f9fb6cd Naming adjustments 2019-06-07 01:43:26 +03:00
EVAST9919
2a303748e3 Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes 2019-06-07 01:23:10 +03:00
Dean Herbert
b93446688c
Fix sizing of OsuAnimatedButton and OsuClickableContainer (#4898)
Fix sizing of OsuAnimatedButton and OsuClickableContainer
2019-06-07 00:17:39 +09:00
smoogipoo
6bf6e22149 Update framework 2019-06-06 20:33:03 +09:00
smoogipoo
90966b113b Merge remote-tracking branch 'origin/master' into ftb-prepass 2019-06-06 20:32:38 +09:00
Dean Herbert
483049703e
Merge branch 'master' into beatmap-dateadded-sort 2019-06-06 18:26:55 +09:00
smoogipoo
4d035afcc6 Add setting to bypass front-to-back 2019-06-06 16:49:42 +09:00
smoogipoo
c7d0fcd42a Update drawnodes 2019-06-06 16:49:35 +09:00
Dan Balasescu
032ed033d0
Merge branch 'master' into hold-to-confirm-dim-volume 2019-06-06 15:41:49 +09:00
Dean Herbert
02283380c4 Use manual migration 2019-06-06 13:33:30 +09:00
Welsar55
c04c6693c2 Change close action from PopOut to Hide and switched to TriangleButton.Click() 2019-06-05 13:01:21 -05:00
Lucas A
a2bc5b538e Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-05 16:59:38 +02:00
Lucas A
da20be9a4b Fetch IAPIProvider via Resolved attribute 2019-06-05 16:59:08 +02:00
Dean Herbert
8607f3b765 Merge remote-tracking branch 'upstream/master' into databased-sin-setting 2019-06-05 19:03:57 +09:00
smoogipoo
a6dc5606bc Allow beatmapsets to be sorted by date added 2019-06-05 18:17:43 +09:00
Dean Herbert
2538f32fae Merge branch 'osu-clickable-container' into OsuHoverContainer 2019-06-05 10:34:20 +09:00
Arphox
900cd5c484 Restore original values in FadeColour method call 2019-06-04 21:37:10 +02:00
Arphox
5f4d7437bc Fix the issue
When Enabled's value has been changed to true, it will now check if it is currently howered, and if yes, it will fade in correctly.
2019-06-04 21:30:49 +02:00
EVAST9919
e20a899265 remove excessive null check 2019-06-04 21:46:43 +03:00
EVAST9919
05aeb66973 Fix possible crash due to null user or playmode 2019-06-04 20:20:07 +03:00
EVAST9919
e9403bf2f7 Move GamemodeControl to UserProfileOverlay 2019-06-04 19:33:55 +03:00
EVAST9919
8260b61db5 Fix CI issues 2019-06-04 19:02:09 +03:00
EVAST9919
0c48aec265 Split SetDefaultGamemode into two functions 2019-06-04 18:37:31 +03:00
EVAST9919
d0d846469a Move GamemodeTabItem to a distinct class 2019-06-04 18:14:03 +03:00
EVAST9919
367fdcf519 Make GamemodeControl depend on rulesets 2019-06-04 18:07:52 +03:00
EVAST9919
c1b04746f8 Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes 2019-06-04 17:52:26 +03:00
EVAST9919
a0f7f69f46 retrieve user's default playmode 2019-06-04 17:51:56 +03:00
EVAST9919
0abb48882c Implement GamemodeControl 2019-06-04 16:22:54 +03:00
Dean Herbert
2e3d392a9f Mark OsuButton as abstract
Not being used directly, so we probably shouldn't support it for now.
2019-06-04 22:12:55 +09:00
Dean Herbert
7d2a75b350 Dim music volume when holding to confirm 2019-06-04 18:37:26 +09:00
Dean Herbert
4e7f2b8f47
Merge branch 'master' into osu-clickable-container 2019-06-04 17:42:17 +09:00
Dean Herbert
9c214c3f0e Add animation on failing 2019-06-04 16:13:16 +09:00
Dean Herbert
b8fc535124 Fix blueprint tests crashing due to out-of-order operations 2019-06-04 12:08:23 +09:00
Dean Herbert
80a66b8b3a Merge remote-tracking branch 'upstream/master' into audio-refactor-update 2019-06-04 12:08:21 +09:00
smoogipoo
4763a41c7e Cleanups 2019-06-04 11:25:18 +09:00
smoogipoo
474191fcec Update framework 2019-06-04 11:13:21 +09:00
Dan Balasescu
6e79e374e2
Merge branch 'master' into fix-endless-tests 2019-06-04 11:07:50 +09:00
smoogipoo
cea353975f Update with further framework-side changes 2019-06-04 11:04:28 +09:00
smoogipoo
53a39e9142 Merge remote-tracking branch 'origin/master' into audio-refactor-update 2019-06-04 10:50:33 +09:00
Dean Herbert
e8315085c0 Better handle OnClick 2019-06-04 10:26:21 +09:00
EVAST9919
d5a2ebf79f Fix endless loading state part 2 2019-06-04 04:04:33 +03:00
EVAST9919
2c71371282 Fix endless loading state 2019-06-04 02:06:15 +03:00
EVAST9919
fe6b4112c6 Adjust colors to match web design 2019-06-04 01:47:45 +03:00
EVAST9919
7e96ff7f14 Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update 2019-06-04 01:32:12 +03:00
Welsar55
194bb80354 Added close button and indictors of hotkeys to buttons 2019-06-03 11:09:21 -05:00
Dean Herbert
167213d3eb
Merge branch 'master' into fix-endless-tests 2019-06-04 00:50:18 +09:00
LeNitrous
516575a132 don't create "Start Chat" option when the sender is the local user 2019-06-03 18:54:29 +08:00
LeNitrous
4e6d7137aa disallow current user from opening their own private channel 2019-06-03 17:25:19 +08:00
Dean Herbert
633c3b74ec Don't handle clicks when in a loading state 2019-06-03 17:10:33 +09:00
Dean Herbert
c4f4f32db8 Shorten fade duration 2019-06-03 17:10:33 +09:00
Dean Herbert
491c9e96e0 Fix tests not ending execution after some exceptions 2019-06-03 16:42:27 +09:00
Dean Herbert
171fc14776 Fix editor regressions 2019-06-03 16:34:09 +09:00
Welsar55
fa331fbee1 Merge branch 'master' of https://github.com/ppy/osu 2019-06-03 01:23:25 -05:00
Dean Herbert
65e3b7c2ae Remove unused DI 2019-06-03 13:58:55 +09:00
Dean Herbert
e55f5efa82 Merge branch 'osu-clickable-container' into settings-footer-show-changelog-current-build 2019-06-03 13:55:23 +09:00
Dean Herbert
cf9bc831ab
Merge branch 'master' into osu-clickable-container 2019-06-03 13:55:08 +09:00
Dean Herbert
3ef17a54f6 Fix sizing of OsuAnimatedButton and OsuClickableContainer
Was incorrect under some combinations of relative and autosize usage.
2019-06-03 13:53:24 +09:00
Dean Herbert
4e5788959e Make clickable text actually a button 2019-06-03 13:38:06 +09:00
Dean Herbert
115a75e4c6 Use a constant for lazer variables 2019-06-03 13:16:05 +09:00
Dean Herbert
dff7053a07
Merge branch 'master' into more_button_update 2019-06-03 11:48:05 +09:00
Dean Herbert
2d15e02406
Merge branch 'master' into selection-update 2019-06-03 11:47:30 +09:00
EVAST9919
6957b20309 Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link 2019-06-03 03:13:46 +03:00
Lucas A
d8f45f7299 Disallow null references for dependencies loaded via load() 2019-06-02 15:17:03 +02:00
Lucas A
0a867e37af Resolve dependencies via Resolved Attribute 2019-06-02 12:40:18 +02:00
Lucas A
58564579e4 Invert if statement 2019-06-01 08:46:38 +02:00
Lucas A
0625f51e65 Allow dependencies to be null in certain cases (Unit tests) 2019-05-31 22:42:09 +02:00
Lucas A
55c0c6a1bb Show changelog for current build by clicking on settings footer in settings overlay. 2019-05-31 17:43:58 +02:00
Lucas A
b3f6640d11 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-31 12:41:26 +02:00
Dean Herbert
32a2aba631
Merge branch 'master' into logo-idle 2019-05-31 18:50:28 +09:00
Dean Herbert
b20ea93906
Merge branch 'master' into audio-refactor-update 2019-05-31 14:58:53 +09:00
Dean Herbert
b52276c489 Pass individual components to DummyWorkingBeatmap, not game 2019-05-31 14:51:12 +09:00
Dean Herbert
f33a5bc54c Centralise and update WorkingBeatmap creation in test cases 2019-05-31 14:40:53 +09:00
Dean Herbert
80d65f9a3b Update resource stores with GetAvailableResources 2019-05-31 14:33:18 +09:00
Dean Herbert
1629534a0c More disposal? 2019-05-31 14:28:53 +09:00
David Zhao
465aa4e0f6 Prevent idle state from being updated incorrectly 2019-05-31 14:06:18 +09:00
smoogipoo
d7ccf939d8 General refactoring 2019-05-31 13:54:40 +09:00
smoogipoo
e7ae9c249f Fix size of release stream separator in listing 2019-05-31 13:53:55 +09:00
smoogipoo
57d648df6d Add comment + fix spinlocking 2019-05-31 13:38:48 +09:00
smoogipoo
4dc77d64a3 Fix overlay group + depth 2019-05-31 13:23:50 +09:00
smoogipoo
f780c80c17 Fix bar not expanding/collapsing correctly 2019-05-31 13:08:35 +09:00
smoogipoo
c211f1d0fe Merge remote-tracking branch 'Joehuu/master' into changelog-overlay 2019-05-31 12:28:28 +09:00
EVAST9919
b32ffab580 Make the DrawableMostPlayedBeatmap inherit OsuHoverContainer 2019-05-31 02:19:09 +03:00
EVAST9919
e715cc8f6e Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link 2019-05-30 23:29:11 +03:00
EVAST9919
fe9e53e383 Add a testcase 2019-05-30 23:07:04 +03:00
EVAST9919
2933169614 Move the button into a separate class 2019-05-30 22:55:59 +03:00
EVAST9919
73fb28f9f7 Make the button inherit from OsuHoverContainer 2019-05-30 22:48:27 +03:00
EVAST9919
877fe97107 Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update 2019-05-30 22:17:22 +03:00
Dean Herbert
c950f37497 Ad missing link 2019-05-30 16:57:54 +09:00
Dean Herbert
e5999dd9b1 Update font sizes to match web 2019-05-30 16:49:18 +09:00
EVAST9919
9a13c52ffd Add missing lines 2019-05-29 21:19:03 +03:00
EVAST9919
97dbc95bc6 Kudosu section update 2019-05-29 21:02:20 +03:00
EVAST9919
1baf922f2c CI fixes 2019-05-29 20:36:14 +03:00
EVAST9919
6efa61b992 Split UnderscoredLinkContainer in different classes 2019-05-29 20:24:01 +03:00
EVAST9919
52fad723a2 Implement DrawableMostPlayedBeatmap 2019-05-29 19:51:59 +03:00
EVAST9919
8bcb4485ed implement UnderscoredLinkContainer 2019-05-29 19:00:20 +03:00
HoLLy
2a295545a7 Don't mutate strainPeaks 2019-05-29 11:25:25 +02:00
HoLLy
7e9f5a0939 Add Skills to DifficultyAttributes 2019-05-29 11:22:51 +02:00
Dean Herbert
a1cc8c448f Update TrackVirtual consumption 2019-05-29 16:43:27 +09:00
Dean Herbert
08ab1e5df7 Use new ITrackStore interface 2019-05-29 16:43:15 +09:00
David Zhao
4f09141718 remove extra bool 2019-05-29 12:22:34 +09:00
EVAST9919
5169e31d54 Fix CI issues 2019-05-28 19:53:00 +03:00
EVAST9919
19fbab6892 Applied suggested changes 2019-05-28 19:39:31 +03:00
Dean Herbert
a20eda7b5f Fix remaining cases to work without things 2019-05-28 23:54:42 +09:00
EVAST9919
857eb9b83a Fix CI stuff 2019-05-28 17:21:34 +03:00
tangalbert919
07e550a950 Merge branch 'master' into android 2019-05-28 09:08:44 -05:00
EVAST9919
6ca3bd086f ShowMore button update 2019-05-28 17:04:05 +03:00
David Zhao
1a871af552 Fix hide selection, add test 2019-05-28 19:15:29 +09:00
Dean Herbert
23b5d30360 Remove csproj changes 2019-05-28 17:10:46 +09:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
David Zhao
e59a00ac6e Remove excessive selection updating 2019-05-28 14:04:33 +09:00
Dan Balasescu
5742984c97
Merge branch 'master' into settings-flexibility 2019-05-28 13:35:06 +09:00
Dan Balasescu
0d2eef68b2
Merge branch 'master' into settings-flexibility 2019-05-28 13:21:33 +09:00
Dan Balasescu
4852519259
Merge branch 'master' into isolate-checkbox-alpha 2019-05-28 13:12:12 +09:00
Dean Herbert
31e6a4fa59 Add optional skin foreign key to databased settings 2019-05-27 01:56:19 +09:00
Dean Herbert
127858d398 Store databased settings based on string keys rather than ints
Allows for rearranging/removal from enums without consequence.
2019-05-27 01:53:49 +09:00
Dean Herbert
e7b9d1efa3 Isolate alpha usage in OsuCheckbox 2019-05-27 01:49:24 +09:00
Dean Herbert
02e2fb963a Tidy up how subpanels are handled in SettingsOverlay 2019-05-27 01:48:21 +09:00
Dean Herbert
53b2245330 Move common settings sub-panel logic to own class 2019-05-27 01:47:23 +09:00
Dean Herbert
b9f6372c3f Fix Aquatico font lookups 2019-05-25 22:11:11 +09:00
Dean Herbert
601b25f05e Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-25 19:10:44 +09:00
Lucas A
a819dd764f Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-25 11:02:19 +02:00
EVAST9919
69ada11f41 use constant value 2019-05-24 20:01:47 +03:00
EVAST9919
cda97a61fa Add a bit of smoothness to the rank graph 2019-05-24 19:43:53 +03:00
Dean Herbert
cc256614b9
Merge branch 'master' into changelog-overlay 2019-05-24 11:13:48 +09:00
Dean Herbert
a272004610 Use a more friendly set method for tab control 2019-05-24 11:04:36 +09:00
Dean Herbert
8f87e8ad7f
Merge branch 'master' into fix-beatmap-background-never-removed 2019-05-24 10:41:12 +09:00
Dean Herbert
e034b3d514 Use TaskCompletionSource in a better manner 2019-05-23 19:08:44 +09:00
Dean Herbert
acaf2f9fbb Show changelog from new build notification 2019-05-23 18:54:42 +09:00
Dean Herbert
774ef87868 Merge branch 'update-framework' into HoutarouOreki-changelog-overlay 2019-05-23 17:58:56 +09:00
Dean Herbert
9c6fbebb67 Update framework 2019-05-23 17:55:18 +09:00
Dean Herbert
0bce7241d2 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-23 17:54:13 +09:00
smoogipoo
f0d7728e81 Fix failures with a null-model 2019-05-23 17:01:22 +09:00
smoogipoo
7971261fbc Don't create a new drawable for the first background 2019-05-23 15:59:22 +09:00
Dan Balasescu
27504cf81b
Merge branch 'master' into fix-preview-state 2019-05-23 13:49:33 +09:00
Dean Herbert
7229975fef Further minor refactoring 2019-05-23 12:41:45 +09:00
Dean Herbert
372c5b081c Fix audio preview buttons not correctly handling load failure states
Closes #4593.
2019-05-23 12:07:49 +09:00
Dean Herbert
5a887dabfe Prepare changelog api requests to work when not logged in 2019-05-23 11:41:37 +09:00
Dean Herbert
cb62008280 Cleanup pass 2019-05-23 11:23:37 +09:00
Dean Herbert
a0ddc6d77a Use linq instead of a temporary sorted list 2019-05-23 00:13:59 +09:00
Dean Herbert
c96d7bfb67 Centralise font specification 2019-05-23 00:13:47 +09:00
Dean Herbert
ba98c68cbd Add support for osu! user links 2019-05-23 00:11:26 +09:00
Dean Herbert
81e42041e6 Move update streams inside header content 2019-05-22 23:56:50 +09:00
Dean Herbert
661fc01e7d Fix date string 2019-05-22 23:49:54 +09:00
Dean Herbert
66f5dbaa9f Fix badge state regressions from tab control usage 2019-05-22 23:44:37 +09:00
Dean Herbert
b588638740 Use TabControl instead of custom logic 2019-05-22 19:51:16 +09:00
Dean Herbert
9f9e86f18c Rename classes and fix back-to-front state 2019-05-22 17:04:21 +09:00