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

29999 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
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
BananeVolante
9e5cc1b7a2 added skin support for the pause loop 2020-06-25 13:26:42 +02: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
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
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
Dan Balasescu
fd9ac3503f
Merge branch 'master' into fix-editor-drag-selection-while-playing 2020-06-23 21:56:31 +09:00
Dean Herbert
92cf2dd3bb
Merge pull request #9352 from smoogipoo/fix-editor-drag-exception
Fix exception when dragging after deleting object
2020-06-23 21:45:58 +09:00
Dean Herbert
9d753a4fc2 Update intro resource locations 2020-06-23 21:34:57 +09:00
Dean Herbert
5cdabbc8bb Update access to FrequencyAmplitudes via span 2020-06-23 21:33:03 +09:00
Dean Herbert
f2735a7797 Use new empty ChannelAmplitudes spec 2020-06-23 21:30:37 +09:00
Dean Herbert
14ad3835ff Update naming 2020-06-23 21:27:01 +09:00
Dean Herbert
61c4ed327c Update framework 2020-06-23 21:26:41 +09:00
smoogipoo
e7238e25f9 Fix exception when dragging after deleting object 2020-06-23 20:36:09 +09:00
BananeVolante
624ad65806 formating 2020-06-23 13:09:24 +02:00
Dan Balasescu
fd16c6ff7b
Merge pull request #9345 from peppy/dont-activate-run-window
Don't activate run tool window on rider run
2020-06-23 19:51:06 +09:00
Dan Balasescu
3b000596ea
Merge pull request #9349 from peppy/alt-f4-immediate-exit
Fix player not exiting immediately on Alt-F4
2020-06-23 19:50:13 +09:00
Dean Herbert
a5eac716ec Make work for all editors based on track running state 2020-06-23 18:42:56 +09:00
Dean Herbert
53d542546e Fix editor drag selection not continuing to select unless the mouse is moved 2020-06-23 18:04:50 +09:00
Dean Herbert
a6c6e391ca Fix player not exiting immediately on Alt-F4 2020-06-23 17:38:30 +09:00
Dean Herbert
49d3511063 Read amplitudes from piano reverb source 2020-06-23 13:55:44 +09:00
Dean Herbert
4554a7db33 Update naming 2020-06-23 13:49:18 +09:00
Dean Herbert
b289beca53 Fix samples being played too early 2020-06-23 13:33:33 +09:00
Dean Herbert
a2a2bf4f78 Don't activate run tool window on rider run 2020-06-23 10:05:28 +09:00
Dean Herbert
4e025d994c
Merge pull request #9339 from ppy/dependabot/nuget/ppy.osu.Game.Resources-2020.622.1
Bump ppy.osu.Game.Resources from 2020.602.0 to 2020.622.1
2020-06-23 09:19:45 +09:00
dependabot-preview[bot]
7a48ab1774
Bump ppy.osu.Game.Resources from 2020.602.0 to 2020.622.1
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2020.602.0 to 2020.622.1.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2020.602.0...2020.622.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-22 17:19:46 +00:00
BananeVolante
579d7cedcc Merge branch 'master' of https://github.com/ppy/osu into Issue#9170
updated local source
2020-06-22 15:29:05 +02:00
BananeVolante
836386d03b removed duplicate lines 2020-06-22 15:22:13 +02:00
Dean Herbert
d340ff7f32
Merge pull request #9337 from smoogipoo/mania-perfect-value
Fix 1M score being possible with only GREATs in mania
2020-06-22 22:21:01 +09:00
Dean Herbert
642e77ab23
Merge branch 'master' into mania-perfect-value 2020-06-22 21:55:56 +09:00
Dean Herbert
0933d44ceb Merge branch 'master' into fallback-intro 2020-06-22 21:36:21 +09:00
Dean Herbert
f60a80b263 Fix animations and general code quality 2020-06-22 21:35:52 +09:00
BananeVolante
9dea96e5fd added pause sound with fading 2020-06-22 14:02:21 +02:00
BananeVolante
a4eb6c81c5 undid changes to the file 2020-06-22 13:40:31 +02:00
Dan Balasescu
412011d4ec
Merge pull request #9186 from power9maker/master
Add cursor rotation on right mouse drag
2020-06-22 20:14:53 +09:00
smoogipoo
4d30761ce3 Fix 1M score being possible with only GREATs in mania 2020-06-22 19:52:23 +09:00
Dan Balasescu
e7e4862517
Merge branch 'master' into master 2020-06-22 19:03:29 +09:00
Dean Herbert
8d3ed05848 Update welcome text sprite location 2020-06-22 17:42:54 +09:00
Dean Herbert
628e05f655 Update resources 2020-06-22 17:09:22 +09:00
Dean Herbert
e3420dfad6
Merge branch 'master' into fallback-intro 2020-06-22 17:09:08 +09:00
Dean Herbert
12c3b086a4
Merge pull request #9051 from MiraiSubject/custom-ipc-location 2020-06-22 17:08:58 +09:00
Dean Herbert
fc31d49629 try-catch registry lookup to avoid crashes on non-windows platforms 2020-06-22 16:34:04 +09:00
Dean Herbert
2d121b4e3d Simplify lookup fallback code 2020-06-22 16:32:27 +09:00
Dean Herbert
1df89c6a59
Merge branch 'master' into custom-ipc-location 2020-06-22 16:22:04 +09:00