1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-19 06:05:22 +08:00
Commit Graph

21552 Commits

Author SHA1 Message Date
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
Dean Herbert
ea911b2fd2 Ensure intro restarts track 2019-07-06 19:05:42 +09:00
Dean Herbert
6bee26cfc9 Rename to match 2019-07-06 19:05:37 +09:00
Dean Herbert
58183ad3d5 Change intro test to test full intro screen 2019-07-06 19:05:12 +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
71e40b4684 Force SQLite to multithreading mode 2019-07-06 12:32:16 +09: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
Lucas A
5f8bd6eca7 Fix CI issues + minor issues 2019-07-05 16:51:15 +02:00
Dan Balasescu
3a9f16ccf2
Merge branch 'master' into idle-still-starts 2019-07-06 00:08:59 +09:30
Dan Balasescu
b8d3db4d37
Merge pull request #5244 from peppy/changelog-comments
Add messaging telling users how to leave changelog comments
2019-07-06 00:08:53 +09:30
Lucas A
89acd9da3e Add game-wide jukebox keybindings handling to OsuGame 2019-07-05 16:33:13 +02:00
Lucas A
5cad2b2192 Add missing function to MusicController 2019-07-05 16:28:37 +02:00
Lucas A
c9e44e5e34 Add OsdIconToast + test 2019-07-05 16:25:09 +02:00
Lucas A
b5bd863dd0 Add methods to MusicController to play or pause, select next or previous track 2019-07-05 16:21:50 +02:00
Lucas A
70372dd03d Add global actions for game-wide music jukebox manipulation 2019-07-05 16:14:04 +02:00
Dan Balasescu
f32796db5c
Merge branch 'master' into changelog-comments 2019-07-05 23:42:46 +09:30
Lucas A
df75f9d312 Revert changes made by VS to csproj 2019-07-05 16:08:02 +02:00
Lucas A
bc60b1dc13 Add test for empty OsdToast 2019-07-05 16:04:47 +02:00
Lucas A
4f0429d046 Add OsdTrackedSettingToast 2019-07-05 16:03:46 +02:00
Lucas A
6288cc6e5c Refactor OnScreenDisplay to allow displaying of custom messages on OSD 2019-07-05 16:03:22 +02:00
Dean Herbert
2432878614
Add local score import from stable (#5072)
Add local score import from stable

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-05 16:24:39 +09:00
David Zhao
a259247a98 use const 2019-07-05 16:07:17 +09:00
Dean Herbert
598b0d668b
Merge branch 'master' into import-stable-scores 2019-07-05 15:54:33 +09:00
Dean Herbert
2626a26485
Add a check if the locally available score has files (#5260)
Add a check if the locally available score has files

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-05 15:54:27 +09:00
Dean Herbert
39bd5e6478 Add test 2019-07-05 15:50:31 +09:00
Dean Herbert
b54c0176eb
Merge branch 'master' into disable-own-replays 2019-07-05 15:41:43 +09:00
Dean Herbert
7ce2e1c5ee
Lock WorkingBeatmap cache to avoid threading issues (#5243)
Lock WorkingBeatmap cache to avoid threading issues
2019-07-05 15:41:35 +09:00