1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 02:47:26 +08:00
Commit Graph

20153 Commits

Author SHA1 Message Date
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
Oskar Solecki
2fb9b5dd69
Merge branch 'master' into master 2019-07-09 13:49:07 +02: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
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
Desconocidosmh
39f04e497d Add UserRequestedPause 2019-07-08 11:24:06 +02:00
David Zhao
d489a77fe1 remove new container and comment 2019-07-08 17:57:29 +09: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
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
David Zhao
2747d7692b Create ReplayPlayerLoader for local mod caching 2019-07-08 14:55:05 +09:00
Desconocidosmh
84cadc688a Change method name 2019-07-07 17:11:54 +02:00
Desconocidosmh
1a117d1511 Closes #5277 2019-07-07 17:05:53 +02:00
Dean Herbert
ffc3c9f8f6
Fix unranked beatmap leaderboards showing "no records" placehol… (#5259)
Fix unranked beatmap leaderboards showing "no records" placeholder

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-07 13:33:55 +09:00
Dean Herbert
ebc0e50295 Simplify conditions 2019-07-07 13:21:41 +09:00
Dean Herbert
1eec69c6b6 Merge remote-tracking branch 'Joehuu/master' into fix-unranked-map-lb-placeholder 2019-07-07 13:06:34 +09:00
Dean Herbert
cd31d2bc05 Simplify tests 2019-07-07 13:06:31 +09:00
Dean Herbert
66e07adb43
Update NuGet packages (#5281)
Update NuGet packages
2019-07-07 12:48:28 +09:00
Dean Herbert
05eb1c5fba
Add option to hide health bar when mod disallows failing (#5187)
Add option to hide health bar when mod disallows failing

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-07 12:48:13 +09:00
Salman Ahmed
b10c35b6ab
Update label text
Co-Authored-By: Aergwyn <aergwyn@t-online.de>
2019-07-07 06:13:27 +03:00
Dean Herbert
8f2ec73626 Move logic inside of HUDOverlay
Add vertical offset adjust.
2019-07-07 05:30:53 +09:00
Dean Herbert
84919d70bb Health bar -> Health display
Also inverts logic
2019-07-07 05:30:30 +09:00
Roman Kapustin
bf41fd5d9d Update package references 2019-07-06 23:29:35 +03:00
Joseph Madamba
7c0e3a50b6
Merge branch 'master' into fix-unranked-map-lb-placeholder 2019-07-06 12:09:28 -07:00
Joehu
5767f4360e Remove unnecessary test checks 2019-07-06 12:07:13 -07:00
Dean Herbert
3f332cca2f
Merge branch 'master' into applicable-to-hud 2019-07-07 01:03:50 +09:00
Salman Ahmed
1f13b94c72
Fix build error 2019-07-06 18:44:55 +03:00
Dean Herbert
d80c7f9b1a
Fix logo animation stuttering when entering mode from initial s… (#4813)
Fix logo animation stuttering when entering mode from initial state

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-07 00:41:40 +09:00
Salman Ahmed
a42c79895d
Remove unnecessary private field 2019-07-06 18:38:41 +03:00
Dean Herbert
be2d0048db
Merge branch 'master' into buttonsystem-entermode 2019-07-07 00:01:41 +09:00
Dean Herbert
d2d280eb5e
Remove unnecessary fading in UpdateableBeatmapBackgroundSprite (#5273)
Remove unnecessary fading in UpdateableBeatmapBackgroundSprite
2019-07-06 23:55:16 +09:00
Salman Ahmed
dfabed3d85
Merge branch 'master' into applicable-to-hud 2019-07-06 16:30:02 +03:00
Salman Ahmed
040dbfd2c1
Merge branch 'master' into remove-unnecessary-fading 2019-07-06 15:59:44 +03:00
Dean Herbert
2827149041
Add missing wait step in TestScenePlayerLoader (#5270)
Add missing wait step in TestScenePlayerLoader
2019-07-06 21:56:17 +09:00
iiSaLMaN
6fd3ad5c1d Remove unnecessary fading 2019-07-06 12:10:30 +03:00
Dean Herbert
64de3840b0 Add missing wait step in TestScenePlayerLoader 2019-07-06 15:25:53 +09:00
Dean Herbert
8aac0ab0ce
Make mods filter on beatmap leaderboards functional (#5253)
Make mods filter on beatmap leaderboards functional

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-06 14:31:21 +09:00
Dean Herbert
2149d639de
Merge branch 'master' into leaderboard-mod-filter 2019-07-06 13:27:49 +09:00
iiSaLMaN
530e07110f Use a descriptive name for the setting 2019-07-06 06:32:25 +03:00
Dean Herbert
a7977ad557
Allow PlayerLoader to proceed even if the mouse is hovering an… (#5263)
Allow PlayerLoader to proceed even if the mouse is hovering an overlay panel

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-06 01:06:18 +09:00
Dan Balasescu
3a9f16ccf2
Merge branch 'master' into idle-still-starts 2019-07-06 00:08:59 +09:30