Commit Graph

17897 Commits

Author SHA1 Message Date
92df4e3a9e Remove PlayerTestScene constructor and use CreateRuleset method instead 2020-04-17 11:17:51 +03:00
5fa6bcb5a3 Move SkinnableTestScene into using the global CreateRuleset method 2020-04-17 11:17:44 +03:00
67bd7bfa39 Add CreateRuleset in OsuTestScene for scenes that depend on it 2020-04-17 11:12:25 +03:00
5ec8d49241 Merge pull request #8764 from smoogipoo/disable-undo-redo
Disable undo/redo menu items when they can't be performed
2020-04-16 13:47:23 +09:00
9e2be6f2f4 Remove bindable to promote one-way access 2020-04-16 13:25:08 +09:00
03a74a4320 Apply same conditional check changes to DrawableCarouselBeatmapSet 2020-04-16 12:13:26 +09:00
91b13f91ea Add exception disallowing potential edit when disabled at a property level 2020-04-16 12:11:12 +09:00
c4caf38feb Simplify menu item checks (and add for other items) 2020-04-16 12:10:20 +09:00
255ae0ea61 Merge branch 'master' into hide-edit-item-multiplayer 2020-04-16 11:46:10 +09:00
4eefe47ce3 Merge branch 'master' into fix-0-customsampleset 2020-04-16 11:20:31 +09:00
e2b28bfe88 Hide edit context menu item in multiplayer song select 2020-04-15 18:17:12 -07:00
ce21cfbb03 Use bindables in menu items 2020-04-15 16:17:34 +09:00
e8c955ed9b Add CanUndo/CanRedo bindables 2020-04-15 16:17:17 +09:00
102c1d9095 Add disabled state to menu items 2020-04-15 16:17:17 +09:00
44981431c5 Remove suffix hackery 2020-04-14 21:33:32 +09:00
b29957798f Fix no audiomanager in test scene working beatmap 2020-04-14 21:05:42 +09:00
6935221463 Improve logic for CSB transfer 2020-04-14 21:05:07 +09:00
f3dbddd75c Update bindings in LoadComplete() 2020-04-14 15:52:38 +09:00
b8b334ca27 Always unbind bindings 2020-04-14 15:21:56 +09:00
3183827329 Reorder fields 2020-04-14 15:09:31 +09:00
7d2d0785fd Fix potential unsafe ordering of binds 2020-04-14 15:07:32 +09:00
9619fb9f6a Remove bind in Player 2020-04-14 15:00:36 +09:00
ac8a3efc46 Merge branch 'master' into low-hp-red-layer 2020-04-14 14:47:01 +09:00
33f7e429a8 Merge pull request #8444 from LittleEndu/select-recommended
Make beatmap carousel select recommended difficulties
2020-04-14 14:25:17 +09:00
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
948e225e12 Merge branch 'master' into select-recommended 2020-04-14 13:59:03 +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
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
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