1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 03:37:33 +08:00
Commit Graph

22609 Commits

Author SHA1 Message Date
iiSaLMaN
41515e9e6c Update current tests to match the expected behaviour 2019-11-07 15:51:03 +03:00
iiSaLMaN
cea5bb3963 Return skin-empty.ini back 2019-11-07 15:50:26 +03:00
iiSaLMaN
61778232d8 Rewrite inline comment 2019-11-06 23:24:54 +03:00
iiSaLMaN
cef6e2a26b Move colours fallback logic to SkinConfiguration.ComboColours getter 2019-11-06 23:20:36 +03:00
iiSaLMaN
8d40c1b733 Remove default combo colours on empty skin test
Checked differently in TestSceneSkinConfigurationLookup.TestEmptyComboColours()
2019-10-09 21:15:30 +03:00
iiSaLMaN
c2ada81c23 Add tests ensuring correct behaviour 2019-10-09 21:08:54 +03:00
iiSaLMaN
5e3f0f6c95 Return default combo colours if none provided 2019-10-09 21:08:07 +03:00
iiSaLMaN
281671a213 Remove default combo colours usage from skins 2019-10-09 21:04:26 +03:00
Dan Balasescu
10c7fc139e
Merge pull request #6423 from peppy/fix-ss-track-playback
Fix song select not correctly playing tracks in some cases
2019-10-09 12:38:25 +09:00
Dan Balasescu
69b9e359bf
Merge branch 'master' into fix-ss-track-playback 2019-10-09 12:26:07 +09:00
Dan Balasescu
52b065b560
Merge pull request #6427 from peppy/editor-wip-screens
Better signify under construction screens in editor
2019-10-09 12:18:53 +09:00
Dan Balasescu
ed41429fc1
Merge branch 'master' into editor-wip-screens 2019-10-09 12:04:12 +09:00
Dan Balasescu
fca2a5bc6e
Merge pull request #6429 from peppy/add-slider-tail-todo
Add todo in slider tail to avoid confusion
2019-10-09 12:04:05 +09:00
Dan Balasescu
34d50e3b73
Merge branch 'master' into add-slider-tail-todo 2019-10-09 11:53:27 +09:00
Dan Balasescu
09f950ea59
Merge pull request #6428 from peppy/fix-ignored-test
Fix ignored song select test
2019-10-09 11:53:07 +09:00
Dan Balasescu
e8276dc562
Merge branch 'master' into fix-ignored-test 2019-10-09 11:39:40 +09:00
Dan Balasescu
9a26cf3a61
Merge pull request #6430 from peppy/move-wave-tests
Move WaveContainer test out of editor namespace
2019-10-08 19:28:30 +09:00
Dean Herbert
4446a2972c Move WaveContainer test out of editor namespace 2019-10-08 18:08:05 +09:00
Dean Herbert
b09d9b7e1f Add todo in slider tail to avoid confusion 2019-10-08 17:56:56 +09:00
Dean Herbert
47768b7063
Rework osu! selection blueprint updates (#6291)
Rework osu! selection blueprint updates

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-08 17:43:13 +09:00
Dean Herbert
8ebccfe31f Add comprehensive audio state tests 2019-10-08 17:03:13 +09:00
Dean Herbert
f284d096b7 Fix ignored song select test 2019-10-08 16:37:47 +09:00
Dean Herbert
4e026b163c Don't resume playback when user has paused and track hasn't changed 2019-10-08 15:04:38 +09:00
Dean Herbert
3e904b4838 Fix naming of file 2019-10-08 14:37:56 +09:00
Dean Herbert
63bf8ff832 Better signify under construction screens in editor 2019-10-08 14:32:48 +09:00
Dean Herbert
7e4f0c01b8
Avoid excess background updates in playlist overlay (#6424)
Avoid excess background updates in playlist overlay
2019-10-08 14:11:02 +09:00
Dean Herbert
d5aca57b08
Fix skins not being displayed correctly in the editor (#6426)
Fix skins not being displayed correctly in the editor

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-10-08 14:10:48 +09:00
Dan Balasescu
73e3dac64b
Merge branch 'master' into fix-editor-skinning 2019-10-08 13:28:10 +09:00
Dan Balasescu
dba526279e
Merge pull request #6425 from peppy/fix-editor-playback-speed
Fix editor defaulting to 0.5x playback speed
2019-10-08 13:26:45 +09:00
Dean Herbert
24269c0384 Fix skins not being displayed correctly in the editor 2019-10-08 12:52:34 +09:00
Dean Herbert
5472029ffe Fix editor defaulting to 0.5x playback speed 2019-10-08 12:27:51 +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
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