1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 23:47:32 +08:00
Commit Graph

36252 Commits

Author SHA1 Message Date
Dan Balasescu
30f7e4c794
Merge branch 'master' into fix-timeline-parts-working-beatmap 2021-01-25 21:22:45 +09:00
Dan Balasescu
49aa318b1b
Merge pull request #11503 from peppy/revert-beatmap-controlpointinfo-cloning
Revert forced cloning of ControlPointInfo
2021-01-25 21:14:21 +09:00
Dan Balasescu
232cf7b712
Merge pull request #11597 from peppy/fix-desktop-shortcut-woes
Update squirrel to fix incorrect desktop icon creation on install
2021-01-25 19:45:36 +09:00
Dean Herbert
439f03e3b3 Fix failing test due to missing dependency 2021-01-25 19:25:38 +09:00
Dean Herbert
f3061a8e83 Update squirrel to fix incorrect desktop icon creation on install 2021-01-25 18:47:41 +09:00
Dean Herbert
b489e92c9e Fix TimelineParts not using correct beatmap 2021-01-25 18:44:36 +09:00
Dean Herbert
4ac362ee1a Move cloning local to editor 2021-01-25 18:29:00 +09:00
Dean Herbert
f054b38105 Merge branch 'master' into revert-beatmap-controlpointinfo-cloning 2021-01-25 18:25:53 +09:00
Dan Balasescu
803ada42ea
Merge pull request #11595 from peppy/leaderboard-bind-handlers-later
Bind MultiplayerGameplayLeaderboard to player updates later in load process
2021-01-25 18:18:54 +09:00
Dan Balasescu
c0ea610e2e
Merge pull request #11594 from peppy/fix-mod-select-appear-animation
Fix mod select footer not animating correctly on first reveal
2021-01-25 18:16:37 +09:00
Dean Herbert
6f9d65d08b
Merge pull request #11577 from bdach/ongoing-tracker-disposal
Make ongoing operation tracker disposals idempotent
2021-01-25 17:48:37 +09:00
Dean Herbert
91ce3df3a9 Bind MultiplayerGameplayLeaderboard to player updates later in load process 2021-01-25 17:44:01 +09:00
Dean Herbert
10e8b7082e Rework logic to avoid custom disposal early return handling 2021-01-25 16:53:58 +09:00
Dean Herbert
366f074f86 Better describe test steps to discern on failures 2021-01-25 16:53:39 +09:00
Dean Herbert
2db0da6e94
Merge branch 'master' into ongoing-tracker-disposal 2021-01-25 16:22:36 +09:00
Dean Herbert
704c76ba04
Merge pull request #11576 from yhsphd/tournament-schedule-starting-started
Fix tense mismatch in tournament schedule view
2021-01-25 16:01:07 +09:00
Dean Herbert
bb8113fb51 Fix mod select footer not animating correctly on first reveal 2021-01-25 14:47:47 +09:00
Dean Herbert
226d128d0f
Merge pull request #11364 from Firmatorenio/apply-sv-to-taiko-hr-ez
Add SV multipliers to taiko difficulty mods
2021-01-25 14:33:26 +09:00
Dean Herbert
dee0d3c33a
Merge branch 'master' into apply-sv-to-taiko-hr-ez 2021-01-25 14:28:06 +09:00
Bartłomiej Dach
a8fa09103c Update match start text prefix in real time 2021-01-23 17:16:13 +01:00
Bartłomiej Dach
899942611f Add tests for time display 2021-01-23 17:01:47 +01:00
yhsphd
c30b700b3a "started" for past matches
fixes grammar error at 'coming up next' section in schedule screen which displays schedule like "starting an hour ago" for past matches
2021-01-24 00:26:52 +09:00
Bartłomiej Dach
d22f557a3b Remove possibility of double-disposal interference 2021-01-23 16:14:58 +01:00
Bartłomiej Dach
7f89d9117d Make disposal of tracker idempotent for operations 2021-01-23 16:04:12 +01:00
Bartłomiej Dach
18b309a195 Make disposal of tracker operation idempotent 2021-01-23 16:02:51 +01:00
Bartłomiej Dach
adcef19ab2 Add coverage for operation tracker with failing tests 2021-01-23 15:59:14 +01: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