1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 14:37:25 +08:00
Commit Graph

28326 Commits

Author SHA1 Message Date
Dean Herbert
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
Dan Balasescu
4abb85023f
Merge pull request #8768 from Joehuu/hide-edit-item-multiplayer
Hide edit context menu item in multiplayer song select
2020-04-16 13:47:03 +09:00
smoogipoo
9e2be6f2f4 Remove bindable to promote one-way access 2020-04-16 13:25:08 +09:00
Dean Herbert
03a74a4320 Apply same conditional check changes to DrawableCarouselBeatmapSet 2020-04-16 12:13:26 +09:00
Dean Herbert
91b13f91ea Add exception disallowing potential edit when disabled at a property level 2020-04-16 12:11:12 +09:00
Dean Herbert
c4caf38feb Simplify menu item checks (and add for other items) 2020-04-16 12:10:20 +09:00
Dean Herbert
255ae0ea61 Merge branch 'master' into hide-edit-item-multiplayer 2020-04-16 11:46:10 +09:00
Dean Herbert
3ca42cce71
Merge pull request #8756 from smoogipoo/fix-0-customsampleset
Fix 0 custom sample bank not falling back to user skin
2020-04-16 11:43:09 +09:00
Dean Herbert
4eefe47ce3
Merge branch 'master' into fix-0-customsampleset 2020-04-16 11:20:31 +09:00
Dean Herbert
06e25091f6 Fix typo 2020-04-16 10:44:08 +09:00
Joehu
e2b28bfe88 Hide edit context menu item in multiplayer song select 2020-04-15 18:17:12 -07:00
smoogipoo
ce21cfbb03 Use bindables in menu items 2020-04-15 16:17:34 +09:00
smoogipoo
e8c955ed9b Add CanUndo/CanRedo bindables 2020-04-15 16:17:17 +09:00
smoogipoo
102c1d9095 Add disabled state to menu items 2020-04-15 16:17:17 +09:00
smoogipoo
72707a9973 Fix OS-dependent substring 2020-04-15 13:54:23 +09:00
Dan Balasescu
2af2a49f22
Merge pull request #8755 from peppy/fix-multi-stage-mania-replays
Fix osu!mania replays actuating incorrect keys when multiple stages are involved
2020-04-15 13:42:37 +09:00
Dan Balasescu
8b83c3daab
Merge pull request #8761 from EVAST9919/typo-fix
Fix typo in DrawableTaikoHitObject
2020-04-15 13:22:19 +09:00
Dan Balasescu
a42f24b900
Merge branch 'master' into fix-multi-stage-mania-replays 2020-04-15 13:08:28 +09:00
smoogipoo
e534d59c80 Use another argument exception 2020-04-15 13:08:15 +09:00
Andrei Zavatski
f4b5a17b65 Fix typo in DrawableTaikoHitObject 2020-04-15 07:00:38 +03:00
Dean Herbert
d47e414fb1 Apply review feedback (unroll inner loop / xml fixes) 2020-04-15 12:35:43 +09:00
smoogipoo
10486a0ad2 Fix potential dependency-related issues 2020-04-14 23:10:14 +09:00
smoogipoo
64d44dedcd Make testscene headless 2020-04-14 22:39:51 +09:00
smoogipoo
44981431c5 Remove suffix hackery 2020-04-14 21:33:32 +09:00
smoogipoo
00d564d29c Add tests 2020-04-14 21:18:28 +09:00
smoogipoo
b29957798f Fix no audiomanager in test scene working beatmap 2020-04-14 21:05:42 +09:00
smoogipoo
6935221463 Improve logic for CSB transfer 2020-04-14 21:05:07 +09:00
Dean Herbert
ecd40072c4
Merge pull request #8312 from Game4all/low-hp-red-layer
Fade playfield to red when player health is low
2020-04-14 18:33:51 +09:00
Dean Herbert
7f95418262 Fix osu!mania replays actuating incorrect keys when multiple stages are involved 2020-04-14 16:52:17 +09:00
smoogipoo
f3dbddd75c Update bindings in LoadComplete() 2020-04-14 15:52:38 +09:00
smoogipoo
59728ffebd Fix up/improve test scene 2020-04-14 15:24:34 +09:00
Dean Herbert
363b43c41f
Merge pull request #8752 from smoogipoo/fix-headless-api-test
Mark dummy api test scene as headless
2020-04-14 15:23:09 +09:00
smoogipoo
b8b334ca27 Always unbind bindings 2020-04-14 15:21:56 +09:00
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
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
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
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