1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 01:45:35 +08:00
Commit Graph

19041 Commits

Author SHA1 Message Date
HoLLy
802da225d4 Move responsibility for selecting paths to model managers 2019-06-21 17:32:47 +02:00
HoLLy
f1f03dd541 Remove async from Import method 2019-06-21 17:01:11 +02:00
HoLLy
99f1a94797 Fix notification progress bar 2019-06-19 20:50:50 +02:00
HoLLy
c1c19243cd Change FirstOrDefault back to First 2019-06-19 20:40:30 +02:00
HoLLy
8d62ce8967 Remove now unneeded check against file extension 2019-06-19 20:38:43 +02:00
HoLLy
0cb66d522a Check if path can be imported before trying 2019-06-19 20:36:00 +02:00
HoLLy
ef2e93d5c7 Improve handling of null models when importing 2019-06-19 19:29:47 +02:00
HoLLy
15c75b4442 Add basic score import from stable 2019-06-19 18:33:51 +02:00
Dean Herbert
82515a52fe
Fix audio being dimmed during multiplayer (#5041)
Fix audio being dimmed during multiplayer

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-19 14:45:51 +09:00
Dean Herbert
3043f42eb5
Merge branch 'master' into fix-multiplayer-audio 2019-06-19 14:36:05 +09:00
Dan Balasescu
0895a01172
Merge pull request #5064 from peppy/fix-main-menu-nullref
Fix startup crash if main menu does not load fast enough
2019-06-19 14:17:00 +09:00
Dean Herbert
b51aad7433
Merge branch 'master' into fix-multiplayer-audio 2019-06-19 13:36:25 +09:00
Dean Herbert
f26fe53feb Fix startup crash if main menu does not load fast enough 2019-06-19 13:16:19 +09:00
Dean Herbert
6426983de0 Move logic out of update (and simplify, hopefully) 2019-06-19 13:15:58 +09:00
Dean Herbert
fbd9ebf02d
Merge pull request #5054 from peppy/settings-item-unbind-previous-bindable
Unbind from previous bindable when rebinding a SettingsItem
2019-06-19 13:09:19 +09:00
Dean Herbert
262129b96b
Remove unused property from chat message (#5053)
Remove unused property from chat message

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-19 13:09:04 +09:00
Dan Balasescu
aef29e2767
Merge branch 'master' into remote-unused-property 2019-06-19 11:18:12 +09:00
Dean Herbert
d0d2be0aca
Merge pull request #5059 from iiSaLMaN/update-framework
Update framework
2019-06-19 06:27:13 +09:00
KingLuigi4932
a5adc89839 Update framework 2019-06-18 20:37:56 +03:00
Dean Herbert
f15df51514
Remove test which is failing due to magic numbers (#5055)
Remove test which is failing due to magic numbers
2019-06-18 20:19:00 +09:00
Dean Herbert
2d20c088f7 Remove test which is failing due to magic numbers 2019-06-18 18:31:42 +09:00
Dan Balasescu
9776494c63
Merge pull request #5052 from peppy/make-osu-button-instantiable
Make OsuButton non-abstract again
2019-06-18 18:29:35 +09:00
Dean Herbert
6823ba1ab0 Unbind from previous bindable when rebinding a SettingsItem 2019-06-18 14:24:44 +09:00
Dean Herbert
5bb8649f3b Remove unused property from chat message 2019-06-18 14:22:59 +09:00
Dean Herbert
07ea0f9755 Make OsuButton non-abstract again 2019-06-18 14:16:54 +09:00
Dean Herbert
0d4c6d2cbc
Fade volume when game window becomes inactive (#5047)
Fade volume when game window becomes inactive

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-17 23:58:03 +09:00
Lucas A
04dc1c1744
Fix typo in comment
Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>
2019-06-17 16:44:53 +02:00
Dean Herbert
3a04684efb Add region 2019-06-17 23:25:16 +09:00
Dean Herbert
ad4c9babe7 Adjust naming and transitions 2019-06-17 23:24:52 +09:00
Lucas A
d7d6feb001 Fade volume in / out when game window becomes active / inactive 2019-06-17 12:31:23 +02:00
Dean Herbert
b940255972
Fix typo in VersionNavigation class name (#5044)
Fix typo in VersionNavigation class name
2019-06-17 16:59:07 +09:00
Dean Herbert
84a0b948e1 Fix typo in VersionNavigation class name 2019-06-17 16:32:38 +09:00
smoogipoo
c1d2fff651 Use RestartPoint 2019-06-17 12:44:19 +09:00
smoogipoo
bc35a30a25 Fix audio being dimmed during multiplayer 2019-06-17 12:27:53 +09:00
Dan Balasescu
d5a7b839ee
Merge pull request #5035 from HoLLy-HaCKeR/ctb-autoplay-2b-crashfix
Catch autoplay improvements
2019-06-17 10:16:24 +09:00
Dan Balasescu
eddf31226a
Merge branch 'master' into ctb-autoplay-2b-crashfix 2019-06-17 10:05:39 +09:00
Dean Herbert
1916fdd247
Add comment specifically about infinity being ok 2019-06-16 05:57:52 +09:00
HoLLy
53a7d919c7
Clarify speedRequired 2019-06-15 22:41:10 +02:00
Dean Herbert
b7dfd90663
Fix editor play button being sized incorrectly (#5037)
Fix editor play button being sized incorrectly
2019-06-16 05:06:20 +09:00
Joehu
1a9efb3d7a Fix editor play button 2019-06-15 11:05:58 -07:00
HoLLy
c723ec5a9d Remove unneeded checks against h.StartTime 2019-06-15 19:40:56 +02:00
HoLLy
4d690a2b14 Use normal movement for bananas when possible 2019-06-15 19:21:00 +02:00
HoLLy
f97cab5815 Prevent speedRequired from being NaN 2019-06-15 19:14:24 +02:00
HoLLy
d735d4cd7f Fix crash on 2B hitobjects 2019-06-15 19:11:29 +02:00
Dean Herbert
c4899d90ad
Fix multiplayer score submission failing silently (#5034)
Fix multiplayer score submission failing silently
2019-06-16 00:41:54 +09:00
smoogipoo
d693b2a329 Fix multiplayer score submission failing silently 2019-06-16 00:31:14 +09:00
Dan Balasescu
c46ddb5a5d
Merge pull request #5031 from peppy/update-framework
Update framework
2019-06-15 19:56:22 +09:00
Dean Herbert
d7bea3aa18 Update framework 2019-06-15 19:38:05 +09:00
Dean Herbert
6fc5aa73b2
Fix BeatmapSetOverlay not displaying Fails/Retries/Ratings (#5016)
Fix BeatmapSetOverlay not displaying Fails/Retries/Ratings

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-15 18:46:01 +09:00
Dean Herbert
38616a2bb5
Merge branch 'master' into fix-beatmapoverlay-graphs 2019-06-15 18:37:01 +09:00