1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 16:27:26 +08:00
Commit Graph

51975 Commits

Author SHA1 Message Date
Dan Balasescu
0ca56835b0
Merge pull request #18208 from Lawtrohux/stamina-merge
Rewrite of the Stamina Skill within osu!taiko
2022-05-23 15:38:15 +09:00
Dean Herbert
87947c6ef0
Merge pull request #18340 from smoogipoo/hp-ratio-improvements
Adjust HP drain and recoveries to closer match osu-stable
2022-05-23 15:19:42 +09:00
Dan Balasescu
54e35e7316
Merge pull request #18364 from peppy/fix-tournament-user-population
Fix tournament user stat population potentially using wrong ruleset
2022-05-23 15:03:54 +09:00
Dan Balasescu
6cfe35360a Refactor key indexing 2022-05-23 14:36:06 +09:00
Dan Balasescu
63a3829768 Split out SingleKeyStamina class 2022-05-23 14:19:25 +09:00
Dean Herbert
afbb1fa750 Fix tournament user stat population potentially using wrong ruleset
`OsuGameBase.Ruleset` is bound
[late](7d0470794b/osu.Game.Tournament/TournamentGameBase.cs (L169))
so we must use the ladder one during user retrieval.

Closes https://github.com/ppy/osu/issues/18363.
2022-05-23 14:07:11 +09:00
Dan Balasescu
7d0470794b
Merge pull request #18353 from frenzibyte/spectator-catch-up-work-alt
Disallow multi-spectator player clocks from being started/stopped externally
2022-05-23 13:59:54 +09:00
Dan Balasescu
e3c1c78b17
Merge pull request #18348 from maromalo/mod-key-multiplayer
Add toggle mod hotkey support in multiplayer room
2022-05-23 13:45:02 +09:00
Dan Balasescu
f111d33b25
Merge pull request #18339 from peppy/editor-timing
Add first pieces of editor timing UI
2022-05-23 11:12:22 +09:00
Bartłomiej Dach
9308d0b012
Merge branch 'master' into mod-key-multiplayer 2022-05-22 19:30:10 +02:00
Bartłomiej Dach
0bef2ca752
Adjust test slightly
* Import `osuTK.Input` instead of using full qualified name
* Use some more straightforward assertions
2022-05-22 19:27:20 +02:00
Dean Herbert
9c3d0dafbd Remove implementation at Player level
Turns out this isn't required in the end due to implementation at
`MasterGameplayClockContainer`.
2022-05-23 02:00:21 +09:00
Dean Herbert
267bef959f
Remove unnecessary cache type specification
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-05-23 02:00:04 +09:00
Dean Herbert
c9ea87e6be Revert easing for now 2022-05-23 00:03:42 +09:00
Dean Herbert
007582afb9 Remove unused usings resulting from namespace move 2022-05-22 23:55:33 +09:00
Dean Herbert
3a7233bd6e Move interface to more appropriate namespace 2022-05-22 22:49:24 +09:00
Dean Herbert
eabf578282 Use interface to convey beat sync information 2022-05-22 22:44:54 +09:00
Dean Herbert
d84119ac06
Merge pull request #18343 from frenzibyte/waveform-test-beatmap-failure
Fix `WaveformTestBeatmap`s potentially providing disposed track
2022-05-22 21:21:28 +09:00
maromalo
fc25d248ad Test coverage + no virtual 2022-05-21 18:16:29 -03:00
Dean Herbert
8f20e9c04c
Merge pull request #18356 from bdach/fix-sheared-button-borders
Fix appearance of sheared button borders after click
2022-05-22 04:25:15 +09:00
Bartłomiej Dach
21e1576b2f
Fix appearance of sheared button borders after click
The border would previously get brighter after click, but then dim
instantly when the flash layer has fully faded out. The underlying issue
there is https://github.com/ppy/osu-framework/issues/5191, but
`ShearedButton` was placing the flashing layer incorrectly anyway, as
the intent was that it should also apply to the border.
2022-05-21 20:53:23 +02:00
Jai Sharma
efae934e01 Fix slow loading channel test 2022-05-21 17:35:31 +01:00
Jai Sharma
fb06b7658b Merge branch 'master' into new-chat-remove-selector-item 2022-05-21 17:30:06 +01:00
Salman Ahmed
27da293b40 Make catch-up spectator clocks running state immutable externally 2022-05-21 17:12:04 +03:00
Salman Ahmed
d73afcaf48 Fix existing test coverage false-passing
Also improves general test coverage to test more realisticly, in order
to produce accurate results.
2022-05-21 17:12:04 +03:00
Salman Ahmed
a17eed64f9 Use Track to ensure its loaded before transferring 2022-05-21 16:52:16 +03:00
Salman Ahmed
a42f5ea34e Bring back virtual track condition given its cheapness
Will still keep the override in `ClockBackedTestWorkingBeatmap` because
it still relies on a local track store and will fail the moment it uses
a non-virtual track.
2022-05-21 16:51:56 +03:00
Salman Ahmed
466ed3c791
Fix wrong return xmldoc
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-05-21 16:43:31 +03:00
Dean Herbert
9a780bcad3 Remove unused using 2022-05-21 21:56:05 +09:00
Dean Herbert
376549ce09 Use ToLocalisableString instead of CurrentCulture 2022-05-21 21:48:51 +09:00
maromalo
2bd4c126d3 Blank line
Forgot to save.
2022-05-21 05:07:24 -03:00
maromalo
a7aa36a825 Add OnPressed to button 2022-05-21 04:55:42 -03:00
Dan Balasescu
6994b8d392
Merge pull request #18347 from peppy/update-framework
Update framework
2022-05-21 16:19:01 +09:00
Dean Herbert
c587d10cc3 Revert storage workaround 2022-05-21 15:55:07 +09:00
Dean Herbert
ba21556d4e Update framework 2022-05-21 15:54:43 +09:00
Dean Herbert
fa1d267b10 Merge branch 'safe-file-writes' into update-framework 2022-05-21 15:17:52 +09:00
Dean Herbert
982856a8b2 Merge branch 'localisable-filter-items' into update-framework 2022-05-21 15:17:51 +09:00
Dean Herbert
72386d9377 Fix incorrect storage being used in CreateFileSafely implementation 2022-05-21 15:17:10 +09:00
Dean Herbert
2f69c099cd Merge branch 'master' into safe-file-writes 2022-05-21 15:16:20 +09:00
Dean Herbert
5bf17dde9f Fix missing MutatePath calls 2022-05-21 14:43:35 +09:00
Dean Herbert
d3f115bfe2 Remove redundant qualifiers 2022-05-21 13:53:58 +09:00
Dean Herbert
98e5bbd4f9
Merge pull request #18345 from frenzibyte/bpm-display-rounding-fix
Fix song select potentially displaying BPM range with equal min/max values
2022-05-21 13:51:51 +09:00
Salman Ahmed
1f17652c1d Fix test failure due to async-loading of content 2022-05-20 19:08:41 +03:00
Dean Herbert
7dcb88759a Remove unnecessary using statement 2022-05-21 00:28:17 +09:00
Salman Ahmed
84a3cee452 Apply rate multiplier outside BPM rounding 2022-05-20 18:04:12 +03:00
Dean Herbert
4633eed78c Merge branch 'master' into localisable-filter-items 2022-05-20 23:55:16 +09:00
Salman Ahmed
596853da8f Fix song select potentially displaying BPM range with equal min/max values 2022-05-20 17:53:28 +03:00
Salman Ahmed
de8aedf348 Add failing test case 2022-05-20 17:53:28 +03:00
Dean Herbert
2b3ec53fed Merge branch 'safe-file-writes' into localisable-filter-items 2022-05-20 23:51:24 +09:00
Dean Herbert
a2950d9d4e Update framework 2022-05-20 23:49:03 +09:00