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

36226 Commits

Author SHA1 Message Date
Dean Herbert
dee0d3c33a
Merge branch 'master' into apply-sv-to-taiko-hr-ez 2021-01-25 14:28:06 +09:00
Dean Herbert
f2236312a0
Merge pull request #11259 from LittleEndu/scroll-to-20
Change vertical alignment of scroll target when clicking settings category buttons
2021-01-23 05:03:58 +09:00
Bartłomiej Dach
360f26c13d Merge branch 'master' into scroll-to-20 2021-01-22 19:58:36 +01:00
Bartłomiej Dach
f3192877fe Update outdated comment 2021-01-22 19:48:33 +01:00
Bartłomiej Dach
61fcb486a8 Trim unnecessary parentheses 2021-01-22 19:47:38 +01:00
Dan Balasescu
26779a9403
Merge pull request #11567 from peppy/fix-chat-local-echo-effect
Fix local echo messages remaining permanently dimmed when chatting via multiplayer
2021-01-22 21:58:55 +09:00
Dean Herbert
a5f7ca485b Fix unintended xmldoc tag edit 2021-01-22 16:53:31 +09:00
Dean Herbert
bfabb1fdea Change offset value to 10% 2021-01-22 16:50:22 +09:00
Dan Balasescu
6bb270cbdd
Merge pull request #11566 from peppy/limit-parallax-outside-container-area
Limit the effect of parallax when outside the bounds of the ParallaxContainer
2021-01-22 16:33:45 +09:00
Dean Herbert
fca6b15d2f Fix local echo messages remaining permanently dimmed when chatting via multiplayer 2021-01-22 16:05:45 +09:00
Dean Herbert
65b7075984 Limit the effect of parallax when outside the bounds of the ParallaxContainer
This fixes the visual issues that still remain when mouse confining
fails. I think it also feels more correct in general.
2021-01-22 15:43:19 +09:00
Dan Balasescu
a81f4a1ed3
Merge pull request #11560 from EVAST9919/profile-mapping-subscribers
Add mapping subscribers counter to ProfileOverlay
2021-01-22 14:42:11 +09:00
Andrei Zavatski
2eba2a9abf Rename FriendsButton to FollowersButton 2021-01-21 23:40:23 +03:00
Andrei Zavatski
c631354b57 Rename property 2021-01-21 23:39:19 +03:00
Andrei Zavatski
4555b9ff70 Make ProfileHeaderButton height defined 2021-01-21 22:56:12 +03:00
Andrei Zavatski
0a69268567 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-mapping-subscribers 2021-01-21 22:54:08 +03:00
Andrei Zavatski
e87197c7fc Adjust text size 2021-01-21 22:48:31 +03:00
Andrei Zavatski
343166f158 Make CreateIcon a property 2021-01-21 22:47:44 +03:00
Bartłomiej Dach
82848a7d70
Merge pull request #11556 from smoogipoo/fix-potential-mod-test-failures 2021-01-21 20:05:22 +01:00
Andrei Zavatski
a7c22ebe88 Implement MappingSubscribersButton component 2021-01-21 22:02:54 +03:00
Andrei Zavatski
966440f109 Add MappingFollowerCount field to User 2021-01-21 22:02:19 +03:00
Andrei Zavatski
2aa1df9ea4 Implement ProfileHeaderStatisticsButton component 2021-01-21 21:38:52 +03:00
Bartłomiej Dach
281fe6f6f9
Merge branch 'master' into fix-potential-mod-test-failures 2021-01-21 19:30:03 +01:00
Andrei Zavatski
05d3914fee Rename friends tooltip to followers 2021-01-21 21:26:33 +03:00
Dan Balasescu
1ae3f1b9eb
Merge pull request #11557 from peppy/leave-channel-on-exiting-multiplayer
Leave the multiplayer channel when leaving multiplayer
2021-01-21 19:35:12 +09:00
Dan Balasescu
0fa0e70bff
Merge branch 'master' into leave-channel-on-exiting-multiplayer 2021-01-21 19:04:33 +09:00
Dan Balasescu
658370ff38
Merge pull request #11499 from peppy/fix-editor-scroll-interruption
Fix inability to interrupt timeline flick-scrolls by other means
2021-01-21 18:39:11 +09:00
Dan Balasescu
04095cd5b9
Merge branch 'master' into fix-editor-scroll-interruption 2021-01-21 17:46:18 +09:00
Dan Balasescu
9eb74e86ed
Apply comment suggestion
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-01-21 17:40:15 +09:00
Dean Herbert
e6980688f6 Leave the multiplayer channel when leaving multiplayer 2021-01-21 15:42:23 +09:00
Dean Herbert
8853ac04d9 Rename some variable and add xmldoc for scroll centre position 2021-01-21 15:08:36 +09:00
Dean Herbert
c650cbd2a7 Rename variable to something slightly better 2021-01-21 15:01:23 +09:00
Dean Herbert
9daf29fedc Extract out commonly used variables 2021-01-21 15:01:23 +09:00
Dean Herbert
a85f952a38 Inline single use function 2021-01-21 15:01:23 +09:00
Dean Herbert
e5eec27e95 Simplify selected section resolution 2021-01-21 15:01:23 +09:00
Dean Herbert
6d167b7865 Remove the need to store the smallest section 2021-01-21 14:40:55 +09:00
Dean Herbert
555abcdc36 Replace nan usage with nullable float 2021-01-21 14:31:31 +09:00
Dean Herbert
8f9089d1ae Move constant to a better place 2021-01-21 14:30:22 +09:00
Dean Herbert
0fcf61d352 Replace null check with assert 2021-01-21 14:29:49 +09:00
Dean Herbert
a6516e3be5 Merge branch 'master' into scroll-to-20 2021-01-21 14:28:17 +09:00
smoogipoo
54dbb43f79 Fix more potential failures 2021-01-21 14:03:35 +09:00
Dean Herbert
7c4a072568 Merge branch 'master' into scroll-to-20 2021-01-21 13:48:26 +09:00
smoogipoo
163a937e41 Fix mod test failing intermittently 2021-01-21 13:30:53 +09:00
Dan Balasescu
11a9a4c773
Merge pull request #11538 from EVAST9919/beatmapset-refactor
Make BeatmapSetOverlay use OverlayHeader
2021-01-21 13:14:02 +09:00
Dan Balasescu
c3675293fa
Merge branch 'master' into beatmapset-refactor 2021-01-21 12:38:34 +09:00
Dan Balasescu
edf9fe5611
Merge pull request #11553 from bdach/fix-taiko-beatmap-hang
Fix HOC not propagating DHO results applied on kill
2021-01-21 12:18:40 +09:00
Bartłomiej Dach
1d9aaac2c2 Fix HOC not propagating DHO results applied on kill
`DrawableHitObject.OnKilled()` calls `UpdateResult()` to clean up a
hitobject's state definitively with regards to the judgement result
before returning the DHO back to the pool.

As it turns out, if a consumer was relying on this code path (as taiko
was in the case of nested strong hit objects), it would not work
properly with pooling, due to `HitObjectContainer` unsubscribing from
`On{New,Revert}Result` *before* calling the DHO's `OnKilled()`.

This in turn would lead to users potentially getting stuck in gameplay,
due to `ScoreProcessor` not receiving all results via that event path.

To resolve, change the call ordering to allow hit result changes applied
in `OnKilled()` to propagate normally.
2021-01-21 00:05:37 +01:00
Bartłomiej Dach
7abe33ad0e Add failing test case 2021-01-21 00:04:15 +01:00
Dan Balasescu
7da7079ef2
Merge pull request #11537 from Mysfit/mp-initial-creation-screen-fix
Fix match/playlist room screen showing briefly behind initial room settings window on creation.
2021-01-20 22:05:14 +09:00
Dan Balasescu
95f52ae054
Merge pull request #11536 from rednir/sort-skins-alphabetically
Sort SkinSection in alphabetical order
2021-01-20 21:49:31 +09:00