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

36207 Commits

Author SHA1 Message Date
Andrei Zavatski
e9d10bb6e7 Revert "Minor refactoring"
This reverts commit 3d42cc1f91.
2021-01-22 22:49:49 +03:00
Andrei Zavatski
3d42cc1f91 Minor refactoring 2021-01-22 22:27:26 +03:00
Andrei Zavatski
20161aea6a Show LoginOverlay if not logged-in when clicking on a pill 2021-01-22 21:47:53 +03:00
Andrei Zavatski
6379381f95 Make VotePill background transparent for own comments 2021-01-22 20:46:20 +03: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
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
smoogipoo
54dbb43f79 Fix more potential failures 2021-01-21 14:03:35 +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
Dan Balasescu
455383c3c0
Merge pull request #11528 from peppy/fix-autoplay-in-multiplayer
Fix multiplayer mod select showing autoplay as a choice
2021-01-20 21:49:16 +09:00
smoogipoo
bba182a02d Fix test failure 2021-01-20 21:27:16 +09:00
Dan Balasescu
12f2067357
Merge branch 'master' into sort-skins-alphabetically 2021-01-20 21:15:16 +09:00
smoogipoo
eb85efcea2 Add check to playlists too 2021-01-20 20:59:28 +09:00
Dan Balasescu
250727cbd1
Merge branch 'master' into mp-initial-creation-screen-fix 2021-01-20 20:53:33 +09:00
Andrei Zavatski
2ca3ccad06 Move all the content to BeatmapSetHeaderContent drawable 2021-01-20 04:56:46 +03:00
Andrei Zavatski
94fee3800d Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmapset-refactor 2021-01-20 04:32:56 +03:00
Dean Herbert
2fabfe54a0
Merge pull request #11546 from bdach/mark-test-as-abstract
Mark legacy beatmap skin colour test as abstract
2021-01-20 10:03:40 +09:00
Bartłomiej Dach
82e5a5bf6f Mark legacy beatmap skin colour test as abstract 2021-01-19 23:10:15 +01:00
Bartłomiej Dach
fd45d8c95a
Merge pull request #11531 from peppy/less-black-confirm-to-exit 2021-01-19 21:48:58 +01:00
Bartłomiej Dach
ac0835755a
Merge branch 'master' into less-black-confirm-to-exit 2021-01-19 20:50:50 +01:00
Bartłomiej Dach
3b49b7461e Schedule entire operation for safety
Also removes a redundant list copy.
2021-01-19 19:35:53 +01:00
Bartłomiej Dach
78e590d25d Refactor skin sorting method
* Rename to `sortUserSkins` to convey meaning better.
* Sort in-place instead of slicing the list.
* Change to `void` to avoid misleading users that the method returns
  a new list instance.
* Fix typo in comment.
2021-01-19 18:36:42 +01:00
Bartłomiej Dach
b00c6a1d60 Make first non-default skin index a property
The previous code was very brittle - it was not always updating
properly, and seems to have worked either by a carefully crafted set of
circumstances, or just plain coincidence.

Having this be a get-only property avoids potential error in the future
caused by not updating the index properly, at the expense of an added
linear lookup.
2021-01-19 18:31:37 +01:00