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

5291 Commits

Author SHA1 Message Date
Dean Herbert
66d3bda962
Merge branch 'master' into collection-database 2020-09-08 23:18:47 +09:00
Dean Herbert
186507a88e Merge branch 'fix-music-controller-regressed' into fix-toggle-pause-state 2020-09-08 18:37:52 +09:00
Dan Balasescu
68f3a1ea9a
Merge branch 'master' into collection-database 2020-09-08 18:30:01 +09:00
Dean Herbert
072aab90ab Merge branch 'master' into fix-music-controller-regressed 2020-09-08 18:26:15 +09:00
Dean Herbert
ad5d6117c7 Remove unnecessary RunTask calls 2020-09-08 18:26:13 +09:00
Dean Herbert
14bf2ab936 Fix grammar in xmldoc 2020-09-08 18:21:26 +09:00
Dean Herbert
a46be45a71 Fix OSD occasionally display incorrect play/pause state 2020-09-08 18:12:03 +09:00
Dean Herbert
b1110e5e3a Rename class to match derived class 2020-09-08 18:10:14 +09:00
smoogipoo
06328e0000 Add import/deletion progress notifications 2020-09-08 17:59:27 +09:00
Joehu
2b62579488 Lowercase one more toolbar tooltip 2020-09-07 10:18:22 -07:00
smoogipoo
6cc4517600 Merge branch 'master' into collection-database 2020-09-07 20:03:11 +09:00
Dean Herbert
8f8f907fc7 Fix missed string 2020-09-07 13:27:28 +09:00
Joehu
b4b9c71f00 Make all toolbar tooltips lowercase 2020-09-06 10:13:06 -07:00
Salman Ahmed
33b76015d8 Fix MusicActionHandler unnecessarily depending on OnScreenDisplay's existance 2020-09-06 01:54:32 +03:00
smoogipoo
345fb9d8e0 Rename classes 2020-09-05 03:55:43 +09:00
Dean Herbert
b8e5acfef1
Merge branch 'master' into fix-music-controller-regressed 2020-09-04 20:10:43 +09:00
Dean Herbert
a0bc376446
Merge pull request #10062 from frenzibyte/fix-music-controller-propagating-event-twice
Fix MusicController raising track changed event twice
2020-09-04 20:09:49 +09:00
Salman Ahmed
3239576a23
Minor rewording of new comment
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-09-04 11:50:49 +03:00
Salman Ahmed
4236e5fe71 Replace useless "matching-code" comment with explanation of how it could happen
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-09-04 11:31:54 +03:00
Salman Ahmed
65d541456a Slight rewording 2020-09-04 11:11:07 +03:00
Dean Herbert
ab057e6c65 Remove unnecessary string interpolation 2020-09-04 16:28:35 +09:00
Dean Herbert
644f3375ac Also catch exceptions in the construction call 2020-09-04 16:28:19 +09:00
Salman Ahmed
001509df55 Move music global action handling to an own component
Due to requiring components that are added at an OsuGame-level
2020-09-04 10:24:54 +03:00
Salman Ahmed
42895e27b6 Expose track change results on the methods 2020-09-04 10:24:54 +03:00
Salman Ahmed
54013790fc Fix MusicController raising TrackChanged event twice 2020-09-04 10:24:31 +03:00
Dean Herbert
a15653c77c Fix potential hard crash if ruleset settings fail to construct 2020-09-04 16:15:57 +09:00
Dean Herbert
d55c9c3cc2 Fix UserProfile weirdness 2020-09-03 17:11:34 +09:00
Dean Herbert
99e34d8562 Update with missing icons 2020-09-03 17:05:45 +09:00
Dean Herbert
f5a73130e1 Fix regression in sidebar button sizing 2020-09-03 16:34:58 +09:00
Dean Herbert
0d1674ca5e Combine settings strings to read from same location 2020-09-03 16:34:58 +09:00
Dean Herbert
2fac0a180e Adjust toolbar button sizing 2020-09-03 16:34:58 +09:00
Dean Herbert
98c5a04a09 Update home button 2020-09-03 16:34:58 +09:00
Dean Herbert
942276d88f Remove outdated SearchableList classes 2020-09-03 16:34:58 +09:00
Dean Herbert
7bcbac6f45 Move header setting to FullscreenOverlay 2020-09-03 16:34:58 +09:00
Dean Herbert
dbf44fbaf2 Update names and icons to match new designs 2020-09-03 16:34:58 +09:00
Dean Herbert
dceae21bbf Centralise fetching of overlay component titles and textures 2020-09-03 16:34:58 +09:00
Dean Herbert
fe524ec491 Merge branch 'master' into update-framework 2020-09-03 14:58:32 +09:00
Dan Balasescu
84b3604192
Merge branch 'master' into game-overlay-activation-mode 2020-09-03 13:34:22 +09:00
smoogipoo
a56f9d6770 Implement collection import 2020-09-03 00:08:33 +09:00
Dean Herbert
6a765d2d76 Add smooth fading between audio tracks on transition 2020-09-02 20:04:56 +09:00
smoogipoo
555b2196b7 Add xmldoc to MusicController.ResetTrackAdjustments() 2020-09-02 15:23:50 +09:00
Dean Herbert
d45a1521a1 Update BindableList usages 2020-09-01 11:56:23 +09:00
Lucas A
ad223bc460 Make game bindable immutable. 2020-08-29 19:34:53 +02:00
Dean Herbert
f65991f31f Revert some usages based on review feedback 2020-08-26 23:28:58 +09:00
Dean Herbert
db52260427 Rename and clarify comment regarding "previous" track disposal 2020-08-22 19:44:54 +09:00
Dean Herbert
308d9f5967 Ensure locally executed methods are always loaded before propagation 2020-08-21 18:43:58 +09:00
Dean Herbert
357fb3a10e Merge branch 'master' into beatmap-track-rework 2020-08-21 12:53:09 +09:00
Lucas A
6aa31dffdb Fix toolbar not respecting current overlay activation mode. 2020-08-18 15:34:56 +02:00
Dean Herbert
5ade1e8259
Merge branch 'master' into beatmap-track-rework 2020-08-18 13:03:49 +09:00
Dean Herbert
083bcde3cf Fix beatmap transfer not working 2020-08-18 13:01:35 +09:00