1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 15:53:00 +08:00
Commit Graph

23147 Commits

Author SHA1 Message Date
Dean Herbert
393683f8f1
Merge branch 'master' into cleanup-intros 2019-10-08 11:29:13 +09:00
Dean Herbert
438408161c
Fix tab controls overflowing right content at max ui scale (#6411)
Fix tab controls overflowing right content at max ui scale
2019-10-08 11:16:41 +09:00
Dean Herbert
0d0321674e
Merge pull request #6407 from UselessToucan/playlist_follow_playback
Autoscroll playlist on song change
2019-10-08 11:07:45 +09:00
Dean Herbert
e7fc5e556c Fix song select not correctly playing tracks in some cases 2019-10-08 11:06:07 +09:00
Dean Herbert
3ec78388e8 Avoid excess background updates in playlist overlay 2019-10-08 11:03:23 +09:00
Dean Herbert
bb161222ef
Merge branch 'master' into fix-tab-controls-overflowing 2019-10-08 10:12:03 +09:00
Joehu
9fdbe58326 Fix dropdown header padding when selected mod filter is hidden 2019-10-07 16:17:58 -07:00
Joehu
8e6e90eaec Use fixed numbers for padding instead 2019-10-07 16:11:40 -07:00
Roman Kapustin
e00992dfd8 Remove FollowPlayback setting 2019-10-07 19:44:22 +03:00
Andrei Zavatski
cc6bf2f173 Add IsDeleted property 2019-10-07 18:45:22 +03:00
Andrei Zavatski
aa8df0fa20 Hook up api and implement some visual comments representation 2019-10-07 18:26:07 +03:00
Andrei Zavatski
e772822bd5 Basic implementation 2019-10-07 17:49:20 +03:00
Andrei Zavatski
738580ec61 Add IsTopLevel property 2019-10-07 16:58:24 +03:00
Andrei Zavatski
76db200bd3 Implement GetCommentsRequest 2019-10-07 16:48:05 +03:00
Dan Balasescu
84c13b93fc
Merge pull request #6414 from peppy/fix-song-select-sort-when-filtering
Fix beatmap carousel including filtered items in sort calculations
2019-10-07 19:06:57 +09:00
smoogipoo
a59e07948c Merge remote-tracking branch 'GSculerlor/master' into rework-selection-updates 2019-10-07 18:50:07 +09:00
smoogipoo
e265beb289 Fix merge error 2019-10-07 18:49:59 +09:00
Dean Herbert
f15953d65c Fix carousel including filtered difficulties in sort comparisons 2019-10-07 15:17:03 +09:00
Dean Herbert
46d6c5ec3b Add failing test 2019-10-07 15:17:03 +09:00
Dean Herbert
62c4c1266e Move private functions to bottom 2019-10-07 15:17:03 +09:00
Dean Herbert
0ebc5d0ffb
Fix cursor trail appearing regardless of the setting in replays (#6288)
Fix cursor trail appearing regardless of the setting in replays
2019-10-07 12:32:22 +08:00
Joehu
11d937beab Fix beatmap detail area tab dropdown being blocked by content 2019-10-06 10:24:33 -07:00
Joehu
38c1cee5fd Fix tab controls overflowing 2019-10-06 10:22:55 -07:00
Roman Kapustin
eda4a27b45 Move FollowPlayback setting to User Interface subsection 2019-10-06 15:06:25 +03:00
Dean Herbert
179cde917b
Merge branch 'master' into rework-selection-updates 2019-10-06 15:00:56 +08:00
Dean Herbert
c2b44401b4
Fix mania placing hitobjects offset from the mouse position (#6378)
Fix mania placing hitobjects offset from the mouse position
2019-10-06 15:00:11 +08:00
Dean Herbert
0fdb07346b
Merge branch 'master' into fix-mania-placement 2019-10-06 14:22:03 +08:00
Dean Herbert
ea9c9c7812
Merge pull request #6377 from smoogipoo/placement-blueprint-movement
Move placement blueprint movement logic to a higher level
2019-10-06 14:21:50 +08:00
Dean Herbert
2e20380d07
Merge branch 'master' into placement-blueprint-movement 2019-10-06 13:52:22 +08:00
Dean Herbert
d547f9cc68
Merge pull request #6406 from Joehuu/resume-music-gameplay-exit
Resume music to same position when exiting gameplay
2019-10-06 13:51:10 +08:00
Roman Kapustin
bdea75b995 Autoscroll playlist on song change 2019-10-05 23:53:05 +03:00
Joehu
e257f4ca04 Resume music to same position when exiting gameplay 2019-10-05 10:31:44 -07:00
iiSaLMaN
ba1a854701 Use IEnumerable.Where<>() rather than List.FindAll()
Saves a whole list allocation
2019-10-05 10:30:32 +03:00
Dean Herbert
8c3caed2e0
Merge pull request #6396 from bdach/allow-fallback-decoder-overwrite
Allow fallback decoder overwrite
2019-10-05 11:08:41 +08:00
Dean Herbert
93c0cf14c1
Merge branch 'master' into allow-fallback-decoder-overwrite 2019-10-05 10:56:57 +08:00
Dean Herbert
0c4f84a963
Fix keybinding order of beatmap options (#6400)
Fix keybinding order of beatmap options
2019-10-05 10:56:31 +08:00
Joehu
a71db11ea5 Remove depth parameter description 2019-10-04 18:38:44 -07:00
Joehu
de658c932e Fix test regression 2019-10-04 17:22:42 -07:00
Joehu
5d460eaf6b Remove depth specification and button order regression 2019-10-04 17:14:19 -07:00
Joehu
e7ba6ef5c4 Fix keybinding order of beatmap options 2019-10-04 14:32:43 -07:00
iiSaLMaN
6985249d90 Simplify properties 2019-10-04 21:18:03 +03:00
Bartłomiej Dach
7c2c537bc9 Allow fallback decoder overwrite
To fix the runtime crashes in difficulty calculation components, remove
the check for pre-existing fallback registration along with
the exception. The xmldoc for the registration function has been
extended to make users aware of possible consequences of calling it.
2019-10-04 18:20:20 +02:00
iiSaLMaN
0c4f248259 Fix CI issues 2019-10-04 18:02:13 +03:00
Bartłomiej Dach
76c74719a4 Add test for fallback decoder overwrite
LegacyDifficultyCalculatorBeatmapDecoder was registered as a fallback
decoder in commit ffde389 for future use in the server-side difficulty
calculation components. Due to the pre-existing fallback registrations
this causes a runtime crash when the diffcalc components are started.
Add a test reproducing this scenario to prevent the issue from
resurfacing in the future.
2019-10-04 17:00:51 +02:00
iiSaLMaN
4f40a04425 Add tests ensuring correct behaviour with ruleset selection 2019-10-04 17:57:39 +03:00
iiSaLMaN
555c82e9c9 Filter beatmap difficulties by current ruleset 2019-10-04 17:56:42 +03:00
iiSaLMaN
7d5f5d2fd9 Add ruleset selector to the beatmap overlay header 2019-10-04 17:55:33 +03:00
iiSaLMaN
edddbdb784 Add tests for beatmap ruleset selector 2019-10-04 17:37:09 +03:00
iiSaLMaN
7b414092af Implement beatmap ruleset selector 2019-10-04 17:35:41 +03:00
Dean Herbert
6fce646369
Merge branch 'master' into placement-blueprint-movement 2019-10-04 19:05:56 +08:00