1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 23:02:56 +08:00
Commit Graph

3932 Commits

Author SHA1 Message Date
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
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
Dean Herbert
97d65783db Remove osu!-side DebugUtils 2019-06-20 12:48:45 +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
iiSaLMaN
ee2268caba
Enable masking for the beatmap set cover 2019-06-19 21:20:00 +03: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
816bac9874 Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip 2019-06-20 00:55:52 +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
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
KingLuigi4932
6e28294182 Fix another test 2019-06-19 04:27:31 +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
Andrei Zavatski
2fb1052a1e Add missing space 2019-06-18 21:04:36 +03: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
Dean Herbert
6823ba1ab0 Unbind from previous bindable when rebinding a SettingsItem 2019-06-18 14:24:44 +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
Ganendra Afrasya
aa53f14329 Make sure tooltip appear in specific cases 2019-06-17 22:44:28 +07: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
Dean Herbert
4882283084
Merge branch 'master' into generic-download-model-manager 2019-06-15 15:35:08 +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
1b75fbed9a Merge remote-tracking branch 'upstream/master' into update-scrollcontainer 2019-06-14 23:25:17 +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
KingLuigi4932
155f7c7e03 Use OsuTextFlowContainer for multi-lines 2019-06-13 17:32:27 +03: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
dd7335079f Fix beatmap set overlay not showing ratings 2019-06-13 17:01:57 +09:00
smoogipoo
0a79b444d9 Move metrics to beatmap set 2019-06-13 16:52: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
951a5abccc
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-12 17:41:16 +05:30
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
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
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
28f8b04765 Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups 2019-06-12 16:47:56 +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
94e65a3244 Fix settings checkboxes not being searchable 2019-06-12 15:16:59 +09:00
Dean Herbert
c591a6f1fa Rename request type to be less verbose 2019-06-12 13:30:23 +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
ab27d82cd5
Make beatmap download buttons inherit BeatmapDownloadTrackingComposite
- Move DownloadTrackingComposite into the online namespace
2019-06-11 23:01:01 +05:30
naoey
06a558c4b7
Remove unecessary third generic and change usages to match 2019-06-11 21:11:30 +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
341d137f5c
Make BeatmapManager inherit from new base class 2019-06-11 19:36:08 +05:30
Dean Herbert
00ee45fe46 Merge remote-tracking branch 'origin/update-visibility-container' into update-framework 2019-06-11 19:36:13 +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
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
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
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
smoogipoo
f090e292c9 Move ArchiveModelManager import process to async flow 2019-06-10 13:42:22 +09: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
EVAST9919
d86e3d0c4c Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-09 18:06:24 +03: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
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
dfbc652803
Use ScoreRank.D instead of F 2019-06-08 19:32:26 +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
Dan Balasescu
6a06ea2aee
Merge branch 'master' into ruleset_fix 2019-06-07 20:36:29 +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
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
smoogipoo
90966b113b Merge remote-tracking branch 'origin/master' into ftb-prepass 2019-06-06 20:32:38 +09:00
smoogipoo
4d035afcc6 Add setting to bypass front-to-back 2019-06-06 16:49:42 +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
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
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
7d2a75b350 Dim music volume when holding to confirm 2019-06-04 18:37:26 +09:00
Dean Herbert
80a66b8b3a Merge remote-tracking branch 'upstream/master' into audio-refactor-update 2019-06-04 12:08:21 +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
LeNitrous
516575a132 don't create "Start Chat" option when the sender is the local user 2019-06-03 18:54:29 +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
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
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
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
b20ea93906
Merge branch 'master' into audio-refactor-update 2019-05-31 14:58:53 +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
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
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
EVAST9919
6ca3bd086f ShowMore button update 2019-05-28 17:04:05 +03:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +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
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
a272004610 Use a more friendly set method for tab control 2019-05-24 11:04:36 +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
0bce7241d2 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-23 17:54:13 +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
Dean Herbert
1d5b7cdec0 Add ExpandingBar UI element 2019-05-22 16:44:47 +09:00
Dean Herbert
92c991494d Fix (and rename) ExpandingBar 2019-05-22 16:38:15 +09:00
Welsar55
9e1f2d4fbc Added ability to reset all mods by pressing 1 as present on stable. 2019-05-21 21:48:09 -05:00
Dean Herbert
8025a97b2b Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-21 17:18:23 +09:00
smoogipoo
e76d785c10 Move method above nested class 2019-05-21 16:05:59 +09:00
Dean Herbert
7169eb67d2
Merge branch 'master' into abstract-profile-header 2019-05-21 15:33:47 +09:00
Dan Balasescu
67ac76aae7
Merge branch 'master' into move-tooltip-text 2019-05-21 15:00:09 +09:00
Dan Balasescu
ab183949df
Merge branch 'master' into new-colours-osu-colour 2019-05-21 14:49:25 +09:00
Dean Herbert
24a7e624df Only propagate badge value changes if not the current UpdateStream 2019-05-21 14:35:11 +09:00
Dean Herbert
4ac2acbfc0 Fix usages of SpriteText (instead of OsuSpriteText) 2019-05-21 14:13:52 +09:00
Dean Herbert
db817b3b25 Set HeaderTabControl's default AccentColour to non-transparent
Avoids items disappearing if no accent colour is set.
2019-05-21 13:58:36 +09:00
Dean Herbert
aba945934d Move OverlayHeaderTabControl to correct namespace 2019-05-21 13:58:12 +09:00
Dean Herbert
5a9c3ab9fa Move UserProfileOverlay's header into an abstract implementation 2019-05-21 13:58:03 +09:00
Dean Herbert
247dad7e86 Use OsuColour for profile overlay 2019-05-21 13:54:19 +09:00
Dean Herbert
bc962bf8f0 Move TooltipText to OsuClickableContainer 2019-05-21 13:51:38 +09:00
Dean Herbert
340b207fa0 Delete breadcrumb implementation 2019-05-21 13:37:35 +09:00
Dean Herbert
9a769c9f15 Move OverlayHeaderTabControl to correct namespace 2019-05-21 13:36:31 +09:00
Dean Herbert
a131875a7b Use bindables the whole way 2019-05-21 13:34:35 +09:00
Dean Herbert
58a3480b6a Update ChangelogHeader to work again with OverlayHeader 2019-05-21 12:52:50 +09:00
Dean Herbert
aca0fc80a8 Set HeaderTabControl's default AccentColour to non-transparent
Avoids items disappearing if no accent colour is set.
2019-05-21 12:45:20 +09:00
Dean Herbert
6a8a743eaa Begin to consume abstract header implementation 2019-05-20 18:02:27 +09:00
Dean Herbert
a5bd3262be Move UserProfileOverlay's header into an abstract implementation 2019-05-20 18:02:13 +09:00
Dean Herbert
455301de2c Use OsuColour for profile overlay 2019-05-20 15:58:40 +09:00
Dean Herbert
39e03ae705 Fix tests failing when not logged in 2019-05-19 11:58:47 +09:00
Dean Herbert
1c85fcbc81 Remove usage of TooltipIconButton completely 2019-05-19 11:39:32 +09:00
Dean Herbert
dae315ec0a Move TooltipText to OsuClickableContainer 2019-05-19 11:28:24 +09:00
Dean Herbert
3fa1545ea4 Huge refactor pass focusing on ChangelogContent 2019-05-19 02:09:08 +09:00
Dean Herbert
2d56413e35 Update namespaces 2019-05-17 19:15:59 +09:00
Dean Herbert
9bc3aa3d46 Move new classes for now 2019-05-17 19:15:25 +09:00
Dean Herbert
dbc42fd59e Remove StreamColour class and implement locally 2019-05-17 18:31:53 +09:00
Dean Herbert
0b076c9ca0 Only fetch after initial pop in 2019-05-17 18:31:53 +09:00
Dean Herbert
c41ec20236 Improve load and switch logic between views 2019-05-17 18:31:53 +09:00
Dean Herbert
c5c1896a11 Use new colour palette 2019-05-17 18:31:53 +09:00
Dean Herbert
dd2d58d4f7 Split out ChangelogContent into two classes 2019-05-17 18:31:53 +09:00
Dean Herbert
876f108e0a Remove custom scroll logic 2019-05-17 18:31:53 +09:00
Dean Herbert
37e989fc64 fixup! Convert BadgeDisplay to use bindable 2019-05-17 18:31:53 +09:00
Dean Herbert
e606c73329 Convert BadgeDisplay to use bindable 2019-05-17 18:31:53 +09:00
Dean Herbert
880bfe9b6b Move resources to osu-resources 2019-05-17 10:29:27 +09:00
Lucas A
5a72d509f2 Resolve merge conflicts 2019-05-16 18:48:15 +02:00
Dean Herbert
5d33a742c6 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay 2019-05-16 18:55:28 +09:00
Dean Herbert
409d89eecf Match header titles with web (pt size) 2019-05-16 18:53:52 +09:00
Dean Herbert
8ee3958b4a Fix some padding issues with DirectListPanel 2019-05-16 15:17:44 +09:00
Dean Herbert
7f30f61d1b Update DirectListPanel to use same styling 2019-05-16 15:02:13 +09:00
Dean Herbert
a5074d550c
Merge branch 'master' into linkify-user-links 2019-05-16 14:42:44 +09:00
Dean Herbert
084ea3efa9 Fix another font usage case 2019-05-15 18:27:43 +09:00
Dean Herbert
1505ca976b API request clean-up 2019-05-15 18:21:06 +09:00
Dean Herbert
827ca445b1 Remove unnecessary ReceivePositionalinputAt modification 2019-05-15 18:11:22 +09:00
Dean Herbert
60d244d2d6 Clean up events and states 2019-05-15 18:08:19 +09:00
Dean Herbert
f49b0dc16d Initial clean-up pass of breadcrumb and header 2019-05-15 17:55:26 +09:00
Dean Herbert
5ddd28bf30 Fix message display / html stripping 2019-05-15 16:42:12 +09:00
Lucas A
2d966682dc Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-14 18:09:58 +02:00
smoogipoo
77263bd56e Linkify more user links 2019-05-14 18:11:32 +09:00
Dean Herbert
eece4d878f Tidy up colour references and texture assignment in ChangelogHeader 2019-05-14 18:03:54 +09:00
Dan Balasescu
d3d20773ee
Merge branch 'master' into fullscreen-overlay 2019-05-14 17:40:20 +09:00
Dean Herbert
31e7f2fa87 Update ChangelogOverlay to use FullScreenOverlay 2019-05-14 17:35:21 +09:00
Dean Herbert
0fc43afd34 Merge branch 'master' into HoutarouOreki-changelog-overlay 2019-05-14 17:35:14 +09:00
Dean Herbert
aff239a4fb Merge branch 'fullscreen-overlay' into HoutarouOreki-changelog-overlay 2019-05-14 17:33:30 +09:00
Dean Herbert
fad9e73999 Add null check in disposal clause 2019-05-14 17:08:54 +09:00
Dean Herbert
e893925417 Move shadow fade logic 2019-05-14 15:19:23 +09:00
Dean Herbert
29bdc97ab7 Remove unnecessary DI 2019-05-14 15:07:18 +09:00
Dean Herbert
cb2b14e501 Centralise fullscreen overlay logic 2019-05-14 14:20:53 +09:00
Dean Herbert
cc558cf073 Merge branch 'add-new-colours' into HoutarouOreki-changelog-overlay 2019-05-14 13:36:17 +09:00
Dean Herbert
7553e2da25 Fix incorrect DI reference and update naming of SettingsOverlay classes 2019-05-14 10:45:05 +09:00
Dean Herbert
66df784e9a Adjust header image sizing 2019-05-13 17:32:49 +09:00
Dean Herbert
8ecd1912e1 Split out web response classes into own files 2019-05-13 17:24:33 +09:00
Dean Herbert
27ca094421 Update outdated licence headers 2019-05-13 17:14:52 +09:00
Dean Herbert
50c440de8d Add toolbar button 2019-05-13 17:01:17 +09:00
Dean Herbert
e9c3f54307 Share web request between builds and streams 2019-05-13 16:44:43 +09:00
Dean Herbert
37a8d9eb80 Remove chart references for now 2019-05-13 16:27:54 +09:00
Dean Herbert
219c590b8a Initial pass to make work with real API 2019-05-13 16:24:32 +09:00
Dean Herbert
5ea87d9467 Merge remote-tracking branch 'upstream/master' into use-volumemute-icon 2019-05-13 07:24:39 +09:00
Dean Herbert
8110d6768c Inherit OsuButton 2019-05-13 07:24:34 +09:00
Joehu
c119a6a135 Use VolumeMute icon for mute button 2019-05-12 09:30:43 -07:00
Joehu
f14690e3b8 Swap profile play styles and last visit positions 2019-05-12 09:04:11 -07:00
Dean Herbert
31b72f168d Fix deprecated calls and code styling (partly) 2019-05-13 00:46:22 +09:00
Lucas A
18fc965d7a Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-12 17:39:13 +02:00
Dean Herbert
34f54aa945 Resolve compile-time issues 2019-05-13 00:36:05 +09:00
Dean Herbert
943e1574a4
Merge branch 'master' into changelog-overlay 2019-05-13 00:24:18 +09:00
Paul Teng
7adaa09263 Move tab channel class into tab item class 2019-05-12 06:31:11 -04:00
Paul Teng
8957ad5a7e Instantiate channel in tab item 2019-05-12 06:26:03 -04:00
Paul Teng
d53fb9a5c8 Check against type instead of channel name 2019-05-12 06:11:16 -04:00
Paul Teng
496a9dd41d Create separate type for Join-Channel button 2019-05-12 06:02:21 -04:00
Lucas A
5ac6bd8204 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-12 11:53:30 +02:00
Paul Teng
c508b8ed6b
Trim whitespace 2019-05-11 19:21:12 -04:00
Paul Teng
3971a49549
Ignore Add-channel button 2019-05-11 19:16:15 -04:00
smoogipoo
5128dc32e4 Remove unnecessary fillmode 2019-05-08 23:13:21 +09:00
smoogipoo
17a9f191cd Fix incorrect texture name usage for some rank icons 2019-05-08 23:08:08 +09:00
Lucas A
a5f758b977 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-07 18:27:14 +02:00
smoogipoo
13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
Lucas A
e7afaeaa4d Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-06 18:39:58 +02:00
Lucas A
88b8afbb6a Make UserPanel show current user activity when
user status is online.
2019-05-05 20:51:55 +02:00
Dean Herbert
0fa0271878 Add animation when collapsing or expanding the profile details section 2019-05-04 11:03:18 +09:00
Joehu
ac31a9640a Add number sign to centre info rankings 2019-05-02 03:47:20 -07:00
Joehu
c6992bd6f9 Switch hidden/expanded centre profile header information 2019-05-02 03:37:15 -07:00
jorolf
b61807da40
Add number sign inside ToString
Co-Authored-By: Joehuu <madamba.joehu@outlook.com>
2019-05-01 17:55:30 -07:00
Joehu
6b7397b9cf Check for null instead of not null 2019-04-30 22:07:06 -07:00
Joehu
9b2d5727cd Fix wrong check 2019-04-30 21:54:25 -07:00
Joehu
1408513ebd Use similar check used on tooltip 2019-04-30 21:51:56 -07:00
Joehu
3cd6ccfc3d Add number sign in front of profile rankings 2019-04-30 20:47:44 -07:00
Dean Herbert
f9f6e1f04a Clamp values to avoid potentially weird element 2019-04-28 20:13:36 +09:00
Dean Herbert
8ab5149336 SupporterLevel -> SupportLevel 2019-04-28 20:11:36 +09:00
Dean Herbert
27ba89444e Remove unnecessary using statements 2019-04-28 01:08:14 +09:00
Dean Herbert
fa340a9eff
Merge branch 'master' into profile-header-update 2019-04-27 23:48:23 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
smoogipoo
50a775145c Separate variables 2019-04-26 13:56:26 +09:00
smoogipoo
2f4bf423a4 Renamespace 2019-04-26 13:51:39 +09:00
smoogipoo
7047303b0f Add tooltips to all buttons 2019-04-26 13:29:58 +09:00
smoogipoo
4adf590036 Combine hover/active state handling in tab control 2019-04-26 12:41:00 +09:00
smoogipoo
d5b91c6455 Cleanup top header container + user handling 2019-04-26 12:32:15 +09:00
smoogipoo
838325fed4 Remove HasTooltipContainer, use separate composites 2019-04-26 11:58:45 +09:00
smoogipoo
f8c5ee457b Reduce tabcontrol spacing 2019-04-25 20:09:42 +09:00
smoogipoo
8329e53b6c Remove extra space from header title 2019-04-25 20:08:14 +09:00
smoogipoo
2caea38f8c Cleanup centre header container 2019-04-25 20:05:59 +09:00
smoogipoo
9d5b81165e Adjust button stylings 2019-04-25 19:51:05 +09:00
smoogipoo
0eca9b9683 Center -> centre 2019-04-25 18:43:29 +09:00
smoogipoo
b33c0e9a93 Cleanup bottom header container 2019-04-25 18:42:19 +09:00
smoogipoo
1766ed8f9e Fix warnings/remove obsolete usages 2019-04-25 18:05:46 +09:00
smoogipoo
3b0d4c1bad Merge branch 'turn-on-warnings' into profile-header-update 2019-04-25 17:43:10 +09:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
smoogipoo
0222424aef Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
4310f07a5c Rename SelectedMods -> Mods 2019-04-10 12:03:57 +09:00
jorolf
c1db635933 Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-04-09 20:42:39 +02:00
smoogipoo
0603ed9ab7 Fix post-merge errors 2019-04-09 16:27:10 +09:00
smoogipoo
ad124bfeec Reimplement select mod track adjustments 2019-04-09 12:59:32 +09:00
smoogipoo
772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
smoogipoo
15fbb6f176 Use common AddUserLink method 2019-04-05 14:15:36 +09:00
smoogipoo
a6bf076dc7 Adjust green colour 2019-04-04 17:58:34 +09:00
smoogipoo
e13fffaca3 Make ScoreTable use TableContainer 2019-04-04 17:53:23 +09:00
jorolf
ba87136451 add gradient and fix remaining error 2019-04-04 00:57:15 +02:00
jorolf
ccc804a9b2 get everything working again 2019-04-04 00:24:42 +02:00
jorolf
5bc6042309 Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-04-03 22:59:27 +02:00
Dean Herbert
84da708d44 Fix nullref 2019-04-03 18:46:08 +09:00
Dean Herbert
cb417ebd77 Player -> User 2019-04-03 18:44:19 +09:00
Dean Herbert
a15a9bd03a Rewrite updateDisplay logic to not fail on some cases 2019-04-03 18:29:46 +09:00
Dean Herbert
5c3c08566f DrawableTopScore can be composite 2019-04-03 18:20:03 +09:00
smoogipoo
3b7d26cca8 Remove custom styled text 2019-04-03 17:49:01 +09:00
smoogipoo
3da008d293 Add a bit of padding between the sections 2019-04-03 16:43:56 +09:00
smoogipoo
f8596e055a Separate into multiple files 2019-04-03 16:38:54 +09:00
smoogipoo
42c915190a Reorder DrawableTopScore 2019-04-03 16:12:24 +09:00
smoogipoo
e246fad301 Clear table if no scores are provided 2019-04-03 16:09:34 +09:00
smoogipoo
2c18b6df1c Fix score table using 300/100/50 2019-04-03 16:09:19 +09:00
smoogipoo
d6b15f040a Improve statistics display 2019-04-03 15:57:36 +09:00
smoogipoo
0cf27e244d Fix usages of SpriteText and obsolete members 2019-04-03 15:44:14 +09:00
smoogipoo
dff58ab4ed Initial cleanup pass of DrawableTopScore 2019-04-03 15:41:33 +09:00
smoogipoo
7f425059ae Adjust transforms 2019-04-03 15:41:22 +09:00
smoogipoo
ab4be3b75f General refactoring 2019-04-03 15:20:38 +09:00
smoogipoo
0d127c21f1 Merge remote-tracking branch 'Aergwyn/master' into update-beatmap-scores-design 2019-04-03 14:52:13 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Joehu
92673c6d1e Add ability to sort by favourites on osu!direct 2019-03-30 19:24:16 -07:00
smoogipoo
772545dd22 Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design 2019-03-29 18:21:20 +09:00
smoogipoo
2967c876ea Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
2019-03-29 15:11:00 +09:00
Joseph Madamba
9a32e12435
Merge branch 'master' into fix-login-overlay-behavior 2019-03-28 22:28:56 -07:00
Dean Herbert
95bf0b9ed6 Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset 2019-03-29 13:57:02 +09:00
Dean Herbert
a71e9fdb0e
Merge branch 'master' into convert-ranking-statistics 2019-03-29 12:42:49 +09:00
Dean Herbert
2f5668f4e7 Fix remaining framework changes 2019-03-29 00:29:14 +09:00
Joehu
2254c572c4 Remove unnecessary newline 2019-03-27 22:21:28 -07:00
Joehu
53f3dacdfb Fix login overlay behavior 2019-03-27 22:01:06 -07:00
Joehu
bdb39a79a9 Fix offset of music controller when toolbar is hidden 2019-03-27 20:27:26 -07:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
smoogipoo
012dcc25c9 Rename APIScoreInfo -> APILegacyScoreInfo 2019-03-27 17:08:40 +09:00
smoogipoo
7239ebf5de Add margin for mods 2019-03-27 13:57:26 +09:00
smoogipoo
adab31fd58 Cleanup + fix up score table layout 2019-03-26 17:38:56 +09:00
smoogipoo
f4aeb390ef Initial re-layout of score table 2019-03-26 10:21:34 +09:00
smoogipoo
6a9f005ed4 Merge remote-tracking branch 'Joehuu/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
2019-03-25 15:21:29 +09:00
Dean Herbert
9a11a08acc Update textbox usages 2019-03-23 02:00:27 +09:00
smoogipoo
f7016e1d2c Rename DrawableScore 2019-03-20 17:15:38 +09:00
smoogipoo
41d25c7d19 Fix post-merge errors 2019-03-20 17:15:21 +09:00
smoogipoo
ce57bdb8db Merge branch 'timed-difficulty-attributes' into update-beatmap-scores-design
# Conflicts:
#	osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
2019-03-20 17:12:34 +09:00
Dean Herbert
392a0a1d74
Merge branch 'master' into update-framework 2019-03-18 11:34:59 +09:00
Dean Herbert
c496f6e56b Fix usages of OnLoadComplete 2019-03-17 13:44:20 +09:00
Dean Herbert
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
Dan Balasescu
e6e0cf1957
Merge branch 'master' into direct-stats-offset 2019-03-12 16:17:36 +09:00
Dan Balasescu
448e3da429
Merge branch 'master' into fix-direct-queries 2019-03-12 12:47:33 +09:00
Joehu
ad3b956cec Fix channel selection overlay dimming bg forever when popped out 2019-03-11 20:10:59 -07:00
Dean Herbert
941a72d69a Fix osu!direct firing excess queries during initial search characters
Due to faulty debounce fire logic, a web request would always fire with a single character search, followed by the real search. This caused unwanted delays and display weirdness.
2019-03-12 01:49:47 +09:00
smoogipoo
315788c975 Rename a few classes 2019-03-11 15:11:01 +09:00
jorolf
2525f5bcb7 Apply most suggestions 2019-03-09 23:58:14 +01:00
jorolf
bb6e57169f Merge branch 'screen-title-class' of github.com:Jorolf/osu into profile-header-update 2019-03-09 20:22:33 +01:00
Joehu
7311ccabfb Fix direct panel stats being misaligned by one pixel 2019-03-08 20:27:50 -08:00
smoogipoo
9a05643ec9 Minor refactorings 2019-03-08 17:18:54 +09:00
smoogipoo
a40ffcc692 Apply formatting adjustments 2019-03-08 16:44:39 +09:00
smoogipoo
a7ad29ca9d Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design 2019-03-08 16:32:46 +09:00
smoogipoo
09b5cf4891 Move sizing to ctor 2019-03-08 15:14:07 +09:00
Dean Herbert
075ea70124 Move more toolbar to async load 2019-03-08 12:15:27 +09:00
smoogipoo
30c6a7c3c5 Merge remote-tracking branch 'nekodex/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/ClickableUserContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
2019-03-07 18:48:23 +09:00
smoogipoo
e3d463a141 Formatting fixes 2019-03-06 19:26:48 +09:00
smoogipoo
3c999d64d4 Fix post-merge errors 2019-03-06 16:09:21 +09:00
smoogipoo
ee1f9d4981 Merge remote-tracking branch 'origin/master' into profile-header-update
# Conflicts:
#	osu-resources
#	osu.Game/Overlays/Profile/Components/GradeBadge.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/Header/RankGraph.cs
#	osu.Game/Overlays/Profile/Header/SupporterIcon.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
2019-03-06 15:53:30 +09:00
Dean Herbert
5aaa2511eb
Merge pull request #4374 from Joehuu/status-direct-list
Add beatmap status on direct list panels
2019-03-05 18:22:56 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
smoogipoo
d01ec59acb Fix sizings 2019-03-05 17:14:49 +09:00
smoogipoo
76aca738a9 Revert "Use same size labels from song select"
This reverts commit 7077e405ab.
2019-03-05 16:02:07 +09:00
Dean Herbert
456c5be50c
Merge branch 'master' into taskbar-tooltip-fade-out 2019-03-03 12:47:37 +09:00
Dean Herbert
687d5d5ff1
Merge pull request #4387 from smoogipoo/fix-fonts
Fix a few incorrect fonts
2019-03-02 20:07:26 +09:00
Dean Herbert
b7126b3efb Fix mod select overlay dimming itself 2019-03-02 14:48:05 +09:00
smoogipoo
268ea6a836 Wrong line 2019-03-02 13:28:16 +09:00
smoogipoo
83a02d32f7 Fix a few incorrect fonts 2019-03-02 13:25:59 +09:00
Joehu
7077e405ab Use same size labels from song select 2019-03-01 15:48:58 -08:00
Joehu
e5bc927354 Add beatmap status on direct list panels 2019-02-28 19:38:05 -08:00
Joehu
f4a6612d48 Fade out taskbar tooltip after clicking 2019-02-28 15:43:04 -08:00
Shane Woolcock
f1912a281c Use Count property 2019-02-28 21:46:49 +09:00
Shane Woolcock
dfb3fef9e1 Hide WindowMode dropdown if only one is selectable 2019-02-28 21:38:55 +09:00
Shane Woolcock
b159e3ec31 Fix headless tests 2019-02-28 20:39:55 +09:00
Shane Woolcock
94199e628c Only display SupportedWindowModes in settings 2019-02-28 20:20:12 +09:00
Jamie Taylor
1f273a4c3a
Use local variables where appropriate 2019-02-28 19:58:48 +09:00
Dean Herbert
4ad3d76b13
Merge branch 'master' into beatmapsetoverlay-bindables 2019-02-28 19:19:36 +09:00
Dean Herbert
d10ad3c8a7 Fix warnings 2019-02-28 18:59:05 +09:00
Dean Herbert
5b53cf0961
Merge branch 'master' into hide-desktop-only-elements 2019-02-28 18:50:16 +09:00
Jamie Taylor
b7f7174055
Refactor BeatmapSetOverlay to use chained bindables instead of accessors to distribute changes 2019-02-28 18:46:28 +09:00
Dean Herbert
93a4229ba6
Merge pull request #4357 from Joehuu/toquantity-1
Use ToQuantity instead for words with number prefixes
2019-02-28 16:37:36 +09:00
Jamie Taylor
8cf83e2f4a
Fix the check of beatmapset local availability 2019-02-28 16:14:50 +09:00
Dan Balasescu
3a1066ff02
Merge branch 'master' into toquantity-1 2019-02-28 15:57:51 +09:00
Joehu
2241e1af9d Use ToQuantity for words with number prefixes 2019-02-27 21:55:45 -08:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
Dean Herbert
99e2e6cf1c Align text 2019-02-28 14:46:52 +09:00
Dean Herbert
774116923b A few fixes 2019-02-28 14:45:59 +09:00
Dean Herbert
e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Shane Woolcock
ce17e37c74 Conditionally add some UI elements only on desktop
Prevents crashes from trying to access features that are not applicable to mobile.
2019-02-28 13:10:53 +09:00
Dean Herbert
0faf83f7d1 Fix nullref in tests 2019-02-27 23:30:13 +09:00
smoogipoo
1006c539be Fix looping not being checked 2019-02-27 17:03:09 +09:00
smoogipoo
30815ace62 Fix crossthread operations due to Track.Completed 2019-02-27 16:52:34 +09:00
Dean Herbert
56697339b3
Merge branch 'master' into fix-disabled-set-crash 2019-02-27 11:14:42 +09:00
Dean Herbert
2fbb0b4e6f Don't use this 2019-02-25 19:34:03 +09:00
Dean Herbert
140de26a56 Merge remote-tracking branch 'upstream/master' into notify_track_completion_failure 2019-02-25 19:30:35 +09:00
Dean Herbert
ed10024b22 Fix some formatting / variable naming 2019-02-25 19:29:09 +09:00
Dean Herbert
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
Dean Herbert
287870f1e1 Remove limitation stopping search updates when no query present in direct
Closes #4310.
2019-02-24 23:35:18 +09:00
Roman Kapustin
8b4aa708fa Resolve merge conflict 2019-02-22 23:04:45 +03:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
smoogipoo
d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
smoogipoo
8853f7ad76 Explicitly set exo typeface in a few places 2019-02-21 19:26:02 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
062196c7da Cleanup 2019-02-20 20:52:56 +09:00
smoogipoo
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
smoogipoo
dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
smoogipoo
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dan Balasescu
96590156cd
Merge branch 'master' into add-button-tooltip 2019-02-20 11:37:55 +09:00
Dean Herbert
5d502250d8 Fix account creation overlay not working
Regressed with screen stack changes.
2019-02-15 17:01:51 +09:00
Dean Herbert
1550908edb Add tooltip to key configuration button 2019-02-15 11:56:33 +09:00
Dean Herbert
813b36e98e
Merge pull request #4191 from peppy/leased-bindables-dont-work
Add screen leased bindables via DependencyContainer
2019-02-14 17:05:39 +09:00
Dean Herbert
a5f1f9830b Fix potential schedule race case and regression in enum setting 2019-02-14 16:21:01 +09:00
Roman Kapustin
a289cb7c6a Handle beatmapset removal in DownloadTrackingComposite 2019-02-13 22:11:46 +03:00
Roman Kapustin
99046f16e8 Revert "Update direct download button state on beatmap import and removal"
This reverts commit 11234d3c60.
2019-02-13 22:04:49 +03:00
Roman Kapustin
11234d3c60 Update direct download button state on beatmap import and removal 2019-02-12 21:20:49 +03:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
EVAST9919
4d489da032 small visual improvements 2019-02-10 04:16:56 +03:00
EVAST9919
04e57d7d3d Refactor to make things more flexible 2019-02-09 06:23:58 +03:00
EVAST9919
105053e91b TestCase fix 2019-02-09 00:56:41 +03:00
EVAST9919
107e0a5239 Warning fixes 2019-02-08 20:43:11 +03:00
EVAST9919
bd1f4f9549 Small design fixes 2019-02-08 20:35:07 +03:00
EVAST9919
13c154a0b3 Fix background colour and a bug with removing scores 2019-02-08 20:07:21 +03:00
EVAST9919
7a3ae0f479 update drawable score inline with the latest design 2019-02-08 19:50:02 +03:00
UselessToucan
b5e04f6161
Merge branch 'master' into notify_track_completion_failure 2019-02-08 19:37:23 +03:00
EVAST9919
f43ee6b6a3 update drawable top score inline with the latest design 2019-02-08 19:06:46 +03:00
EVAST9919
9cca11fb0d Warning fixes 2019-02-06 01:48:43 +03:00
EVAST9919
c85dc1a236 update another scores design 2019-02-05 19:32:33 +03:00
EVAST9919
f560dde157 Add some flow for info containers 2019-02-05 15:26:45 +03:00
EVAST9919
559960036e update top score design 2019-02-05 14:48:35 +03:00
Dan Balasescu
84ab16c7c8
Merge branch 'master' into keybindings-settings-groups 2019-02-05 11:42:53 +09:00
EVAST9919
d6d5bb5ecf remove useless nullcheck 2019-02-03 17:20:35 +03:00
EVAST9919
eeecbfcbe0 Fix warnings 2019-02-03 17:09:04 +03:00
Roman Kapustin
71efbcf603 Merge remote-tracking branch 'ppy/master' into notify_track_completion_failure 2019-02-03 16:14:04 +03:00
EVAST9919
4b17ca0857 Fix wrong icons 2019-02-03 14:50:03 +03:00
EVAST9919
3b529b7bda Enable the sidebar and move "back" button to the key binding overlay 2019-02-03 14:34:04 +03:00
Roman Kapustin
4c866e7940 Add PlaylistItemHandle.HandlePositionalInput override 2019-02-01 22:37:27 +03:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
Dan Balasescu
9968bdc0e4
Merge branch 'master' into download-tracking-component 2019-01-31 21:18:03 +09:00
Dan Balasescu
b85e119bae
Merge branch 'master' into reg-screen-focus-fix 2019-01-31 21:08:12 +09:00
Dean Herbert
c7cf3ef1cd Update licence headers 2019-01-31 19:17:42 +09:00
Dean Herbert
7c6512118e Fix importing progress bar not displaying 2019-01-31 19:15:17 +09:00
Dean Herbert
0b8bd520ab Shake in all cases 2019-01-31 19:15:04 +09:00
Dean Herbert
b89694a969 Fix "importing" state display 2019-01-31 19:09:04 +09:00
Dean Herbert
041e3bf823 Handle unbinding better 2019-01-31 19:08:54 +09:00
Dean Herbert
b69a19f810 Attach progress immediately 2019-01-31 19:08:45 +09:00
Dean Herbert
c54a515b3e Change where BindValueChange is immediately run 2019-01-31 18:49:54 +09:00
Dean Herbert
7f2fdac50e Update signatures 2019-01-31 18:47:30 +09:00
Dean Herbert
327a34f12a Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
2019-01-31 18:45:09 +09:00
smoogipoo
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
Dean Herbert
23d0399e51 Allow deselection of textboxes on registration screen on mobile devices 2019-01-29 17:23:23 +09:00
Dan Balasescu
610c2df2d4
Merge branch 'master' into dont-always-focus-textboxes 2019-01-28 13:40:08 +09:00
Dean Herbert
a208874e74 Fix incorrect handling of download failures 2019-01-28 11:59:25 +09:00
jorolf
648ed0e467 update license headers 2019-01-27 23:45:00 +01:00
jorolf
54d8e4043f Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-01-27 23:32:48 +01:00
Dean Herbert
260034a80e Don't auto-focus textboxes when on screen keyboard would cause inconvenience 2019-01-25 19:20:29 +09:00
Dean Herbert
82d944dc89 Fix textbox colours not always being set corrrectly 2019-01-25 19:20:29 +09:00
Dean Herbert
a5f1aa644b Fix cursor sensitivity tooltip not updating instantly 2019-01-25 17:30:35 +09:00
Dean Herbert
a25dce53cd
Fix logical regression 2019-01-25 15:03:32 +09:00
Dean Herbert
e88d36ed38
Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-25 14:55:28 +09:00
Dean Herbert
7ed215c521 Make InternalPadding a bit simpler 2019-01-25 14:46:45 +09:00
Dean Herbert
787d4da153 Combine constant 2019-01-25 14:10:59 +09:00
Dean Herbert
2b250aa47b
Merge branch 'master' into fix-tracked-config-disposal 2019-01-25 12:14:58 +09:00
Unknown
2bbaa2ac60 silently return instead of throwing 2019-01-24 16:02:47 +01:00
ProgrammaticNajel
4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow 2019-01-24 20:41:10 +08:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
ProgrammaticNajel
7ac20c3545 Add overflow padding to account for parallax shifting
Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.
2019-01-24 16:11:24 +08:00
Unknown
93c9037394 fix crash when config doesn't have tracked settings 2019-01-23 13:09:03 +01:00
Dean Herbert
1025c51e0d Allow filtering settings matching based on dropdown content 2019-01-23 17:30:05 +09:00
Dean Herbert
7d6d7cf457 Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
#	osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
2019-01-23 11:06:29 +09:00
jorolf
14d2ed7085 fix codefactor issue that I didn't notice and has been there for 12 days 2019-01-22 19:50:42 +01:00
Dean Herbert
09553550a3 Remove remaining supporter check 2019-01-23 00:19:39 +09:00
Dean Herbert
7baff750de Consolidate layout, wording and ordering with VisualSettings 2019-01-22 10:06:30 +09:00
Bear Daniel
7cdb823c87 Moved "Use beatmap hitsounds" button 2019-01-21 08:04:06 -06:00
Bear Daniel
858541bcf4 Added "Use beatmap hitsounds" button to volume section of settings 2019-01-18 02:33:39 -06:00
Dean Herbert
f489718e25 Fix non-matching filename 2019-01-18 14:35:32 +09:00
Dean Herbert
21e79f51b1 Remove necessity of BeatmapSetDownloader 2019-01-18 14:28:06 +09:00
Dean Herbert
8848fa8b1b Improve UX of download buttons on beatmap set overlay 2019-01-18 12:04:49 +09:00
Dean Herbert
b62630ecd2 Centralise download tracking logic so we can show it in multiple scenarios 2019-01-18 11:28:10 +09:00
nwabear
42fa04beee
Update SkinSection.cs
Added "Use beatmap skins" button to general settings
2019-01-17 14:40:22 -06:00
Dean Herbert
93a08bdb23 Remove stray using 2019-01-17 20:23:15 +09:00
Dean Herbert
d16f4af92b Use TransferValueOnCommit for mouse sensitivity 2019-01-17 19:18:40 +09:00
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
jorolf
6ba7e2b670 split the profile header into several components 2019-01-11 01:12:19 +01:00
Dean Herbert
2c2ed1ae47
Merge branch 'master' into profile-header-update 2019-01-10 18:34:39 +09:00
Dean Herbert
5e4bea9d99 Fix extra newline 2019-01-10 12:11:14 +09:00
Dean Herbert
4f5c208672 Add UI scale
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.
2019-01-09 19:01:33 +09:00
Dan Balasescu
8214faeacc
Merge branch 'master' into fix-over-inclusive-channel-search 2019-01-08 19:54:31 +09:00
smoogipoo
2c44b928d3 Remove unused references 2019-01-08 16:38:34 +09:00
smoogipoo
daeba63242 Remove more unused code 2019-01-08 16:37:18 +09:00
Dean Herbert
a2a7aa708f Use better logic for setting slider bar settings 2019-01-08 14:56:42 +09:00
Dean Herbert
01aa4c2a72 Use TransferOnCommit 2019-01-08 13:48:38 +09:00
Dean Herbert
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
Dean Herbert
73c2fcac08 Remove broken SettingsLabel class 2019-01-07 17:03:59 +09:00
jorolf
52994c7ee8 Merge branch 'profile-header-update' of github.com:Jorolf/osu into profile-header-update 2019-01-04 22:52:29 +01:00
jorolf
a33a1458a5 update design and make play styles an enum 2019-01-04 22:52:00 +01:00
Dean Herbert
01f6199c49
Merge branch 'master' into profile-header-update 2019-01-04 16:38:42 +09:00
Dean Herbert
3a10dd47d5 Add preview for gameplay region 2019-01-04 15:28:35 +09:00
Dean Herbert
9c7830d83b Size -> scale 2019-01-04 14:58:44 +09:00
Dean Herbert
35a6257642 Delay updates when changes would affect mouse position 2019-01-04 14:55:59 +09:00
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert
8b25e4c9ee Fix searching for "channel" matching all channels 2019-01-03 12:04:36 +09:00
FreezyLemon
0047f29ec8 move missing newline to front of "Plays with..." 2018-12-30 22:40:17 +01:00
Dean Herbert
171287591c Merge branch 'updateable-beatmap-sprite' into timeshift-wip
# Conflicts:
#	osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
#	osu.Game/Graphics/Containers/LinkFlowContainer.cs
2018-12-26 20:52:36 +09:00
Dean Herbert
63847890d1 Add better messaging when connecting or failing 2018-12-26 18:07:33 +09:00
jorolf
e05fbd4136 address some comments and improve ui 2018-12-25 01:09:49 +01:00
jorolf
360c17e2c7 appease CodeFactor and AppVeyor 2018-12-22 22:50:19 +01:00
jorolf
da99161736 add some missing stuff 2018-12-22 22:34:39 +01:00
jorolf
2fe80d5568 Update ProfileHeader to the new design 2018-12-22 21:50:25 +01:00
jorolf
15ae0cd70a Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2018-12-22 16:54:39 +01:00
jorolf
b4fa2d9049 WIP 2018-12-22 16:51:24 +01:00
smoogipoo
02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00
Dean Herbert
c6b37c45b5
Merge pull request #3902 from smoogipoo/disable-chat-avatar-click
Disable avatar clicks in chat tabs
2018-12-22 20:11:01 +09:00
smoogipoo
40db23ff4c Disable avatar clicks in chat tabs 2018-12-22 19:30:52 +09:00
smoogipoo
0757beb3b8 Test for null before loading 2018-12-22 17:54:08 +09:00
smoogipoo
d9b8df1595 Merge remote-tracking branch 'origin/master' into user-registration 2018-12-22 17:19:28 +09:00
smoogipoo
c2a00b84c7 Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Multi/IMultiplayerScreen.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/SoloResults.cs
#	osu.Game/Screens/Ranking/IResultPageInfo.cs
#	osu.Game/Screens/Ranking/ResultMode.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/ResultModeTabControl.cs
#	osu.Game/Screens/Ranking/Results.cs
2018-12-22 16:22:02 +09:00
Dan Balasescu
2c97409e2e
Merge branch 'master' into rewrite-standalone-chat 2018-12-22 16:07:27 +09:00
smoogipoo
0e9991b81a Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 15:36:36 +09:00
Dean Herbert
e3308010c0
Merge pull request #3898 from peppy/leaderboard-modularity
Leaderboard modularity
2018-12-22 15:36:12 +09:00
smoogipoo
e657f13c15 Separate out Leaderboard into BeatmapLeaderboard 2018-12-22 14:44:36 +09:00
Dean Herbert
870d843fff Fix username not displaying correctly in overlay 2018-12-22 14:40:55 +09:00
smoogipoo
f47ac35522 Add click to avatar 2018-12-22 14:23:53 +09:00
smoogipoo
d93421b796 Merge remote-tracking branch 'Joehuu/master' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Play/HUD/ModDisplay.cs
2018-12-22 14:02:45 +09:00
Dean Herbert
81104f4803 Make standalone chat reuse more code from main chat overlay 2018-12-21 17:54:12 +09:00
smoogipoo
5d59a1ffca Merge remote-tracking branch 'origin/master' into timeshift-wip
# Conflicts:
#	osu.Game.Tests/Visual/TestCasePollingComponent.cs
#	osu.Game/Online/API/APIRequest.cs
#	osu.Game/osu.Game.csproj
2018-12-21 12:51:31 +09:00
Dean Herbert
aaac45ab8c Add ability to select chat tabs with alt-1-9 2018-12-20 21:50:47 +09:00