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

5390 Commits

Author SHA1 Message Date
Shane Woolcock
4b6f893408 Merge branch 'master' into confine-during-gameplay
# Conflicts:
#	osu.Game/Configuration/OsuConfigManager.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Screens/Play/Player.cs
2020-10-05 10:23:37 +10:30
Dan Balasescu
73edb87363
Merge pull request #10303 from peppy/more-textbox-entry
Add textbox entry for speed multiplier and volume
2020-10-01 20:42:14 +09:00
Dean Herbert
61e62929ee Apply changes in line with framework event logic update 2020-10-01 13:06:01 +09:00
Dean Herbert
9d07dce5e4
Merge pull request #10251 from smoogipoo/additional-hit-results 2020-10-01 12:19:48 +09:00
smoogipoo
2517fffb7e Fix incorrect display in beatmap overlay table 2020-09-25 20:48:28 +09:00
smoogipoo
a07597c369 Adjust displays to use new results/orderings 2020-09-25 20:22:59 +09:00
Dean Herbert
a17eac3692 Rename reload method to not mention beatmap unnecessarily 2020-09-25 12:27:08 +09:00
Dean Herbert
978f6edf38 Add basic track reloading support while inside the editor 2020-09-24 20:56:35 +09:00
Dean Herbert
937d5870b3 Add a basic file selector with extension filtering support 2020-09-24 20:54:25 +09:00
Dean Herbert
3062fe4411 Add editor key bindings to switch between screens 2020-09-22 15:55:25 +09:00
Joehu
2ad7e6ca88 Fix hovered channel tabs color when unselected 2020-09-17 19:10:58 -07:00
Joehu
83d23c9547 Use new icon in chat overlay 2020-09-17 14:56:08 -07:00
Joehu
9063c60b9c Fix profile section tab control not absorbing input from behind 2020-09-16 12:00:27 -07:00
Joehu
4dacdb9994 Fix mod select overlay absorbing input from toolbar ruleset selector 2020-09-13 11:50:21 -07:00
smoogipoo
b047fbb8ee Use bindable value for search text 2020-09-11 17:46:07 +09:00
smoogipoo
6327f12fe4 Disable manage collections item in now playing overlay 2020-09-11 16:58:18 +09:00
smoogipoo
fcc8683629 Hook up now playing overlay to collections 2020-09-11 16:46:11 +09:00
smoogipoo
22c5e9f64f Rename missing parameter 2020-09-11 12:19:26 +09:00
smoogipoo
be5d143b5a Reorder params 2020-09-11 12:17:12 +09:00
Andrei Zavatski
cfc6e2175d Add missing header to MostPlayedBeatmapsContainer 2020-09-10 20:58:37 +03:00
Andrei Zavatski
913e3faf60 Move PaginatedContainerWithHeader logic to a base class 2020-09-10 20:48:06 +03:00
Andrei Zavatski
e5f70d8eae Simplify counter visibility changes in PaginatedContainerHeader 2020-09-10 20:31:00 +03:00
Andrei Zavatski
931e567c7e Replace counter font size with an actual value 2020-09-10 20:25:35 +03:00
Andrei Zavatski
9b504272e4 Make Header a property 2020-09-10 20:24:43 +03:00
Andrei Zavatski
e5d0f3b657 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-sections-update 2020-09-10 20:23:02 +03:00
Dean Herbert
ef44c7d063
Merge branch 'master' into score-recalc 2020-09-10 18:30:41 +09:00
smoogipoo
d7ca2cf1cc Replace loaded check with better variation 2020-09-09 22:01:09 +09:00
smoogipoo
37a659b2af Refactor/add xmldocs 2020-09-09 17:36:47 +09:00
smoogipoo
1a023d2c88 Fix a few more tests 2020-09-09 16:33:48 +09:00
smoogipoo
4ddf5f054b Rename BeatmapCollectionManager -> CollectionManager 2020-09-09 15:31:08 +09:00
smoogipoo
117c7ec6b2 Merge branch 'master' into score-recalc 2020-09-09 14:38:36 +09:00
Dean Herbert
66d3bda962
Merge branch 'master' into collection-database 2020-09-08 23:18:47 +09:00
Andrei Zavatski
95eeebd93f Fix setting count for recent scores is overcomplicated 2020-09-08 15:31:00 +03: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
Andrei Zavatski
1bc41bcfd7 Move scores counter logic to a better place 2020-09-08 00:04:14 +03:00
Andrei Zavatski
f88b2509f8 Fix ProfileSection header margin is too small 2020-09-07 23:43:26 +03:00
Andrei Zavatski
c72a192cb5 Fix recent plays counter is always zero 2020-09-07 23:33:04 +03:00
Andrei Zavatski
e39609d3ca Implement PaginatedContainerWithHeader component 2020-09-07 23:08:50 +03:00
Andrei Zavatski
b7bd084296 Remove missing text where not needed 2020-09-07 22:30:43 +03:00
Andrei Zavatski
1c55039994 Remove old header from PaginatedContainer 2020-09-07 22:24:10 +03:00
Andrei Zavatski
5a7e2e96e0 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-sections-update 2020-09-07 22:19:26 +03:00
Andrei Zavatski
3a24cc1aa9 Implement PaginatedContainerHeader component 2020-09-07 22:13:29 +03: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
Yao Chung Hu
96f39dd350 Merge remote-tracking branch 'upstream/master' into visible-playfield-boundary 2020-09-05 01:50:13 -05: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
smoogipoo
c1838902a6 Add to more places 2020-08-28 22:51:48 +09:00
smoogipoo
d7bbb362bf Separate bindables 2020-08-28 22:51:19 +09:00
smoogipoo
1e5e5cae0c Add support for standardised -> classic changes 2020-08-28 21:34:34 +09:00
smoogipoo
4d15f0fe52 Implement basic score recalculation 2020-08-28 19:16:46 +09: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
Dean Herbert
d9debef156 Add explicit LoadTrack method 2020-08-17 15:38:16 +09:00
Dean Herbert
948c3cfbf1 Improve visibility of toolbar tooltips against bright backgrounds 2020-08-17 14:56:19 +09:00
Shane Woolcock
322d179076 Replace settings item with osu! confine cursor mode 2020-08-16 11:04:28 +09:30
Dean Herbert
9e7a28002d Merge branch 'master' into beatmap-track-rework 2020-08-13 17:56:50 +09:00
Dean Herbert
429ad783cf Merge branch 'update-framework' into beatmap-track-rework 2020-08-12 23:35:46 +09:00