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

44220 Commits

Author SHA1 Message Date
smoogipoo
bf4ca7f489 Merge branch 'master' into fl-skill 2021-09-13 16:09:24 +09:00
Dan Balasescu
f6c4bbe2c9
Merge pull request #14730 from peppy/add-missing-track-adjustment-defaults
Add missing screen level mod application settings for some screens
2021-09-13 15:22:22 +09:00
Dean Herbert
0c646f6dbd
Merge pull request #14694 from nekodex/no-avatar-click-sound
Don't play hover/select sounds for UpdatableAvatar unless it's clickable
2021-09-13 15:14:43 +09:00
Dean Herbert
f9c82a9098
Merge pull request #14676 from nekodex/lobby-team-swap
Add sound for multiplayer team swaps
2021-09-13 15:01:58 +09:00
Dean Herbert
caf7ef6519 Add missing screen level mod application settings for some screens
Closes #7480. But based on discussion in there this solution may change.
2021-09-13 15:00:34 +09:00
Dean Herbert
901a632494
Merge pull request #14723 from bdach/editor-test-scenes-through-loader
Integrate `EditorLoader` into `EditorTestScene`
2021-09-13 14:22:56 +09:00
Dean Herbert
684c39dad0 Update resources 2021-09-13 14:12:37 +09:00
Dean Herbert
7fe0eefb78 Add inline comment regarding team switch sample logic
Feels a bit convoluted without this. Don't really have a better
suggestion for now so a comment will do.
2021-09-13 14:12:19 +09:00
Dean Herbert
65fdceee79
Merge branch 'master' into editor-test-scenes-through-loader 2021-09-13 14:02:55 +09:00
Dan Balasescu
1d4ffe1000
Merge pull request #14637 from rednir/chat-command
Add /chat command
2021-09-13 13:51:50 +09:00
Dan Balasescu
d9b4fae4e5
Merge branch 'master' into chat-command 2021-09-13 13:32:44 +09:00
Dean Herbert
1f8e4d2aac
Merge pull request #14724 from bdach/sample-frequency-setup-screen
Add "samples match playback rate" setting to setup screen
2021-09-13 10:38:08 +09:00
Bartłomiej Dach
5969e2b852
Add TODO comment about lack of in-gameplay support 2021-09-13 00:13:07 +02:00
Dean Herbert
c5da93d82d
Merge pull request #14725 from bdach/fix-colour-coded-notes
Fix mania notes not updating colour coding correctly
2021-09-13 01:49:52 +09:00
Bartłomiej Dach
922fa96d41
Fix notes not updating snap colour on application 2021-09-12 18:18:55 +02:00
Bartłomiej Dach
1edf608260
Add failing test case 2021-09-12 18:17:39 +02:00
Bartłomiej Dach
fdd48c3e71
Refactor note colouring test scene 2021-09-12 17:42:35 +02:00
Bartłomiej Dach
1be8cb452f
Make new beatmaps' samples match playback rate by default 2021-09-12 16:57:21 +02:00
Bartłomiej Dach
345cde251d
Add "samples match playback rate" to editor setup screen 2021-09-12 16:54:17 +02:00
Bartłomiej Dach
af7c2b93e6
Add encoding support for SamplesMatchPlaybackRate 2021-09-12 16:47:38 +02:00
Bartłomiej Dach
cd181452be
Add decoding support for SamplesMatchPlaybackRate 2021-09-12 16:45:27 +02:00
Bartłomiej Dach
925b455330
Add "samples match playback rate" setting to beatmap info 2021-09-12 16:40:52 +02:00
Bartłomiej Dach
eae5d62fa5
Store editor beatmap locally before editor exit 2021-09-12 15:50:41 +02:00
Bartłomiej Dach
22fa9a303e
Expose test helper for switching between difficulties 2021-09-12 13:55:48 +02:00
Bartłomiej Dach
f8a681d810
Delegate Editor{Beatmap,Clock} to Editor directly 2021-09-12 13:40:06 +02:00
Bartłomiej Dach
5ae2f41930
Make difficulty switching test scene use EditorTestScene 2021-09-12 13:26:05 +02:00
Bartłomiej Dach
8357efc74f
Make EditorTestScene go through EditorLoader 2021-09-12 13:26:04 +02:00
Bartłomiej Dach
3467b1f60c
Retouch chat command test slightly 2021-09-12 13:00:52 +02:00
Bartłomiej Dach
c4627bed6d
Print username in case of generic network failure too 2021-09-12 12:56:36 +02:00
rednir
e511c2ef2b
add comment 2021-09-12 08:50:53 +01:00
Dean Herbert
f370cb35e6
Merge pull request #14717 from bdach/fix-weird-beatmap-listing-placeholder-logic
Improve content transitions in beatmap listing
2021-09-12 12:13:14 +09:00
Bartłomiej Dach
b9c127c07e
Improve content transitions in beatmap listing 2021-09-11 22:37:36 +02:00
Davran Dilshat
eeaa8a8380 code quality 2021-09-11 16:47:20 +01:00
Davran Dilshat
605933c467 typo 2021-09-11 16:23:17 +01:00
Davran Dilshat
7924a990a3 add tests for /chat command 2021-09-11 16:22:35 +01:00
Davran Dilshat
1b264a2dd0 make user lookup string public 2021-09-11 16:22:29 +01:00
Davran Dilshat
c166f1a06a change error message based on exception message 2021-09-11 14:18:09 +01:00
Bartłomiej Dach
ebfd5cbe4f
Merge pull request #14699 from peppy/fix-password-popover-back-button
Allow popovers to be closed via back button press
2021-09-11 14:39:21 +02:00
Bartłomiej Dach
addba43e7d
Merge branch 'master' into fix-password-popover-back-button 2021-09-11 14:18:25 +02:00
Bartłomiej Dach
0e5659acb2
Remove leftover exception throw 2021-09-11 14:10:29 +02:00
Dan Balasescu
f40da681cf
Merge pull request #14708 from peppy/fix-triangle-intro-disposed-track
Fix triangles intro attempting to restart track after it is disposed
2021-09-10 20:50:54 +09:00
Dean Herbert
94702ee7e3 Fix triangles intro attempting to restart track after it is disposed 2021-09-10 18:23:00 +09:00
Dean Herbert
5a06954665 Add test coverage of game exit scenario 2021-09-10 18:23:00 +09:00
Dan Balasescu
f4b1d8b9d1
Merge pull request #14704 from peppy/modicon-imod-support
Update `LeaderboardModSelector` to avoid creating mod instances
2021-09-10 16:43:32 +09:00
smoogipoo
aafbc3e0e4 Merge branch 'master' into fl-skill 2021-09-10 16:39:39 +09:00
Davran Dilshat
acb181ff2b rename alreadyJoinedChannel -> privateChannel 2021-09-10 08:15:43 +01:00
rednir
5ec615c783
display user in error message
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-09-10 08:02:15 +01:00
rednir
84c152e7b6
break when already found user
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-09-10 08:01:38 +01:00
Dean Herbert
309460e505
Merge pull request #14675 from ekrctb/featured-artist-markers
Add featured artist markers to beatmap listing and overlay
2021-09-10 14:30:33 +09:00
Jamie Taylor
8d1e43423e
Update calls to use new variable name 2021-09-10 14:18:40 +09:00