1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 16:57:25 +08:00
Commit Graph

4239 Commits

Author SHA1 Message Date
Dan Balasescu
986031e127
Merge branch 'master' into storyboard-clock-di 2019-07-12 23:14:12 +09:30
Dan Balasescu
fc96fbc8a1
Merge branch 'master' into fix-skip-button-clickability 2019-07-12 22:44:20 +09:30
Dean Herbert
44855d8bb2 Ensure any existing background is expired if set more than once 2019-07-12 13:45:34 +09:00
Dean Herbert
671f7f99cd Use constant for blur amount 2019-07-12 13:44:43 +09:00
Dean Herbert
8b67f88d16 Don't expose dimmable container creation in player 2019-07-12 12:04:45 +09:00
Dean Herbert
46f7bb885b Move classes to local namespaces
Also renames test scene to more appropriate name.
2019-07-12 11:50:06 +09:00
Dean Herbert
c9599b65eb Merge remote-tracking branch 'upstream/master' into storyboard-clock-di 2019-07-12 11:20:43 +09:00
Dean Herbert
ecbd0f7eff
Merge branch 'master' into fix-skip-button-clickability 2019-07-11 23:10:28 +09:00
Dean Herbert
19e8198bff
Merge branch 'master' into flow_container_insert 2019-07-11 22:53:57 +09:00
David Zhao
ac170a6957 add comment and cleanup 2019-07-11 14:00:25 +09:00
David Zhao
6c0de0b436 Merge remote-tracking branch 'upstream/master' into storyboard-clock-di 2019-07-11 13:33:35 +09:00
David Zhao
321266e96f Make UserDimContainer abstract 2019-07-11 13:17:28 +09:00
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
Salman Ahmed
1eed6955fa
Merge branch 'master' into implement-other-sorting-criteria 2019-07-10 14:33:48 +03: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
7929104b8a move default into StoryboardContainer, fix load bug, remove comment 2019-07-10 12:24:05 +09:00
David Zhao
41afe89c0b
delete no longer needed bindable 2019-07-10 00:46:34 +09:00
iiSaLMaN
38bc652bf2 Remove sorting by length for beatmaps 2019-07-09 17:02:51 +03: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
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
David Zhao
5bb21ecae0 remove storyboard region 2019-07-09 16:50:37 +09:00
David Zhao
89cb8a0cac Move storyboard initialization to new StoryboardContainer 2019-07-09 16:23:59 +09:00
Oskar Solecki
8f7476e9cc
Remove unused stuff 2019-07-09 00:26:57 +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
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
David Zhao
d489a77fe1 remove new container and comment 2019-07-08 17:57:29 +09:00
iiSaLMaN
5f3f59629e Use the length field instead of recalculating 2019-07-08 11:55:07 +03:00
David Zhao
fbd300e664 Move ruleset into ReplayPlayerLoader as well 2019-07-08 17:37:20 +09:00
David Zhao
e78e326f34 remove unused using 2019-07-08 17:02:42 +09:00
iiSaLMaN
129899f419 Add a BPM property in BeatmapInfo 2019-07-08 10:43:35 +03:00
David Zhao
ef22ab9340 remove bindable 2019-07-08 16:32:11 +09:00
David Zhao
6a86f62d17 Get mods from score info 2019-07-08 16:13:03 +09:00
David Zhao
5853a877c2 create base dependencies before caching, create player in playerloader 2019-07-08 15:40:10 +09:00
iiSaLMaN
90d5484818 Return BPM back to OnlineInfo
Revert commit of "Move BPM out of OnlineInfo"
2019-07-08 09:10:41 +03:00
David Zhao
2747d7692b Create ReplayPlayerLoader for local mod caching 2019-07-08 14:55:05 +09:00
iiSaLMaN
729f0901f7 Move Length out of OnlineInfo 2019-07-07 20:25:36 +03:00
iiSaLMaN
3ea9629daf Move BPM out of OnlineInfo 2019-07-07 20:11:44 +03:00
iiSaLMaN
6ee10640e3 Remove unnecessary migration + Fix CI issues 2019-07-07 19:26:41 +03:00
iiSaLMaN
b4ef64fa61 Add sorting by Length 2019-07-07 18:26:56 +03:00
iiSaLMaN
65c8249c94 Add beatmap extension for calculating length 2019-07-07 18:25:52 +03:00
iiSaLMaN
188c80374e Add sorting by BPM 2019-07-07 18:14:23 +03:00