Commit Graph

22228 Commits

Author SHA1 Message Date
cca97c09d2 Merge branch 'muted-notification' of https://github.com/Craftplacer/osu into muted-notification 2019-09-23 16:50:30 +02:00
8df77ffe92 Revert test scene changes 2019-09-23 16:48:30 +02:00
9a687ae8e2 Merge branch 'master' into muted-notification 2019-09-23 01:59:37 +02:00
c92545e294 Update osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-09-23 01:41:59 +02:00
9fe7675be8 Add a base class for all future labelled components (#6187)
Add a base class for all future labelled components
2019-09-23 00:38:51 +09:00
cdf29b0952 Specify model name on initialize and fail import notification m… (#6192)
Specify model name on initialize and fail import notification messages
2019-09-22 15:54:04 +09:00
9be8bdef52 Remove pluralize and use title letter casing 2019-09-21 21:00:24 +03:00
6bb0f3eb41 Move humanizing to the model name instead 2019-09-21 20:04:12 +03:00
db90d211cb Fix scores importing with deleted beatmap sets (#6190)
Fix scores importing with deleted beatmap sets
2019-09-22 01:15:22 +09:00
08440ce5fd Adjust test to assert that the import failed 2019-09-22 00:59:40 +09:00
24cc8ce0b7 Fix deleting null beatmap set 2019-09-22 00:59:01 +09:00
c99b48f934 Bring up-to-date and use IApplicableFailOverride 2019-09-21 23:30:54 +09:00
4c4b71eeec Merge branch 'master' into master 2019-09-21 22:45:05 +09:00
a76771e696 Add support for "additions" in changelog (#6177)
Add support for "additions" in changelog
2019-09-21 22:27:18 +09:00
68252c2ce6 Implement skin slider ball tinting (#6181)
Implement skin slider ball tinting
2019-09-21 22:06:42 +09:00
35f0e07007 Merge pull request #6178 from Game4all/fix-html-unescaping
Fix escaped html strings not being unescaped in changelog entries.
2019-09-21 13:11:27 +09:00
73fe402756 Merge branch 'master' into fix-html-unescaping 2019-09-21 12:59:57 +09:00
befdd140f4 Reverse padding changes 2019-09-20 23:50:19 +03:00
6ad26e61d1 Merge remote-tracking branch 'refs/remotes/ppy/master' into changelog-improvements 2019-09-20 23:49:24 +03:00
bbf3ac77f8 Add visual test for HTML string unescaping. 2019-09-20 21:35:26 +02:00
dced3c38b5 Update framework (#6196)
Update framework
2019-09-21 02:21:00 +09:00
b7c51d7b12 Merge pull request #6194 from VPeruS/fix-typo
Fix typo in CreateResourceStore method name
2019-09-21 02:16:33 +09:00
92f9cf3e06 Update framework 2019-09-21 02:08:19 +09:00
ac8fe6045f Fixed typo
Changed CreateReourceStore() to CreateResourceStore()
2019-09-20 19:58:39 +03:00
234c8e9067 Merge pull request #6191 from VPeruS/remove-unused-const
Remove unused CORNER_RADIUS
2019-09-21 00:33:56 +09:00
2d99d41a6d Remove unused CORNER_RADIUS 2019-09-20 18:17:35 +03:00
3be03a26c9 Pluralize instead of adding 's' 2019-09-20 16:18:55 +03:00
8300e86f20 Specify model name on import notification messages 2019-09-20 15:46:43 +03:00
57310c86c7 Remove unnecessary fields 2019-09-20 15:09:51 +03:00
093ed8421e Remove "allow slider ball tinting" ruleset setting 2019-09-20 15:08:00 +03:00
c89c092b98 Allow undeleting scores if their beatmap exists 2019-09-20 19:55:59 +09:00
ff2f3cde02 Add test 2019-09-20 19:53:03 +09:00
dfc0928ebe Fix scores importing with deleted beatmap sets 2019-09-20 19:39:21 +09:00
523272edab Add xmldocs 2019-09-20 18:39:04 +09:00
e0a97cfac5 Add a LabelledComponent base class 2019-09-20 18:35:15 +09:00
33e39795c3 Merge pull request #6185 from peppy/checksum-before-skip-copy
Checksum before skip copy
2019-09-20 15:37:04 +09:00
f306fe27d8 Add test to cover corruption case 2019-09-20 15:05:48 +09:00
d0a4e1e3c2 Force a checksum check before skipping FileStore copy op 2019-09-20 15:00:27 +09:00
c5474bc2ef Merge pull request #6179 from revelsix/leaderboard-mod-filter
Reduce ambiguity of leaderboard mod filter button
2019-09-20 12:31:36 +09:00
1b45014ff6 Use logical-OR 2019-09-20 00:25:16 +03:00
f6291170b1 Implement tinting slider ball with combo colour 2019-09-20 00:11:37 +03:00
8fcfd82316 Add AllowSliderBallTint to skin configuration 2019-09-20 00:10:55 +03:00
033ed2e1f5 Add setting to always tint slider ball 2019-09-20 00:10:28 +03:00
f7f9c0f7e0 Update BeatmapDetailAreaTabControl.cs 2019-09-19 15:47:32 -04:00
5663e3e6b3 Fix escaped html strings not being unescaped in changelog entries. 2019-09-19 20:08:14 +02:00
daa64f1be7 Adjust icon padding 2019-09-19 20:53:06 +03:00
c09f384a7e Merge pull request #6175 from peppy/confirm-via-key
Always show exit confirmation when closing via alt-f4 or window control
2019-09-20 02:47:09 +09:00
573da7b1e7 Implement ChangelogEntryType 2019-09-19 20:34:37 +03:00
636582e089 Always show exit confirmation when closing via alt-f4 or window control 2019-09-20 02:22:49 +09:00
433df52c7b Merge pull request #6172 from ppy/dependabot/nuget/Microsoft.NET.Test.Sdk-16.3.0
Bump Microsoft.NET.Test.Sdk from 16.2.0 to 16.3.0
2019-09-20 01:50:45 +09:00