1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 03:27:24 +08:00
Commit Graph

22676 Commits

Author SHA1 Message Date
Dan Balasescu
c708ea327d
Merge pull request #6444 from peppy/screen-with-timeline
Add abstract implementation for editor screens which display a timeline
2019-10-10 16:14:48 +09:00
Dean Herbert
4e273fc628
Return correct allowed value for Perfect
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-10-09 19:50:05 +09:00
Dean Herbert
e6f857d0d8 Revert "Warn on incorrect null usage"
This reverts commit 93d2c3d7a1.
2019-10-09 19:38:07 +09:00
Dean Herbert
9f2a648432 Add full asserts 2019-10-09 19:23:37 +09:00
Dean Herbert
ad6b8d3e04 Add result offset bounding to result itself, rather than just transforms 2019-10-09 19:08:55 +09:00
Dean Herbert
51bf600ea7 Use empty hitwindows instead of null 2019-10-09 19:08:31 +09:00
Dean Herbert
93d2c3d7a1 Warn on incorrect null usage 2019-10-09 19:03:20 +09:00
Dean Herbert
0681bb9a2b Fix potential nullref 2019-10-09 16:49:10 +09:00
Dean Herbert
2d8e5615e4 Extract timeline and layout logic from ComposeScreen 2019-10-09 16:05:55 +09:00
Dean Herbert
f2adae8fd1 Rename test case to better match underlying class 2019-10-09 16:05:38 +09:00
Dean Herbert
3dd2b18ff0 Make EditorScreen abstract 2019-10-09 16:04:58 +09: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
52770f803d Fix incorrect beatmap usage 2019-10-08 12:15:32 +09:00
Dean Herbert
cbb120cd38 Switch beatmap to private 2019-10-08 12:09:42 +09:00
Dean Herbert
c280bee894 Protect configuration bindables 2019-10-08 12:08:47 +09:00
Dean Herbert
b8b2ff2674 Move welcome to local usages 2019-10-08 12:07:59 +09:00
Dean Herbert
4ba2dccde3 Reorder file contents 2019-10-08 12:05:52 +09:00
Dean Herbert
a0bb193342 Remove unnecessary beatmap storage 2019-10-08 12:04:13 +09:00
Dean Herbert
449e53ee6d Centralise track handling 2019-10-08 12:03:42 +09:00
Dean Herbert
c3d56088d8 Make constant private 2019-10-08 11:54:39 +09:00
Dean Herbert
3c0b1be7f4 Add xmldoc where applicable 2019-10-08 11:52:16 +09:00
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