1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-28 08:02:55 +08:00
Commit Graph

20499 Commits

Author SHA1 Message Date
Dean Herbert
3b448b0086 Merge remote-tracking branch 'upstream/master' into Desconocidosmh-master 2019-07-11 00:25:35 +09:00
Dean Herbert
ad873b542a Simplify editor logic 2019-07-11 00:22:40 +09:00
Dean Herbert
6819c528db Use canBeNull instead of needlessly caching MusicController for tests 2019-07-11 00:20:01 +09:00
Dean Herbert
b225b2eb39 Rename to IsUserPaused 2019-07-11 00:18:19 +09:00
Desconocidosmh
9986178bf4 Revert "Add caching MusicController in tests"
This reverts commit fae3348a69.
2019-07-11 00:14:45 +09:00
Dean Herbert
bcedba432e
Implement sorting by BPM and Length (#5290)
Implement sorting by BPM and Length
2019-07-10 23:08:05 +09:00
iiSaLMaN
c3315e805f Use milliseconds for BasicStats' beatmap length 2019-07-10 16:49:32 +03:00
Salman Ahmed
1eed6955fa
Merge branch 'master' into implement-other-sorting-criteria 2019-07-10 14:33:48 +03:00
Desconocidosmh
fae3348a69 Add caching MusicController in tests 2019-07-10 13:20:23 +02:00
Desconocidosmh
100d15e651 Move reseting tempo to Editor 2019-07-10 10:43:02 +02:00
Desconocidosmh
8b8e67fd72 Add accidentally deleted code 2019-07-10 10:41:52 +02:00
David Zhao
221ee58f55 make storyboard text more visible 2019-07-10 12:36:58 +09:00
David Zhao
7929104b8a move default into StoryboardContainer, fix load bug, remove comment 2019-07-10 12:24:05 +09:00
Dean Herbert
5e2adf59be Enforce frame accuracy for tests 2019-07-10 11:53:34 +09:00
Dean Herbert
bd53a96507 Ensure tests cannot run forever 2019-07-10 11:52:55 +09:00
Dean Herbert
2a3601e43b Fix test class filename case 2019-07-10 11:42:30 +09:00
Dean Herbert
80ddfc3b1e Disable frame accurate replay playback
I want to prioritise better playback performance over accuracy for now. Also, in my testing this is still 100% accurate due to the addition of the FrameStabilityContainer, which is pretty cool.
2019-07-10 10:27:51 +09:00
David Zhao
41afe89c0b
delete no longer needed bindable 2019-07-10 00:46:34 +09:00
Joehu
b9be4080d3 Update beatmap leaderboard to placeholder when signing out 2019-07-09 07:59:38 -07:00
Andrei Zavatski
a0389c338b CI fixes 2019-07-09 17:56:08 +03:00
iiSaLMaN
e73f22eff8 Convert length retrieved from online to milliseconds 2019-07-09 17:53:34 +03:00
Andrei Zavatski
9907a58ec4 Revert animations and apply suggested changes 2019-07-09 17:38:17 +03:00
iiSaLMaN
1485c273ab Describe the xmldoc mo 2019-07-09 17:31:15 +03:00
iiSaLMaN
f3329f4d79 Use a more readable code for calculating length 2019-07-09 17:22:21 +03:00
iiSaLMaN
38bc652bf2 Remove sorting by length for beatmaps 2019-07-09 17:02:51 +03:00
Dean Herbert
bdcdb3a7a6
Merge branch 'master' into user-best-score 2019-07-09 22:19:31 +09:00
Dean Herbert
16ee14fd1d
Fix iOS visual tests not supporting raw keyboard handler (#5306)
Fix iOS visual tests not supporting raw keyboard handler
2019-07-09 22:17:28 +09:00
Oskar Solecki
2fb9b5dd69
Merge branch 'master' into master 2019-07-09 13:49:07 +02:00
iiSaLMaN
e0c1fb7818 Compare by milliseconds for length 2019-07-09 14:47:54 +03:00
Shane Woolcock
2472c6b4b1 Fix iOS visual tests not supporting raw keyboard handler 2019-07-09 21:07:29 +09:30
Oskar Solecki
3472979d0b
Make sure exiting editor doesn't unpause the music 2019-07-09 12:53:40 +02:00
Desconocidosmh
2546f647be Completely change the way we fix the bug 2019-07-09 11:32:49 +02:00
Andrei Zavatski
276873ff8a remove unused field 2019-07-09 12:28:59 +03:00
Andrei Zavatski
e8b9b1b0bf visibility logic adjustments 2019-07-09 12:16:58 +03:00
Andrei Zavatski
8d6af1625a Visibility improvements 2019-07-09 11:40:51 +03:00
David Zhao
5bb21ecae0 remove storyboard region 2019-07-09 16:50:37 +09:00
David Zhao
1b5fadf93f move comment to more relevant location 2019-07-09 16:38:12 +09:00
David Zhao
89cb8a0cac Move storyboard initialization to new StoryboardContainer 2019-07-09 16:23:59 +09:00
Andrei Zavatski
eb4ef8f6ac CI fixes 2019-07-09 08:25:10 +03:00
Andrei Zavatski
8d46d4a28e Fix grade layout 2019-07-09 08:09:31 +03:00
Andrei Zavatski
5d81445454 Move api request outside the scores container 2019-07-09 08:05:34 +03:00
Andrei Zavatski
ebff35de66 Merge remote-tracking branch 'refs/remotes/ppy/master' into user-best-score 2019-07-09 06:42:39 +03:00
Oskar Solecki
8f7476e9cc
Remove unused stuff 2019-07-09 00:26:57 +02:00
Oskar Solecki
52b54506c6
Merge pull request #1 from Desconocidosmh/Fix-music-playing-while-exiting-from-editor
Fix music playing while exiting from editor
2019-07-09 00:11:40 +02:00
Oskar Solecki
a4957909b4
Merge branch 'master' into Fix-music-playing-while-exiting-from-editor 2019-07-09 00:11:29 +02:00
Desconocidosmh
338371c3fc Fix music playing while exiting from editor 2019-07-09 00:08:18 +02:00
Dean Herbert
e05181928e
Fix mods not being reset when leaving a replay (#5293)
Fix mods not being reset when leaving a replay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-08 22:53:34 +09:00
Dean Herbert
8a98aff318
Merge branch 'master' into replay-local-mods 2019-07-08 22:38:02 +09:00
Dean Herbert
54f5e6aedf Add assertion and comment about lease logic 2019-07-08 22:37:39 +09:00
David Zhao
0cf4bf2352 Manually set clock for storyboard if loading before being given a parent 2019-07-08 18:46:12 +09:00