Commit Graph

12962 Commits

Author SHA1 Message Date
84919d70bb Health bar -> Health display
Also inverts logic
2019-07-07 05:30:30 +09:00
7c0e3a50b6 Merge branch 'master' into fix-unranked-map-lb-placeholder 2019-07-06 12:09:28 -07:00
3f332cca2f Merge branch 'master' into applicable-to-hud 2019-07-07 01:03:50 +09:00
1f13b94c72 Fix build error 2019-07-06 18:44:55 +03:00
a42c79895d Remove unnecessary private field 2019-07-06 18:38:41 +03:00
be2d0048db Merge branch 'master' into buttonsystem-entermode 2019-07-07 00:01:41 +09:00
dfabed3d85 Merge branch 'master' into applicable-to-hud 2019-07-06 16:30:02 +03:00
040dbfd2c1 Merge branch 'master' into remove-unnecessary-fading 2019-07-06 15:59:44 +03:00
6fd3ad5c1d Remove unnecessary fading 2019-07-06 12:10:30 +03:00
2149d639de Merge branch 'master' into leaderboard-mod-filter 2019-07-06 13:27:49 +09:00
530e07110f Use a descriptive name for the setting 2019-07-06 06:32:25 +03:00
71e40b4684 Force SQLite to multithreading mode 2019-07-06 12:32:16 +09:00
3a9f16ccf2 Merge branch 'master' into idle-still-starts 2019-07-06 00:08:59 +09:30
f32796db5c Merge branch 'master' into changelog-comments 2019-07-05 23:42:46 +09:30
a259247a98 use const 2019-07-05 16:07:17 +09:00
598b0d668b Merge branch 'master' into import-stable-scores 2019-07-05 15:54:33 +09:00
b54c0176eb Merge branch 'master' into disable-own-replays 2019-07-05 15:41:43 +09:00
b902457f8d Allow PlayerLoader to proceed even if the mouse is hovering an overlay panel 2019-07-05 15:32:07 +09:00
5862eb172a Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders
# Conflicts:
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2019-07-05 15:48:04 +09:30
49eb8b0b53 Merge branch 'master' into lock-working-cache 2019-07-05 15:14:07 +09:00
04c0ce1ea3 Merge branch 'master' into import-stable-scores 2019-07-05 14:48:55 +09:00
df7d31350c Stop import failures from being added to the imported model list 2019-07-05 14:47:55 +09:00
d5a9542743 Fix incorrect xmldoc in DownloadTrackingComposite (#5261)
Fix incorrect xmldoc in DownloadTrackingComposite
2019-07-05 14:43:28 +09:00
adf6d6c942 Update initial run import process to include scores 2019-07-05 14:25:52 +09:00
80d8ce8392 Fix GetStableImportPaths xmldoc 2019-07-05 14:21:56 +09:00
87c8fd0035 Fix path specification not being cross-platform compliant 2019-07-05 14:15:29 +09:00
99da04527d Replays -> scores 2019-07-05 14:07:14 +09:00
ba8df3ba92 Clean up stable lookup and mutate logic 2019-07-05 13:59:31 +09:00
8346c50ce1 Rename delete method and improve xmldoc 2019-07-05 13:55:25 +09:00
1534b75d27 Fix ci errors 2019-07-04 21:39:21 -07:00
fcdba6b3f5 Merge branch 'master' into import-stable-scores 2019-07-05 13:34:03 +09:00
e8168037f9 Fix unranked beatmap leaderboards showing "no records" placeholder 2019-07-04 21:19:51 -07:00
d77d49f595 Merge branch 'master' into fade-music-on-exit 2019-07-05 13:13:07 +09:00
9eeafa0861 Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode 2019-07-05 13:08:48 +09:00
79d6670dc5 Expose durations from MainMenu and reorder 2019-07-05 13:08:45 +09:00
f1dab946ff Remove need to trim query string 2019-07-05 08:46:17 +05:30
1dab363be3 Require supporter for filtering mods on online leaderboards 2019-07-05 08:42:44 +05:30
98a242cc37 Merge remote-tracking branch 'ppy/master' into leaderboard-mod-filter 2019-07-05 08:38:33 +05:30
a30f0c03bb Fix incorrect xmldoc 2019-07-05 05:32:30 +03:00
f4dcbbbfef Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode 2019-07-05 11:29:29 +09:00
d624157c45 Remove unnecessary fading 2019-07-05 05:17:36 +03:00
bff5ad22f4 Check if the locally available score has files 2019-07-05 05:16:40 +03:00
91d461eba7 Merge pull request #5251 from Joehuu/remove-edit-song-select-file
Remove unused EditSongSelect file
2019-07-05 10:30:37 +09:00
38dceddc27 Fix file ordering 2019-07-05 10:07:45 +09:00
037ea7b708 Merge branch 'master' into fix-colour-mod-filter 2019-07-05 10:04:31 +09:00
ae7da2557e Fix initial colour of leaderboard mod filter 2019-07-04 13:24:13 -07:00
5f6544eebf Fix beatmap leaderboards requiring supporter when signed out 2019-07-04 12:05:07 -07:00
f04adb7192 Apply mods filter to local scores too 2019-07-04 22:38:33 +05:30
9b2ebed669 Remove unused EditSongSelect file 2019-07-04 08:36:34 -07:00
be4e7d0f50 remove comment 2019-07-04 17:08:21 +09:00