eb968d2bdb
Merge branch 'master' into timing-equivalence
2020-04-14 14:02:02 +09:00
948e225e12
Merge branch 'master' into select-recommended
2020-04-14 13:59:03 +09:00
d994b4c13c
Merge pull request #8751 from peppy/fix-missing-background-when-video
...
Fix beatmap background not displaying when video is present
2020-04-14 13:52:17 +09:00
d965baa4bd
Merge branch 'master' into dummy-api-request-support
2020-04-14 13:42:42 +09:00
2d2c8700b4
Merge branch 'master' into fix-missing-background-when-video
2020-04-14 13:29:33 +09:00
a4792a572c
Merge pull request #8716 from LittleEndu/no-video-option
...
Implement "prefer no-video" option
2020-04-14 12:05:07 +09:00
c5f8bbb25f
Fix beatmap background not displaying when video is present
2020-04-14 11:56:37 +09:00
68c25c38a7
Merge branch 'master' into no-video-option
2020-04-14 11:36:31 +09:00
5f13dc81be
Remove no longer necessary extensions
2020-04-14 04:38:18 +03:00
f9bc64ebca
Merge pull request #8750 from bdach/fix-classic-scoring
...
Fix scoring in classic mode not awarding exact numerical value for judgement
2020-04-14 10:20:22 +09:00
081a02f748
Merge branch 'master' into catch-hyperdash-fruit-colouring
2020-04-14 10:01:15 +09:00
06407a1081
Merge branch 'master' into fix-classic-scoring
2020-04-14 02:13:45 +02:00
13c81db0cf
Fix incorrect classic score formula
...
Upon closer inspection the classic score formula was subtly wrong. The
version given in the wiki is:
Score = Hit Value + (Hit Value * ((Combo multiplier * Difficulty
multiplier * Mod multiplier) / 25))
The code previously used:
bonusScore + baseScore * ((1 + Math.Max(0, HighestCombo.Value - 1)
* scoreMultiplier) / 25);
which is not equivalent to the version on the wiki. The error is in the 1
factor, as in the above version it is being divided by 25, while it should
be outside the division to keep parity with the previous formula.
The tests attached in the previous commit demonstrate that this change
causes a single hit without combo to increase total score by its exact
numeric value.
2020-04-14 01:09:58 +02:00
3e48c26bc2
Add failing tests
2020-04-14 01:09:58 +02:00
d9c91fb943
Merge branch 'master' of https://github.com/ppy/osu into no-video-option
...
Conflicts:
osu.Game/Overlays/Direct/PanelDownloadButton.cs
2020-04-13 17:40:28 +03:00
13812fef4c
Replace BindTo with setting the bindable
2020-04-13 17:28:02 +03:00
bdec4ca2b4
Merge pull request #8736 from smoogipoo/fix-red-point-placement
...
Rework slider control point placement to improve path progression
2020-04-13 22:30:49 +09:00
2b2ab2bf19
Show new segments as red points even when hovered
2020-04-13 21:59:23 +09:00
4cfc686683
Fix excption with 0 control points
2020-04-13 21:41:18 +09:00
89d8063588
Add support for Perform/PerformAsync
2020-04-13 21:35:35 +09:00
1c8a71b284
Exception instead of assert
2020-04-13 21:24:47 +09:00
e2a49ebf32
Merge pull request #8741 from peppy/limit-max-history
...
Limit upper number of editor beatmap states saved to 50
2020-04-13 21:16:58 +09:00
63de493c85
Merge branch 'master' into fix-red-point-placement
2020-04-13 20:56:50 +09:00
69c371d1f5
Merge pull request #8740 from EVAST9919/scroll-to-top-overlays
...
Use OverlayScrollContainer for overlays
2020-04-13 20:49:41 +09:00
2388799acf
Limit upper number of editor beatmap states saved to 50
2020-04-13 20:37:46 +09:00
64422fbf6d
Merge pull request #8697 from smoogipoo/more-change-state-support
...
Add change state support to more Editor components
2020-04-13 20:19:04 +09:00
0be2dc9b2d
Tidy up SectionsContainer class layout/ordering
2020-04-13 20:13:48 +09:00
58a7313091
Fix fallback for file hit samples
2020-04-13 20:09:17 +09:00
d56b6900ad
Merge pull request #8737 from smoogipoo/fix-overlapping-controlpoints
...
Fix connections hidden due to overlapping controlpoints
2020-04-13 20:06:24 +09:00
71d7ab3ba7
Merge pull request #8711 from peppy/taiko-hit-skinning
...
Add basic taiko "hit" skinning support
2020-04-13 20:00:53 +09:00
cee4b005e6
Fix custom sample set 0 not falling back to default samples
2020-04-13 20:00:06 +09:00
ca5971578a
Merge branch 'master' into more-change-state-support
2020-04-13 19:13:07 +09:00
ef5e88dd82
Merge pull request #8696 from smoogipoo/editor-undo-redo
...
Add undo/redo support to the Editor
2020-04-13 19:12:47 +09:00
33905ea864
Merge pull request #8739 from ppy/dependabot/nuget/BenchmarkDotNet-0.12.1
...
Bump BenchmarkDotNet from 0.12.0 to 0.12.1
2020-04-13 18:56:38 +09:00
63c3139d22
Merge branch 'master' into taiko-hit-skinning
2020-04-13 18:48:26 +09:00
4c5d01a611
Remove unused usings
2020-04-13 12:34:51 +03:00
b741e359cd
Use OverlayScrollContainer for overlays
2020-04-13 12:23:28 +03:00
0e88c28060
Merge branch 'editor-undo-redo' into more-change-state-support
2020-04-13 18:07:00 +09:00
409cda3cc0
Bump BenchmarkDotNet from 0.12.0 to 0.12.1
...
Bumps [BenchmarkDotNet](https://github.com/dotnet/BenchmarkDotNet ) from 0.12.0 to 0.12.1.
- [Release notes](https://github.com/dotnet/BenchmarkDotNet/releases )
- [Commits](https://github.com/dotnet/BenchmarkDotNet/compare/v0.12.0...v0.12.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-13 08:53:21 +00:00
dd949a3fe0
Fix test writer flush happening too late
2020-04-13 17:52:04 +09:00
9dfca4a374
Merge pull request #8699 from Fire937/stereo-shifted-playback
...
Add stereo shifted hitsound playback support
2020-04-13 17:51:13 +09:00
5416b2d2ff
Merge branch 'master' into stereo-shifted-playback
2020-04-13 17:51:05 +09:00
e679b13027
Merge pull request #8471 from EVAST9919/overlay-scroll-container
...
Implement OverlayScrollContainer component
2020-04-13 17:46:04 +09:00
2fd6555f2a
Merge branch 'master' into stereo-shifted-playback
2020-04-13 17:28:41 +09:00
6aab19413c
Rename differ to patcher, add xmldoc
2020-04-13 17:20:20 +09:00
bb53f96c71
Store states as byte[] instead of Streams
2020-04-13 17:18:50 +09:00
1e3251e3e9
Remove excessive logic
2020-04-13 10:59:53 +03:00
b8ecc41667
Add comment
2020-04-13 10:52:34 +03:00
29dd225205
Make button protected
2020-04-13 10:45:15 +03:00
9a65aa18d7
Fix connections hidden due to overlapping controlpoints
2020-04-13 16:13:14 +09:00
