68c25c38a7
Merge branch 'master' into no-video-option
2020-04-14 11:36:31 +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
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
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
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
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
5416b2d2ff
Merge branch 'master' into stereo-shifted-playback
2020-04-13 17:51:05 +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
0c60dbe796
Merge branch 'master' into editor-undo-redo
2020-04-13 16:03:53 +09:00
39b5c9f396
Merge branch 'master' into overlay-scroll-container
2020-04-13 15:44:20 +09:00
bde0b259c1
Improve slider placement test scene
2020-04-13 15:31:54 +09:00
142cddfb10
Rename CurrentBeatmap to SelectedBeatmap
2020-04-13 15:13:35 +09:00
72fb466a0b
Merge branch 'master' into present-from-overlay
2020-04-13 15:01:24 +09:00
b4800dd461
Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container
2020-04-13 08:09:17 +03:00
f38b64d201
Fix placement blueprints handling double clicks
2020-04-13 13:57:15 +09:00
c51bad0e35
Cache ManiaPlayfield instead
2020-04-13 13:42:21 +09:00
cdff6060d3
Remove recursive hierarchy traversal for mania sample balance
2020-04-13 13:01:27 +09:00
65b96079a0
Move dampening to base implementation and change range to 0..1
2020-04-13 13:01:02 +09:00
633b969017
Apply review suggestions
2020-04-12 21:57:35 +03:00
3efb4aba25
Use BindTarget
2020-04-12 19:48:15 +02:00
b475316a4e
Simplify and comment
2020-04-12 20:40:08 +03:00
3b9e0fa67d
Use readonly IBindable
2020-04-12 19:42:28 +03:00
ed28e8c8f5
Rename param
2020-04-12 19:38:09 +03:00
ecd25e567d
Present selected difficulty
2020-04-12 16:00:05 +03:00
07dc277321
Remove unused changelog comments class
2020-04-12 14:55:42 +02:00
63a1686dfb
Scroll to screen middle
2020-04-12 12:42:52 +03:00
c5d6c7728a
Update resources
2020-04-12 18:29:25 +09:00
