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

30179 Commits

Author SHA1 Message Date
BananeVolante
a4bb238c45 fixed bug preventing the pause loop from playing during the first pause after changing a skin 2020-06-26 14:07:27 +02:00
smoogipoo
099416b4c3 Move check inside next difficulty selection 2020-06-26 21:03:34 +09:00
Dan Balasescu
77258659e4
Merge branch 'master' into song-select-key-repeat 2020-06-26 20:33:13 +09:00
smoogipoo
8f6d52550f Fix potential exception if button is pressed before selection 2020-06-26 20:32:13 +09:00
smoogipoo
1b4c31a84f Remove double schedule 2020-06-26 20:14:08 +09:00
smoogipoo
e3d654d33f Cleanup 2020-06-26 20:14:02 +09:00
Dan Balasescu
efd30dfceb
Merge pull request #9340 from bdach/layered-hit-sounds
Add support for layered hit sounds skin option
2020-06-26 19:30:41 +09:00
Dan Balasescu
7a6098bfb7
Merge branch 'master' into layered-hit-sounds 2020-06-26 18:38:32 +09:00
Dan Balasescu
f7301571bb
Merge pull request #9301 from H2n9/storyboard-sample-rate
Implement rate adjustment for storyboard samples
2020-06-26 18:32:25 +09:00
Dan Balasescu
1eaa25e75e
Merge branch 'master' into storyboard-sample-rate 2020-06-26 17:29:38 +09:00
Dean Herbert
d0787ddf99
Merge pull request #9369 from smoogipoo/fix-hyperdash-alpha 2020-06-26 14:46:46 +09:00
BananeVolante
7d2d6a52c9 now uses SkinnableSample instead of Drawable sample
Still does not support switching skins after Pause overlay loading,
there will be no sound for the first pause (works fine the the nexts)

Also, the pause loop seems to play for approximately 1 second when exiting the
screens via restart or quit

finally, since SkinnableSound does not play a sound if its aggregate
volume is at 0, i had turn up the volume a bit before playing the loop
2020-06-25 18:58:04 +02:00
Ronnie Moir
65a2fc3bfc Revert access modifier 2020-06-25 17:53:14 +01:00
Dean Herbert
d704a4597d Use existing helper function for key repeat 2020-06-25 21:33:02 +09:00
BananeVolante
9e5cc1b7a2 added skin support for the pause loop 2020-06-25 13:26:42 +02:00
Dean Herbert
c36d9d4fc3 Add test coverage 2020-06-25 20:01:29 +09:00
Dean Herbert
d7742766d0 Add key/press repeat support to carousel 2020-06-25 19:47:23 +09:00
Dean Herbert
c095753f24 Add better line smoothing 2020-06-25 19:02:04 +09:00
Dean Herbert
b077a2856d Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-25 18:44:08 +09:00
Dean Herbert
fd13c0a6dd Standardise line thickness 2020-06-25 18:44:04 +09:00
smoogipoo
531a69650f Add test 2020-06-25 14:22:40 +09:00
smoogipoo
4ff9a91012 Adjust at parse time instead 2020-06-25 14:15:26 +09:00
Dan Balasescu
41d3de3fab
Merge pull request #9362 from peppy/tournament-test-standardisation
Standardise all tournament tests to use placeholder data
2020-06-25 13:45:34 +09:00
smoogipoo
8b84aa454d Fix incorrect upper bound 2020-06-25 13:43:56 +09:00
smoogipoo
4c601af207 Match condition 2020-06-25 13:43:14 +09:00
smoogipoo
ac5cd8f25a Fix colours with 0 alpha being invisible in legacy skins 2020-06-25 13:40:26 +09:00
Dan Balasescu
053be84eb4
Merge branch 'master' into tournament-test-standardisation 2020-06-25 13:07:39 +09:00
Dean Herbert
d43b1b2441
Merge pull request #9364 from smoogipoo/increase-parse-limit
Increase coordinate parsing limits
2020-06-25 10:48:19 +09:00
Dean Herbert
0a7871f99e
Merge pull request #9363 from vruss/clarify_import_behaviour
Add text explaining a second copy will be made on importing beatmaps
2020-06-25 00:39:39 +09:00
Ronnie Moir
f2a48a339e Remove unused usings 2020-06-24 16:33:19 +01:00
Ronnie Moir
992ada4670 Revert UserPlaybackRate changes 2020-06-24 16:18:46 +01:00
Ronnie Moir
4c28347686 Adjust sample rate by UserPlaybackRate 2020-06-24 15:34:20 +01:00
Dean Herbert
0d3bc1ac29 Add basic heatmap colour scaling based on peak value 2020-06-24 22:29:30 +09:00
BananeVolante
2e8f30461f play/stops music when entering the pause overlay, instead of letting it play silently in the background 2020-06-24 14:22:12 +02:00
BananeVolante
9514a02eeb Merge branch 'master' of https://github.com/ppy/osu into Issue#9170 2020-06-24 14:12:07 +02:00
BananeVolante
53107973a3
merged 2 lines
Co-authored-by: Salman Ahmed <email@iisalman.me>
2020-06-24 14:01:13 +02:00
smoogipoo
6bc507d49e Increase coordinate parsing limits 2020-06-24 18:53:52 +09:00
Viktor Rosvall
9e1bf71233 Added text explaining a second copy will be made 2020-06-24 11:29:38 +02:00
Dean Herbert
9119f41604 Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-24 18:22:51 +09:00
Dean Herbert
5fd6246d1b Fix remaining test scenes 2020-06-24 17:57:07 +09:00
Dean Herbert
eb3e1b2b26 Fix incorrect inheritance on remaining test scene 2020-06-24 17:03:22 +09:00
Dean Herbert
92e272ebb6 Remove unnecessary prefixes 2020-06-24 16:57:40 +09:00
Dean Herbert
1387a9e2c6 Move all tournament tests to using placeholder data rather than reading from bracket 2020-06-24 16:57:17 +09:00
Dan Balasescu
f381cf3ae8
Merge pull request #9173 from MiraiSubject/fallback-intro
Add classic "Welcome" intro
2020-06-24 12:53:51 +09:00
Dean Herbert
ccb27082d5 Fix background appearing too late 2020-06-24 11:08:32 +09:00
Dean Herbert
4244024fc3 Merge branch 'master' into fallback-intro 2020-06-24 10:49:45 +09:00
Bartłomiej Dach
43be75d481
Merge branch 'master' into Issue#9170 2020-06-23 20:49:13 +02:00
Bartłomiej Dach
58ffe8c6b6 Merge branch 'master' into layered-hit-sounds 2020-06-23 19:33:16 +02:00
Dan Balasescu
11446a7864
Merge pull request #9355 from peppy/update-framework
Update framework
2020-06-23 22:27:55 +09:00
Dan Balasescu
64ea56f081
Merge pull request #9350 from peppy/fix-editor-drag-selection-while-playing
Fix editor drag selection not continuing to select unless the mouse is moved
2020-06-23 22:27:46 +09:00