1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-27 19:42:54 +08:00
Commit Graph

22613 Commits

Author SHA1 Message Date
Dean Herbert
c99b48f934 Bring up-to-date and use IApplicableFailOverride 2019-09-21 23:30:54 +09:00
Dean Herbert
4c4b71eeec
Merge branch 'master' into master 2019-09-21 22:45:05 +09:00
Dean Herbert
a76771e696
Add support for "additions" in changelog (#6177)
Add support for "additions" in changelog
2019-09-21 22:27:18 +09:00
Dean Herbert
68252c2ce6
Implement skin slider ball tinting (#6181)
Implement skin slider ball tinting
2019-09-21 22:06:42 +09:00
Dan Balasescu
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
Dan Balasescu
73fe402756
Merge branch 'master' into fix-html-unescaping 2019-09-21 12:59:57 +09:00
Andrei Zavatski
befdd140f4 Reverse padding changes 2019-09-20 23:50:19 +03:00
Andrei Zavatski
6ad26e61d1 Merge remote-tracking branch 'refs/remotes/ppy/master' into changelog-improvements 2019-09-20 23:49:24 +03:00
Lucas A
bbf3ac77f8 Add visual test for HTML string unescaping. 2019-09-20 21:35:26 +02:00
Dean Herbert
dced3c38b5
Update framework (#6196)
Update framework
2019-09-21 02:21:00 +09:00
Dean Herbert
b7c51d7b12
Merge pull request #6194 from VPeruS/fix-typo
Fix typo in CreateResourceStore method name
2019-09-21 02:16:33 +09:00
Dean Herbert
92f9cf3e06 Update framework 2019-09-21 02:08:19 +09:00
Vperus
ac8fe6045f Fixed typo
Changed CreateReourceStore() to CreateResourceStore()
2019-09-20 19:58:39 +03:00
Dan Balasescu
234c8e9067
Merge pull request #6191 from VPeruS/remove-unused-const
Remove unused CORNER_RADIUS
2019-09-21 00:33:56 +09:00
Vperus
2d99d41a6d Remove unused CORNER_RADIUS 2019-09-20 18:17:35 +03:00
iiSaLMaN
3be03a26c9 Pluralize instead of adding 's' 2019-09-20 16:18:55 +03:00
iiSaLMaN
8300e86f20 Specify model name on import notification messages 2019-09-20 15:46:43 +03:00
iiSaLMaN
57310c86c7 Remove unnecessary fields 2019-09-20 15:09:51 +03:00
iiSaLMaN
093ed8421e Remove "allow slider ball tinting" ruleset setting 2019-09-20 15:08:00 +03:00
smoogipoo
c89c092b98 Allow undeleting scores if their beatmap exists 2019-09-20 19:55:59 +09:00
smoogipoo
ff2f3cde02 Add test 2019-09-20 19:53:03 +09:00
smoogipoo
dfc0928ebe Fix scores importing with deleted beatmap sets 2019-09-20 19:39:21 +09:00
smoogipoo
2bbf4ca4b5 Update LabelledTextBox to use LabelledComponent 2019-09-20 18:50:50 +09:00
smoogipoo
523272edab Add xmldocs 2019-09-20 18:39:04 +09:00
smoogipoo
e0a97cfac5 Add a LabelledComponent base class 2019-09-20 18:35:15 +09:00
Dan Balasescu
33e39795c3
Merge pull request #6185 from peppy/checksum-before-skip-copy
Checksum before skip copy
2019-09-20 15:37:04 +09:00
Dean Herbert
a06cb54732
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-09-20 15:28:08 +09:00
Dean Herbert
f306fe27d8 Add test to cover corruption case 2019-09-20 15:05:48 +09:00
Dean Herbert
d0a4e1e3c2 Force a checksum check before skipping FileStore copy op 2019-09-20 15:00:27 +09:00
Dean Herbert
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
iiSaLMaN
1b45014ff6 Use logical-OR 2019-09-20 00:25:16 +03:00
iiSaLMaN
f6291170b1 Implement tinting slider ball with combo colour 2019-09-20 00:11:37 +03:00
iiSaLMaN
8fcfd82316 Add AllowSliderBallTint to skin configuration 2019-09-20 00:10:55 +03:00
iiSaLMaN
033ed2e1f5 Add setting to always tint slider ball 2019-09-20 00:10:28 +03:00
Revel
f7f9c0f7e0 Update BeatmapDetailAreaTabControl.cs 2019-09-19 15:47:32 -04:00
Lucas A
5663e3e6b3 Fix escaped html strings not being unescaped in changelog entries. 2019-09-19 20:08:14 +02:00
Andrei Zavatski
daa64f1be7 Adjust icon padding 2019-09-19 20:53:06 +03:00
Dan Balasescu
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
Andrei Zavatski
573da7b1e7 Implement ChangelogEntryType 2019-09-19 20:34:37 +03:00
Dean Herbert
636582e089 Always show exit confirmation when closing via alt-f4 or window control 2019-09-20 02:22:49 +09:00
Dean Herbert
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
dependabot-preview[bot]
f10b390ca0
Bump Microsoft.NET.Test.Sdk from 16.2.0 to 16.3.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.2.0 to 16.3.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.2.0...v16.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-19 16:32:39 +00:00
Dean Herbert
fc78284765
Add setting to adjust hold-to-confirm activation time (#6166)
Add setting to adjust hold-to-confirm activation time
2019-09-19 22:51:20 +09:00
Dean Herbert
67796e0982 Apply code styling suggestions 2019-09-19 22:46:21 +09:00
Dean Herbert
4e9bb7b121 Merge remote-tracking branch 'upstream/master' into hold-to-press-setting 2019-09-19 22:35:18 +09:00
Dean Herbert
23c5cb6367 Expand tests to cover new behaviour 2019-09-19 22:35:14 +09:00
Dean Herbert
0a67d1db1b
Merge pull request #5355 from EVAST9919/songselect-best-user-score
Show personal best on song select
2019-09-19 21:17:23 +09:00
smoogipoo
94d3bcc612 Fix top score not being selectable 2019-09-19 20:47:33 +09:00
Dan Balasescu
8345cf4e98
Merge pull request #6170 from peppy/fix-nested-imports
Fix importing archives which are nested in a single folder within a zip
2019-09-19 20:37:18 +09:00
Dean Herbert
50d4206c45 Fix exit scenarios 2019-09-19 20:17:58 +09:00