1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 10:42:54 +08:00
Commit Graph

8886 Commits

Author SHA1 Message Date
Dan Balasescu
a574b092f6
Merge branch 'master' into change-transition-blur-rate 2017-11-27 10:42:32 +09:00
Dan Balasescu
42e13ae7a1
Merge pull request #1590 from Aergwyn/fix-stuck-in-play
Fix being stuck in gameplay if exit is pressed too fast
2017-11-27 10:42:18 +09:00
Dan Balasescu
77bfc6037d
Merge branch 'master' into fix-stuck-in-play 2017-11-27 10:06:34 +09:00
Dan Balasescu
d20277f734
Merge pull request #1589 from Aergwyn/fix-reload-all-panels
Fix osu!direct download reloading all panels
2017-11-27 10:06:21 +09:00
Dean Herbert
c555867aaf Merge remote-tracking branch 'upstream/master' into panel-hover-effect 2017-11-27 10:01:47 +09:00
Dean Herbert
f189de437a Simplify blending assignment 2017-11-27 10:01:44 +09:00
Dan Balasescu
98de969b47
Merge branch 'master' into fix-reload-all-panels 2017-11-27 09:56:44 +09:00
Dan Balasescu
e63fc40e76
Merge pull request #1584 from peppy/show-converts-toggle
Add a setting to toggle showing converted beatmaps
2017-11-27 09:53:05 +09:00
Dan Balasescu
bb9e399808
Merge branch 'master' into fix-reload-all-panels 2017-11-27 09:50:17 +09:00
Dan Balasescu
55741f3898
Merge branch 'master' into show-converts-toggle 2017-11-27 09:41:30 +09:00
Dan Balasescu
d6ba5685cf
Merge pull request #1581 from peppy/fix-sprite-icon
Fix SpriteIcon potentially not updating texture during a load race condition
2017-11-27 09:39:43 +09:00
Dan Balasescu
3f65c19bce
Merge branch 'master' into fix-sprite-icon 2017-11-27 09:32:37 +09:00
Aergwyn
ba0b16dc0b setting BeatmapSets as list to prevent endless LINQ query chain 2017-11-26 19:35:58 +01:00
Dean Herbert
96aafd0ca6
Merge pull request #1588 from huoyaoyuan/no-maps
Fix user rating metrics when no data available
2017-11-27 02:32:03 +09:00
Dean Herbert
671b3d01ff Fix OsuClickableContainer's local content geting overwritten 2017-11-26 17:21:23 +09:00
Dean Herbert
9c90d9ca45 Add panel hover effects 2017-11-26 17:21:23 +09:00
Dean Herbert
5aa6615107 Add confirm-selection sound in song select 2017-11-26 17:21:22 +09:00
Dean Herbert
c5aacb75c6 Add hover sounds to mod buttons 2017-11-26 17:21:22 +09:00
Dean Herbert
880418fd0d Split out click and hover sound layers 2017-11-26 17:21:22 +09:00
Dean Herbert
0c6a125777 Remove custom colour handling 2017-11-26 17:21:21 +09:00
Dean Herbert
ac7e373f40 Add hover/click sound effects to more stuff everywhere 2017-11-26 17:21:21 +09:00
Dean Herbert
8f57bf2498 Add choices of hover sample sets 2017-11-26 17:17:50 +09:00
Dean Herbert
8d7c891882 Add hover and click sound effects to settings sidebar buttons 2017-11-26 17:17:49 +09:00
Dean Herbert
af499df6dd Make a base OsuButton class to handle default samples 2017-11-26 17:17:48 +09:00
Dean Herbert
ae48b85827 Don't play logo select sample when actions are playing their own 2017-11-26 17:17:47 +09:00
Dean Herbert
07d6a70028 New sound effects with better names 2017-11-26 17:17:46 +09:00
Dean Herbert
4067b6129b Add visual highlighting on song select panel hover
Prerequisite for adding hover sound effects. Didn't feel right without this change.
2017-11-26 17:14:13 +09:00
Dean Herbert
22075ac7c9 Ensure deploy script can work without a github token 2017-11-26 17:09:46 +09:00
Dean Herbert
7cdb830530 Fix broken app.config default 2017-11-26 17:09:42 +09:00
Dean Herbert
df16a019ed Add a global reduction of audio track volume
Music is overpowering compared to our current game samples. We will need to do further adjustments on this, but for now let's reduce the track volume globally.
2017-11-26 17:08:58 +09:00
Dean Herbert
69e388dd52 Adjust background blur rate 2017-11-26 17:08:14 +09:00
Unknown
7be55df790 fix being stuck in gameplay if exit is pressed too fast
The reliance on `pauseOverlay.Alpha == 1` created a race condition that, when you pressed Exit while the pauseoverlay is still fading in, could get you stuck in gameplay.
The game wants to show the pause overlay but also thinks it's already paused and returns early.
2017-11-25 19:09:05 +01:00
Unknown
f6a33b3ea2 fix osu!direct download reloading all panels
This fixes the recreation of all panels when a download completes.
Also fixes NullReference when you download without ever opening the details of one Set.
2017-11-25 14:45:57 +01:00
Huo Yaoyuan
d955229ee5 Handle user rating metrics when no maps by using more linq. 2017-11-25 21:29:23 +08:00
Dean Herbert
09facdc838 Add a setting to toggle showing converted beatmaps 2017-11-24 18:34:20 +09:00
Dean Herbert
d6ac724f10
Merge branch 'master' into fix-sprite-icon 2017-11-24 13:41:23 +09:00
Dan Balasescu
b3279082e2
Merge pull request #1575 from peppy/fix-player-testcases
Fix TestCasePlayer not working as expected
2017-11-24 13:30:40 +09:00
smoogipoo
3d8432aecf Merge branch 'master' into fix-player-testcases 2017-11-24 13:23:42 +09:00
Dan Balasescu
a4b67b2559
Fix CI 2017-11-24 12:56:52 +09:00
Dean Herbert
7ff39d62a1 Fix SpriteIcon potentially not updating texture during a load race condition
Better fix for #1577.
2017-11-24 12:48:02 +09:00
Dean Herbert
18e313b8f2
Merge pull request #1573 from peppy/improve-user-ratings-calculations
Improve user ratings calculations to make more sense
2017-11-24 12:46:46 +09:00
Dan Balasescu
76d583c1f2
Merge branch 'master' into improve-user-ratings-calculations 2017-11-24 12:11:51 +09:00
Dan Balasescu
9bfc701e04
Merge pull request #1580 from peppy/fix-catch-conversion
Fix osu!catch conversion expecting full positional data
2017-11-24 12:08:03 +09:00
Dean Herbert
11d406aa0c Fix osu!catch conversion expecting full positional data, rather than just X.
Closes #1367.
2017-11-24 11:49:10 +09:00
Dean Herbert
95fbe6a4a2 Update framework 2017-11-23 23:43:27 +09:00
Dean Herbert
c7a5a7cd93 Merge remote-tracking branch 'upstream/master' into fix-player-testcases 2017-11-23 23:42:19 +09:00
Dean Herbert
6ddefa5f8c
Merge branch 'master' into improve-user-ratings-calculations 2017-11-23 23:33:05 +09:00
Dean Herbert
dbb03bcff2 Handle the case where a map hasn't been rated yet 2017-11-23 23:30:57 +09:00
Dean Herbert
2bd425d64f Merge remote-tracking branch 'upstream/master' into improve-user-ratings-calculations 2017-11-23 23:29:44 +09:00
Dean Herbert
6f3a796ecf
Merge pull request #1569 from peppy/fix-ef-issues
Perform a reload on objects when Refreshing them
2017-11-23 23:26:50 +09:00