Commit Graph

15923 Commits

Author SHA1 Message Date
55be4478aa Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours 2019-12-21 12:36:09 +03:00
8e60ae7039 Removed directive is not required 2019-12-20 15:45:20 -08:00
8353c893c0 Update BodyText of LocalScoreDeleteDialog 2019-12-20 12:00:10 -08:00
1bd44529dd add full-stop to mod description for consistency 2019-12-20 18:31:16 +08:00
08b477ed52 make ModDifficultyAdjust abstract 2019-12-20 18:30:23 +08:00
ad41a5cc57 Merge branch 'master' of github.com:ppy/osu into #7146 2019-12-20 02:14:01 -08:00
a6bdf04f6b Remove unused using 2019-12-20 18:36:39 +09:00
822903d5db Update song select statistics when mod changes settings 2019-12-20 18:01:35 +09:00
1802e0ff11 Fix storyboard incorrectly re-ordering elements 2019-12-20 16:04:05 +09:00
2769ddb3bb Merge branch 'master' of github.com:ppy/osu into #7146 2019-12-19 22:23:13 -08:00
1451f06739 Fix key overlay appearing regardless of the setting (#7289)
Fix key overlay appearing regardless of the setting

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-20 15:09:02 +09:00
6ccacab0bc Merge branch 'master' into #7146 2019-12-19 22:05:16 -08:00
f66c12a1f3 Add post-update notification for iOS users (#7300)
Add post-update notification for iOS users
2019-12-20 15:00:19 +09:00
6abbd33b51 Fixed CI issues 2019-12-19 21:57:14 -08:00
aa2fcbb660 Merge branch 'master' into fix-key-overlay-always-shown 2019-12-20 14:47:20 +09:00
f9dbebc96c Merge branch 'master' of github.com:ppy/osu into #7146 2019-12-19 21:30:12 -08:00
8ab26e8889 Update Tests with dependencies on LeaderboardScore. Added its dependency on DialogOverlay for the tests. Added test for deleting individual local score 2019-12-19 21:29:54 -08:00
11214628ad Add post-update notification for iOS users 2019-12-20 14:02:01 +09:00
656c584503 Update RestoreDefaultValueButton when default value changes 2019-12-20 13:59:01 +09:00
7d090d6cd9 Fix key overlay appearing regardless of the setting 2019-12-19 17:52:58 +03:00
a3154f2f7b Update framework 2019-12-19 20:30:58 +09:00
50fa6c5f77 Update score on reverts 2019-12-19 20:18:23 +09:00
04c3a6f8a4 Move more properties to the base class 2019-12-19 20:18:17 +09:00
76f2fb378f Separate score and health parts of ScoreProcessor 2019-12-19 20:03:14 +09:00
1da8cc8690 Encapsulate common logic of ScoreProcessor 2019-12-19 19:03:27 +09:00
d4d4ddc624 Remove new line for CodeFactor 2019-12-18 22:42:26 -08:00
643911ada9 Fix code format for CI 2019-12-18 22:41:07 -08:00
1617a9ce80 Merge branch 'master' of github.com:ppy/osu into #7146 2019-12-18 22:39:22 -08:00
b1533ae2a9 Fix score serialisation failing for unknown mod properties 2019-12-19 14:58:56 +09:00
ed07b779b1 Update to use score.ID identify local scores 2019-12-18 21:54:02 -08:00
27163a5133 Removed unnecessary code for deleting individual local score. 2019-12-18 21:04:10 -08:00
9ed2dbce8c Merge branch 'master' of github.com:ppy/osu into #7146 2019-12-18 20:59:29 -08:00
c94c803562 Implement local sorting by name and country in SocialOverlay (#5847)
Implement local sorting by name and country in SocialOverlay

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-19 12:54:02 +09:00
b67f986058 Fix CodeFactor issues 2019-12-18 19:26:35 -08:00
531ac16743 Update Scoreboard Refresh Method for deleting individual scores 2019-12-18 19:22:42 -08:00
d1fcadc700 Merge branch 'master' of github.com:ppy/osu into #7146 2019-12-18 19:16:54 -08:00
ada8efb4ab Merge branch 'master' into fix-storyboard-crash 2019-12-19 11:44:20 +09:00
a46602f705 Move cancellation token construction closer to usage 2019-12-19 11:26:22 +09:00
dd68106d90 Recreate panels only while loading/loaded 2019-12-19 02:21:33 +09:00
007e2e80c1 Refactor to fix sorting issues 2019-12-19 02:02:57 +09:00
37d7c984bc Merge branch 'master' into friends-sorting 2019-12-19 01:33:03 +09:00
f38853d229 Improve performance of storyboard loading 2019-12-19 00:52:50 +09:00
8d6987c870 Refactor storyboard timeline to reduce GC / fix crashes 2019-12-18 23:59:48 +09:00
2905a4418d Fix potential nullref 2019-12-18 21:30:57 +09:00
cb5a35f8f9 Fix incorrect bindable valuechanged usage 2019-12-18 21:08:49 +09:00
4e11fb0fd7 Merge remote-tracking branch 'refs/remotes/origin/master' into multiplier-text 2019-12-18 19:36:16 +09:00
39489e2901 Merge remote-tracking branch 'refs/remotes/origin/master' into fix-editor-movement-crash 2019-12-18 18:51:56 +09:00
5664ce3109 Add hitobject container regression test 2019-12-18 18:51:12 +09:00
ea661fce21 Merge branch 'master' into adjustable-map-settings 2019-12-18 18:44:11 +09:00
36172cf2bd Merge pull request #7175 from LeNitrous/update-beatmap-settings
Display current difficulty statistics with mods applied
2019-12-18 18:43:49 +09:00