1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 09:32:53 +08:00
Commit Graph

55336 Commits

Author SHA1 Message Date
Dean Herbert
13d9b2188b
Merge pull request #20145 from smoogipoo/multiple-countdowns
Implement support for multiple active countdowns in multiplayer
2022-09-08 19:15:30 +09:00
Dean Herbert
a98c6b2c1f Add comment metioning why we need to use DrawableRuleset lookup 2022-09-08 19:14:23 +09:00
Dean Herbert
ee094e3a85 Rewrite tests 2022-09-08 19:05:13 +09:00
Dean Herbert
6729bb3e1a Change FrameStableClock to inherit IGameplayClock 2022-09-08 18:24:18 +09:00
Dean Herbert
5c2fb3e434 Simplify calculation method 2022-09-08 18:22:53 +09:00
cdwcgt
f0850c42e5
fix typo
`ManiaScorllSlider` -> `ManiaScrollSlider`
2022-09-08 18:16:23 +09:00
cdwcgt
53219ae4e7
show fixed speed in mania scroll speed settings 2022-09-08 16:59:48 +08:00
Dean Herbert
0de220c45c Change IsExclusive default value to true 2022-09-08 17:54:29 +09:00
Dean Herbert
d463bd2f3f
Merge pull request #20130 from Exanc/master
Display 0 stars instead of infinity for the minimum star slider
2022-09-08 17:51:32 +09:00
Dean Herbert
c6521e4c72 Rename ordering helper method 2022-09-08 17:50:27 +09:00
Dan Balasescu
76eae73fa4 Revert unintended change 2022-09-08 17:41:23 +09:00
Dan Balasescu
6fa37fc5a4
Merge pull request #20186 from peppy/fix-score-reset
Fix clicking an in-progress match in bracket view potentially resetting scores
2022-09-08 17:40:20 +09:00
Dan Balasescu
c61c596c1f Expose as readonly IAggregateAudioAdjustment 2022-09-08 17:37:02 +09:00
Dan Balasescu
b559d4ecdf Rename GameplayAdjustments -> AdjustmentsFromMods 2022-09-08 17:14:06 +09:00
Dean Herbert
ed81297611 Fix playlist items showing download button briefly during initial local presence checks 2022-09-08 17:10:45 +09:00
Dan Balasescu
b0b4da533a Expose gameplay adjustments via MultiSpectatorPlayer instead 2022-09-08 16:59:20 +09:00
Dean Herbert
9e42d6167f Fix tournament match scores resetting if StartMatch is called on an in-progress match 2022-09-08 16:07:21 +09:00
Dean Herbert
d523a2ac33 Rename default value field and make private 2022-09-08 15:53:08 +09:00
Dean Herbert
9ead5e59d3 Fix incorrectly displaying minimum value in placeholder messaging 2022-09-08 15:51:15 +09:00
Dean Herbert
7b079c134e Update test to actually test what was intended 2022-09-08 15:48:04 +09:00
Dean Herbert
3d9bf25c8a Apply NRT to TestScenePlaySongSelect
Very mess.
2022-09-08 14:49:57 +09:00
Dean Herbert
6aac0bd4e9 Update test to account for the fact that SSDQ is not zero anymore 2022-09-08 13:43:37 +09:00
Dean Herbert
3b116a1a47 Fix mods not being set on BeginPlayingInternal 2022-09-08 13:17:27 +09:00
Salman Ahmed
50923b6e5b Move track assignment below 2022-09-08 00:25:55 +03:00
Dean Herbert
68ea5a765f Update framework 2022-09-07 23:56:45 +09:00
Acid Chicken (硫酸鶏)
267465df18
chore(osu.Game): combine Osu.Colour.{Draw,Text}ForHitResult into OsuColour.ForHitResult 2022-09-07 23:34:46 +09:00
Acid Chicken (硫酸鶏)
54f0bb797e
refactor(osu.Game): remove nullable optouts in HitResult.cs 2022-09-07 23:32:45 +09:00
Acid Chicken (硫酸鶏)
b560b6f745
refactor(osu.Game): arrange the code for the timing distribution graph 2022-09-07 23:29:10 +09:00
Dan Balasescu
83c0cb1acc Fix beatmap set to null after exiting song select 2022-09-07 21:34:29 +09:00
Dan Balasescu
fcea244537 Remove initial selection from OnlinePlaySongSelect
This stuff never really worked anyway - every case except with an
already created multiplayer room was broken anyway.
2022-09-07 21:34:29 +09:00
Dan Balasescu
208bd0f391 Give OnlinePlaySongSelect a reference PlaylistItem 2022-09-07 21:34:29 +09:00
Dean Herbert
6a03b4e0de
Merge branch 'master' into true-gameplay-rate 2022-09-07 20:01:03 +09:00
Dean Herbert
770c1ade2f Add test coverage of track rate adjusting during multi spectator 2022-09-07 20:00:24 +09:00
Dan Balasescu
cb9bae1f5c Enable NRT 2022-09-07 19:54:55 +09:00
Dan Balasescu
85ce1bcea9
Merge pull request #20177 from peppy/fix-target-mod-crash
Fix target mod crashing if beatmap is played with a break after all hitobjects
2022-09-07 19:24:19 +09:00
Dean Herbert
e6b449fe0b Fix case of zero rate calculating a zero true gameplay rate 2022-09-07 19:23:44 +09:00
Dean Herbert
1be3b74ff3 Fix multiplayer spectator not getting gameplay adjustments applied 2022-09-07 19:12:34 +09:00
Dean Herbert
fa15502384 Move full track adjustment flow inside MasterGameplayClockContainer 2022-09-07 19:12:16 +09:00
Dean Herbert
75d0deef72 Apply proposed changes to remove inheritance from MasterGameplayClockContainer 2022-09-07 17:49:05 +09:00
Dean Herbert
b5b66de3c9 Fix target mod crashing if beatmap is played with a break after all hitobjects
Closes https://github.com/ppy/osu/issues/20161.
2022-09-07 17:46:51 +09:00
Dan Balasescu
f8e37af2e0
Merge pull request #20171 from peppy/beatmap-carousel-nrt
Fix missing null checks on `selectedBeatmap` fields in `BeatmapCarousel`
2022-09-07 17:15:00 +09:00
Dan Balasescu
264c9bfaf6
Merge pull request #20173 from peppy/test-scene-storyboard-tidy
Tidy up `TestSceneStoryboard`
2022-09-07 17:07:19 +09:00
Dean Herbert
68c27522e7
Merge pull request #20158 from smoogipoo/taiko-geki-katu
Decode taiko Geki/Katu from legacy scores into `LargeBonus`
2022-09-07 17:06:42 +09:00
Dean Herbert
99ef0c95fe Simplify children assignment 2022-09-07 16:51:51 +09:00
Dan Balasescu
edabb0dfe6
Merge pull request #20174 from peppy/fix-storyboard-zero-vector-scale
Fix some storyboard sprites still showing with zero `VectorScale`
2022-09-07 16:50:14 +09:00
Dean Herbert
cb1bb99208 Tidy up test logic 2022-09-07 16:43:48 +09:00
Dean Herbert
5b758afd09
Merge branch 'master' into taiko-geki-katu 2022-09-07 16:22:47 +09:00
Dean Herbert
b50116e9e4 Add missing null check in BeatmapCarousel tests 2022-09-07 16:22:11 +09:00
Dean Herbert
5b95fdeb92
Merge pull request #18764 from sw1tchbl4d3r/classic_drumrolls
Make drum rolls and swells optional in taiko
2022-09-07 16:12:56 +09:00
Dean Herbert
824e68dab3 Fix VectorScale set to 0 still showing some sprites in storyboard
This implementation was matching the [framework side implementation of
scale](16d1c2d335/osu.Framework/Graphics/Drawable.cs (L973-L976))
but I don't think it's required here.

I'm still not sure if the framework implementation is correct, but
removing it locally does seem to fix broken storyboard cases.

Closes https://github.com/ppy/osu/issues/20155.
2022-09-07 15:39:19 +09:00