Commit Graph

8664 Commits

Author SHA1 Message Date
2dcc3b9e74 Merge branch 'master' into fix-missing-metadata 2017-11-27 12:28:33 +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
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
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
22075ac7c9 Ensure deploy script can work without a github token 2017-11-26 17:09:46 +09:00
7cdb830530 Fix broken app.config default 2017-11-26 17:09:42 +09:00
69e388dd52 Adjust background blur rate 2017-11-26 17:08:14 +09:00
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
5da1466e28 requested changes
use IEquatable<T> instead of overriding Equals and `==` operator for primitive types.
2017-11-25 15:05:59 +01:00
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
d955229ee5 Handle user rating metrics when no maps by using more linq. 2017-11-25 21:29:23 +08:00
09facdc838 Add a setting to toggle showing converted beatmaps 2017-11-24 18:34:20 +09:00
d6ac724f10 Merge branch 'master' into fix-sprite-icon 2017-11-24 13:41:23 +09:00
b3279082e2 Merge pull request #1575 from peppy/fix-player-testcases
Fix TestCasePlayer not working as expected
2017-11-24 13:30:40 +09:00
3d8432aecf Merge branch 'master' into fix-player-testcases 2017-11-24 13:23:42 +09:00
7ff39d62a1 Fix SpriteIcon potentially not updating texture during a load race condition
Better fix for #1577.
2017-11-24 12:48:02 +09:00
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
76d583c1f2 Merge branch 'master' into improve-user-ratings-calculations 2017-11-24 12:11:51 +09:00
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
11d406aa0c Fix osu!catch conversion expecting full positional data, rather than just X.
Closes #1367.
2017-11-24 11:49:10 +09:00
e3a230320a compare metdata and remove duplicate from beatmap to prevent redundant storage 2017-11-23 19:46:58 +01:00
95fbe6a4a2 Update framework 2017-11-23 23:43:27 +09:00
c7a5a7cd93 Merge remote-tracking branch 'upstream/master' into fix-player-testcases 2017-11-23 23:42:19 +09:00
6ddefa5f8c Merge branch 'master' into improve-user-ratings-calculations 2017-11-23 23:33:05 +09:00
dbb03bcff2 Handle the case where a map hasn't been rated yet 2017-11-23 23:30:57 +09:00
2bd425d64f Merge remote-tracking branch 'upstream/master' into improve-user-ratings-calculations 2017-11-23 23:29:44 +09:00
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
e35cfa2093 Merge branch 'master' into fix-ef-issues 2017-11-23 21:30:54 +09:00
41d289817d Merge pull request #1576 from peppy/fix-testcasebuttonsystem
Fix TestCaseButtonSystem not working
2017-11-23 21:30:24 +09:00
dd78479a1a Merge branch 'master' into fix-ef-issues 2017-11-23 21:18:20 +09:00
2f3e4a27c6 Merge branch 'master' into improve-user-ratings-calculations 2017-11-23 20:55:55 +09:00
4e96c5aea2 Fix TestCaseButtonSystem not working
Was missing an osu! logo
2017-11-23 20:44:49 +09:00