1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 19:13:22 +08:00
Commit Graph

49896 Commits

Author SHA1 Message Date
Dean Herbert
812343b410 Merge branch 'master' into new-chat-channel-control 2022-03-21 14:14:02 +09:00
Dean Herbert
355b0fa314 Fix loading player via skin editor still allowing changing current audio track
`PlayerLoader` is required in the sequence to get the game into the
correct state for gameplay right now. Applying ths simplest fix here.

Closes https://github.com/ppy/osu/issues/17351.
2022-03-21 13:49:56 +09:00
Salman Ahmed
6fbeea78dd
Merge pull request #17315 from hwabis/queue-list-counter 2022-03-21 05:28:33 +03:00
Salman Ahmed
5c1e11c153
Merge branch 'master' into queue-list-counter 2022-03-21 05:01:09 +03:00
hwabis
06136b2247 Revert OsuTabItem Text to protected, update tab count test 2022-03-20 21:37:02 -04:00
hwabis
63b6686384 make test name clearer 2022-03-20 16:28:05 -04:00
hwabis
8fbdd06895 add queue tab count test 2022-03-20 16:24:41 -04:00
apollo-dw
d3742a91a8 Nest specific object classes within the mod 2022-03-20 15:56:41 +00:00
apollo-dw
35e2e6a4e7 Remove slider tick judgement flag 2022-03-20 15:41:46 +00:00
Salman Ahmed
b9859f9f21 Obsolete BeatmapInfo.MaxCombo and suppress in usages 2022-03-20 16:30:29 +03:00
Salman Ahmed
6f47f7ffc8 Remove no longer necessary MaxCombo assignment in tests 2022-03-20 16:29:56 +03:00
Salman Ahmed
c2063f415d Remove unnecessary MaxCombo migration between unmapped database fields 2022-03-20 16:27:54 +03:00
Salman Ahmed
aef40da8d4 Add note about null return value 2022-03-20 16:24:30 +03:00
Salman Ahmed
2a78042038 GetBeatmapMaximumComboAsync -> GetMaximumAchievableComboAsync 2022-03-20 16:18:53 +03:00
Salman Ahmed
e1d22e58bf Simplify queue count text logic 2022-03-20 06:25:14 +03:00
Salman Ahmed
7529d6fc00 Bind queue items during playlist initialization
Along with where the other bindables are bound together (only bind, not
listening).
2022-03-20 06:23:44 +03:00
Salman Ahmed
eca7975864 Compute the beatmap maximum achievable combo instead of Beatmap.MaxCombo 2022-03-20 05:38:14 +03:00
Salman Ahmed
d36f32a9c9 Introduce method for computing maximum achievable combo properly 2022-03-20 05:38:14 +03:00
Salman Ahmed
c5cc7eec79 Add explicit todo about removing BeatmapInfo.MaxCombo
Using that property is a trap basically.
2022-03-20 05:38:14 +03:00
apollo-dw
52d6f083dc Only miss slider tail on untrack 2022-03-19 23:42:12 +00:00
Jai Sharma
f3702fbefb Pass correct params to UpdateableAvatar ctor in ChannelListItem 2022-03-19 22:20:17 +00:00
Jai Sharma
ba5a43b526 Rename ControlItem -> ChannelListItem and associated classes 2022-03-19 21:49:14 +00:00
Jai Sharma
653bb47dd5 Use UpdateableAvatar and remove redundant ControlItemAvatar class 2022-03-19 21:36:11 +00:00
Jai Sharma
5373c3066f Use OsuAnimatedButton as base for ControlItemClose 2022-03-19 21:23:32 +00:00
apollo-dw
149cfd338d Use new mod-related object types for Strict Tracking 2022-03-19 18:29:44 +00:00
hwabis
ef823d58a7 address frenzibyte review (refactor bindable flow, clean up CI stuff) 2022-03-19 13:05:35 -04:00
Jai Sharma
a293e0c766 Remove redundant ControlItemText class 2022-03-19 16:44:58 +00:00
Dean Herbert
d681643c38
Merge pull request #17299 from nekodex/arm64
Update download links for macOS builds (to add Apple Silicon)
2022-03-19 20:45:51 +09:00
Dean Herbert
9aa902785c
Merge pull request #17327 from frenzibyte/simplify-extension-methods
Simplify `IncreasesCombo`/`BreaksCombo` helper method implementation
2022-03-19 20:23:09 +09:00
Dean Herbert
acaa3ff21b
Merge pull request #17331 from Sublimelime/make-relax-aimassist-incomp
Make Relax and Aim assist mods incompatible
2022-03-19 20:22:06 +09:00
Dean Herbert
2c5af6265e
Merge pull request #17341 from peppy/fix-spectator-seeks-hot
Fix spectator not starting from current player position (hotfix version)
2022-03-19 20:21:41 +09:00
Bartłomiej Dach
b7d5a628bc
Merge branch 'master' into fix-spectator-seeks-hot 2022-03-19 11:39:01 +01:00
Dean Herbert
89c43d0e07
Merge pull request #17337 from frenzibyte/improve-exit-button-placement
Improve visual behaviour of "hold for menu" to not distract players
2022-03-19 18:18:54 +09:00
Dean Herbert
a903aee17e Use schedule to workaround seek issue instead 2022-03-19 18:00:14 +09:00
Dean Herbert
cf2212e794 Revert "Fix spectator not starting from correct seek point (hotfix)"
This reverts commit 2b59eff465.
2022-03-19 17:20:54 +09:00
Dean Herbert
2b59eff465 Fix spectator not starting from correct seek point (hotfix) 2022-03-19 15:14:25 +09:00
Dean Herbert
63998ad9f1 Add test coverage of SpectatorPlayer failing to seek on inopportune frame arrival time 2022-03-19 15:06:22 +09:00
Dean Herbert
dae5569e36 Use nullable in PlayerLoader 2022-03-19 15:06:22 +09:00
Dean Herbert
da76358ee0 Expose the loading player in PlayerLoader 2022-03-19 15:06:22 +09:00
Salman Ahmed
b99541fb5e Revert "Swap placements of "hold for menu" and key counter"
This reverts commit 5bcb7c167c.
2022-03-19 08:08:07 +03:00
Dean Herbert
e2c0e3bafd
Merge pull request #17322 from frenzibyte/form-bug-report
Add "bug report" GitHub issue form template
2022-03-19 13:54:25 +09:00
Dean Herbert
41ab798bbe
Simplify screenshot/video attach text
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-03-19 12:43:48 +09:00
Dean Herbert
762385d336
Simplify log drag-drop message
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-03-19 12:43:08 +09:00
Dean Herbert
79f6e7cc1c
Simplify wording of description hint
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-03-19 12:42:25 +09:00
hwabis
5d16519a82 make code prettier 2022-03-18 23:41:55 -04:00
Salman Ahmed
ad9b119e3d Reduce "hold for menu" radius of visibility 2022-03-19 05:04:54 +03:00
Salman Ahmed
486be83177 Calculate position adjustment distance in local parent space 2022-03-19 05:04:13 +03:00
Salman Ahmed
5bcb7c167c Swap placements of "hold for menu" and key counter 2022-03-19 05:02:22 +03:00
hwabis
5a5629eb5a (works now) use BindValueChanged to set the Queue text 2022-03-18 20:47:45 -04:00
Salman Ahmed
744cd61643
Apply further minor rewordings
Co-authored-by: Walavouchey <36758269+Walavouchey@users.noreply.github.com>
2022-03-19 03:33:13 +03:00