Commit Graph

2250 Commits

Author SHA1 Message Date
Dean Herbert 4eefe47ce3
Merge branch 'master' into fix-0-customsampleset 2020-04-16 11:20:31 +09:00
smoogipoo 44981431c5 Remove suffix hackery 2020-04-14 21:33:32 +09:00
smoogipoo 6935221463 Improve logic for CSB transfer 2020-04-14 21:05:07 +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
Dean Herbert 63de493c85
Merge branch 'master' into fix-red-point-placement 2020-04-13 20:56:50 +09:00
smoogipoo 58a7313091 Fix fallback for file hit samples 2020-04-13 20:09:17 +09:00
smoogipoo cee4b005e6 Fix custom sample set 0 not falling back to default samples 2020-04-13 20:00:06 +09:00
smoogipoo f38b64d201 Fix placement blueprints handling double clicks 2020-04-13 13:57:15 +09:00
Dean Herbert c51bad0e35 Cache ManiaPlayfield instead 2020-04-13 13:42:21 +09:00
Dean Herbert cdff6060d3 Remove recursive hierarchy traversal for mania sample balance 2020-04-13 13:01:27 +09:00
Dean Herbert 65b96079a0 Move dampening to base implementation and change range to 0..1 2020-04-13 13:01:02 +09:00
Fire937 22d89dbff7 Merge branch 'master' of https://github.com/ppy/osu into stereo-shifted-playback 2020-04-12 01:46:32 +02:00
Fire937 f274ec297c Add positional sound support for all rulesets
The SamplePlaybackBalance is calculated in a way that the balance
remains between -0.4 and 0.4.
Positional sound is not supported in osu!taiko.
2020-04-12 01:33:25 +02:00
smoogipoo a84fe2525b Fix nested hitobjects potentially indirectly masked away 2020-04-11 16:53:45 +09:00
Fire937 c17e470266 Fix PositionalSound calculation implementation
The position used to calculate the stereo balance is now the position of
the drawable (as opposed to the position specified in the beatmap file
previously).
2020-04-10 00:01:35 +02:00
Fire937 2201e9b4ae Add stereo shifted hitsound playback support
There is now a setting in the general settings called "Positional
hitsounds". If the setting is enabled, the hitsounds playback will be
shifted according to their position on the beatmap.
2020-04-09 18:12:15 +02:00
smoogipoo ee6ea08cf8 Cleanup handling of hitobject updates 2020-04-09 20:16:44 +09:00
Dean Herbert 7b2144a1a7 Fix merge mishap 2020-04-03 23:31:46 +09:00
Dean Herbert 3289fa7c66
Merge branch 'master' into better-mania-scrollspeed 2020-04-03 23:25:14 +09:00
Dean Herbert eacbb20d87
Merge branch 'master' into fix-convert-scroll-speed 2020-04-03 22:47:53 +09:00
smoogipoo d90db5649d Improve comment slightly 2020-04-03 18:32:07 +09:00
smoogipoo 1ff2cc31d1 Implement more familiar scroll speed options in mania 2020-04-03 18:25:01 +09:00
smoogipoo b42d1104b7 Fix mania converts scrolling at incorrect speeds 2020-04-03 13:16:01 +09:00
smoogipoo 1f797207f7 Rework lookups to not require total playfield columns 2020-04-03 12:31:05 +09:00
smoogipoo 66486b094c Remove unnecessary dependency, allow null mods 2020-04-01 13:31:17 +09:00
Dan Balasescu 03cd9aa060
Merge branch 'master' into spun-out 2020-03-30 12:31:53 +09:00
Dean Herbert 7db9bd798c Remove handle overrides 2020-03-30 11:59:51 +09:00
Dean Herbert 2abb8a37df
Merge branch 'master' into show-mod-settings-tooltip 2020-03-29 14:35:04 +09:00
Dean Herbert a2b3fe180e Add the ability to disable user input on specific DrawableHitObjects 2020-03-29 14:30:45 +09:00
Dan Balasescu 005a818f32
Merge branch 'master' into fix-slider-end-sounds 2020-03-27 19:26:32 +09:00
Dean Herbert f80efd10c2 Avoid using a miss judgement 2020-03-26 19:54:17 +09:00
Dean Herbert 07462120e4 Split break tracking into its own component 2020-03-26 15:30:23 +09:00
Dean Herbert 2b1245f63a Improve xmldoc in a couple of places 2020-03-26 12:50:00 +09:00
Dean Herbert 8a2aac5f83 Rename conversion methods for clarity 2020-03-25 20:21:34 +09:00
Dean Herbert 800e395bc8 Merge branch 'master' into replay-recording 2020-03-25 20:20:59 +09:00
Dean Herbert 6d81da5419
Merge branch 'master' into video-offset 2020-03-25 11:28:59 +09:00
Dean Herbert 448961b330 Rename incorrect variable 2020-03-24 15:39:01 +09:00
Dean Herbert 388cf5c83a Fix catch positional data being incorrectly recorded 2020-03-24 15:38:54 +09:00
Dean Herbert 022465f546 Add encoding and import support 2020-03-24 14:51:52 +09:00
Dean Herbert 546772192c Add helper method to convert to legacy mods enums 2020-03-24 13:07:51 +09:00
Liam DeVoe 2fa42ed644 use N2 for ModTimeRamp, add x text 2020-03-23 12:54:08 -04:00
Dean Herbert 617149fb27 Implement in player 2020-03-23 20:06:18 +09:00
Dean Herbert 14a85a84bf Add proper screen space - gamefield mapping 2020-03-23 20:06:18 +09:00
Dean Herbert 6d48068061 Move replay recorder to final location 2020-03-23 20:04:15 +09:00
Dean Herbert 232c255986 Basic test scene setup 2020-03-23 17:33:02 +09:00
Dean Herbert 2dbcf9e346
Merge branch 'master' into taiko-random-mod 2020-03-23 16:33:59 +09:00
Dean Herbert 205f4dcb54 Simplify string construction logic 2020-03-23 15:20:56 +09:00
Dean Herbert a6b153673e Fix icons not updating tooltip text correctly 2020-03-23 14:58:02 +09:00
Dean Herbert 4f9ac7b81e Merge branch 'master' into show-mod-settings-tooltip 2020-03-23 14:57:54 +09:00