Commit Graph

9685 Commits

Author SHA1 Message Date
760f7d02d9 Remove AlwaysPresent (not actually required) 2017-11-27 18:12:52 +09:00
cbd7e1ca0d Update submodules 2017-11-27 18:06:53 +09:00
7877f42763 Merge remote-tracking branch 'upstream/master' into new-sounds-and-more 2017-11-27 17:59:24 +09:00
90e1f16645 Merge pull request #1594 from peppy/global-track-volume-reduction
Add a global reduction of audio track volume
2017-11-27 17:16:21 +09:00
82a9b57277 Removed unnecessary "using" statement 2017-11-27 08:58:09 +01:00
b4513497d6 Added a textContainer reference to MetadataSection so casting is no longer required for setting new text 2017-11-27 08:52:26 +01:00
507da0dfb7 Renamed addTextAsync to setTextAsync 2017-11-27 08:48:47 +01:00
ac0942df86 Removed unnecessary private method to update the metadata 2017-11-27 08:48:12 +01:00
d49ee295d9 Removed unnecessary schedule and null checks 2017-11-27 08:47:36 +01:00
b34e724b8d Changed MetadataSection so that the Text setter loads the new text in async before displaying it. 2017-11-27 08:18:09 +01:00
2dcc3b9e74 Merge branch 'master' into fix-missing-metadata 2017-11-27 12:28:33 +09:00
3e0f282d52 Merge branch 'master' into global-track-volume-reduction 2017-11-27 12:27:01 +09:00
4943df3b08 Merge pull request #1596 from peppy/panel-hover-effect
Add visual highlighting on song select panel hover
2017-11-27 11:32:14 +09:00
00c552dea1 Merge branch 'master' into panel-hover-effect 2017-11-27 11:14:04 +09:00
954bac6b54 Merge pull request #1595 from peppy/local-deploy-fixes
Allow osu.Desktop.Deploy to work without a github token
2017-11-27 11:13:49 +09:00
144a8591ca Merge branch 'master' into local-deploy-fixes 2017-11-27 10:57:57 +09:00
9a4e5d0c6b Merge pull request #1593 from peppy/change-transition-blur-rate
Adjust background blur rate to be snappier
2017-11-27 10:57:41 +09:00
a574b092f6 Merge branch 'master' into change-transition-blur-rate 2017-11-27 10:42:32 +09:00
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
77bfc6037d Merge branch 'master' into fix-stuck-in-play 2017-11-27 10:06:34 +09:00
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
c555867aaf Merge remote-tracking branch 'upstream/master' into panel-hover-effect 2017-11-27 10:01:47 +09:00
f189de437a Simplify blending assignment 2017-11-27 10:01:44 +09:00
98de969b47 Merge branch 'master' into fix-reload-all-panels 2017-11-27 09:56:44 +09:00
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
bb9e399808 Merge branch 'master' into fix-reload-all-panels 2017-11-27 09:50:17 +09:00
55741f3898 Merge branch 'master' into show-converts-toggle 2017-11-27 09:41:30 +09:00
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
3f65c19bce Merge branch 'master' into fix-sprite-icon 2017-11-27 09:32:37 +09:00
70b6071898 add license header 2017-11-26 22:13:52 +01:00
4c68090e59 separate GetUserBeatmapsRequest and GetUserMostPlayedBeatmapsRequest 2017-11-26 22:06:03 +01:00
02fa1f9dd6 move shared stuff between MostPlayedBeatmapDrawable and DrawableScore to DrawableBeatmapRow 2017-11-26 21:52:35 +01:00
69f28df88a Merge branch 'master' of https://github.com/ppy/osu 2017-11-26 20:00:51 +01:00
ae55d392de only use == for comparion on primitive types 2017-11-26 19:37:46 +01:00
ba0b16dc0b setting BeatmapSets as list to prevent endless LINQ query chain 2017-11-26 19:35:58 +01:00
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
ae201f0ef5 R# 2017-11-26 15:03:49 +05:30
671b3d01ff Fix OsuClickableContainer's local content geting overwritten 2017-11-26 17:21:23 +09:00
9c90d9ca45 Add panel hover effects 2017-11-26 17:21:23 +09:00
5aa6615107 Add confirm-selection sound in song select 2017-11-26 17:21:22 +09:00
c5aacb75c6 Add hover sounds to mod buttons 2017-11-26 17:21:22 +09:00
880418fd0d Split out click and hover sound layers 2017-11-26 17:21:22 +09:00
0c6a125777 Remove custom colour handling 2017-11-26 17:21:21 +09:00
ac7e373f40 Add hover/click sound effects to more stuff everywhere 2017-11-26 17:21:21 +09:00
8f57bf2498 Add choices of hover sample sets 2017-11-26 17:17:50 +09:00
8d7c891882 Add hover and click sound effects to settings sidebar buttons 2017-11-26 17:17:49 +09:00
af499df6dd Make a base OsuButton class to handle default samples 2017-11-26 17:17:48 +09:00
ae48b85827 Don't play logo select sample when actions are playing their own 2017-11-26 17:17:47 +09:00
07d6a70028 New sound effects with better names 2017-11-26 17:17:46 +09:00
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