RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,547 Commits 3 Branches 650 Tags 352 MiB
Commit Graph

28547 Commits

Author SHA1 Message Date
smoogipoo 3183827329 Reorder fields 2020-04-14 15:09:31 +09:00
smoogipoo 7d2d0785fd Fix potential unsafe ordering of binds 2020-04-14 15:07:32 +09:00
smoogipoo 9619fb9f6a Remove bind in Player 2020-04-14 15:00:36 +09:00
smoogipoo 3c5fb79823 Mark dummy api test scene as headless 2020-04-14 14:51:09 +09:00
Dan Balasescu ac8a3efc46
Merge branch 'master' into low-hp-red-layer 2020-04-14 14:47:01 +09:00
Dan Balasescu 33f7e429a8
Merge pull request #8444 from LittleEndu/select-recommended 
Make beatmap carousel select recommended difficulties
 2020-04-14 14:25:17 +09:00
Dan Balasescu 79a306cb79
Merge pull request #8714 from peppy/dummy-api-request-support 
Add support for testing arbitrary API requests/responses via Dummy API
 2020-04-14 14:08:54 +09:00
Dan Balasescu eb968d2bdb
Merge branch 'master' into timing-equivalence 2020-04-14 14:02:02 +09:00
Dan Balasescu 948e225e12
Merge branch 'master' into select-recommended 2020-04-14 13:59:03 +09:00
Dan Balasescu 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
Dan Balasescu d965baa4bd
Merge branch 'master' into dummy-api-request-support 2020-04-14 13:42:42 +09:00
Dan Balasescu 2d2c8700b4
Merge branch 'master' into fix-missing-background-when-video 2020-04-14 13:29:33 +09:00
Dean Herbert a4792a572c
Merge pull request #8716 from LittleEndu/no-video-option 
Implement "prefer no-video" option
 2020-04-14 12:05:07 +09:00
Dean Herbert c5f8bbb25f Fix beatmap background not displaying when video is present 2020-04-14 11:56:37 +09:00
Dean Herbert 68c25c38a7
Merge branch 'master' into no-video-option 2020-04-14 11:36:31 +09:00
Salman Ahmed 5f13dc81be Remove no longer necessary extensions 2020-04-14 04:38:18 +03:00
Dean Herbert 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
Dean Herbert 081a02f748
Merge branch 'master' into catch-hyperdash-fruit-colouring 2020-04-14 10:01:15 +09:00
Bartłomiej Dach 06407a1081 Merge branch 'master' into fix-classic-scoring 2020-04-14 02:13:45 +02:00
Bartłomiej Dach 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
Bartłomiej Dach 3e48c26bc2 Add failing tests 2020-04-14 01:09:58 +02:00
Endrik Tombak 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
Endrik Tombak 13812fef4c Replace BindTo with setting the bindable 2020-04-13 17:28:02 +03:00
Dean Herbert 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
Dean Herbert 2b2ab2bf19 Show new segments as red points even when hovered 2020-04-13 21:59:23 +09:00
smoogipoo 4cfc686683 Fix excption with 0 control points 2020-04-13 21:41:18 +09:00
Dean Herbert 89d8063588 Add support for Perform/PerformAsync 2020-04-13 21:35:35 +09:00
Dean Herbert 1c8a71b284 Exception instead of assert 2020-04-13 21:24:47 +09:00
Dean Herbert 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
Dean Herbert 63de493c85
Merge branch 'master' into fix-red-point-placement 2020-04-13 20:56:50 +09:00
Dean Herbert 69c371d1f5
Merge pull request #8740 from EVAST9919/scroll-to-top-overlays 
Use OverlayScrollContainer for overlays
 2020-04-13 20:49:41 +09:00
Dean Herbert 2388799acf Limit upper number of editor beatmap states saved to 50 2020-04-13 20:37:46 +09:00
Dean Herbert 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
Dean Herbert 0be2dc9b2d Tidy up SectionsContainer class layout/ordering 2020-04-13 20:13:48 +09:00
smoogipoo 58a7313091 Fix fallback for file hit samples 2020-04-13 20:09:17 +09:00
Dean Herbert 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
Dan Balasescu 71d7ab3ba7
Merge pull request #8711 from peppy/taiko-hit-skinning 
Add basic taiko "hit" skinning support
 2020-04-13 20:00:53 +09:00
smoogipoo cee4b005e6 Fix custom sample set 0 not falling back to default samples 2020-04-13 20:00:06 +09:00
Dean Herbert ca5971578a
Merge branch 'master' into more-change-state-support 2020-04-13 19:13:07 +09:00
Dean Herbert 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
Dean Herbert 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
Dan Balasescu 63c3139d22
Merge branch 'master' into taiko-hit-skinning 2020-04-13 18:48:26 +09:00
Andrei Zavatski 4c5d01a611 Remove unused usings 2020-04-13 12:34:51 +03:00
Andrei Zavatski b741e359cd Use OverlayScrollContainer for overlays 2020-04-13 12:23:28 +03:00
Dean Herbert 0e88c28060 Merge branch 'editor-undo-redo' into more-change-state-support 2020-04-13 18:07:00 +09:00
dependabot-preview[bot] 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
Dean Herbert dd949a3fe0 Fix test writer flush happening too late 2020-04-13 17:52:04 +09:00
Dan Balasescu 9dfca4a374
Merge pull request #8699 from Fire937/stereo-shifted-playback 
Add stereo shifted hitsound playback support
 2020-04-13 17:51:13 +09:00
Dan Balasescu 5416b2d2ff
Merge branch 'master' into stereo-shifted-playback 2020-04-13 17:51:05 +09:00
Dan Balasescu e679b13027
Merge pull request #8471 from EVAST9919/overlay-scroll-container 
Implement OverlayScrollContainer component
 2020-04-13 17:46:04 +09:00