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

8646 Commits

Author SHA1 Message Date
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
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
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
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
Dan Balasescu
e35cfa2093
Merge branch 'master' into fix-ef-issues 2017-11-23 21:30:54 +09:00
Dan Balasescu
41d289817d
Merge pull request #1576 from peppy/fix-testcasebuttonsystem
Fix TestCaseButtonSystem not working
2017-11-23 21:30:24 +09:00
Dan Balasescu
dd78479a1a
Merge branch 'master' into fix-ef-issues 2017-11-23 21:18:20 +09:00
Dean Herbert
2f3e4a27c6
Merge branch 'master' into improve-user-ratings-calculations 2017-11-23 20:55:55 +09:00
Dean Herbert
4e96c5aea2 Fix TestCaseButtonSystem not working
Was missing an osu! logo
2017-11-23 20:44:49 +09:00
Dean Herbert
9565a9c352 Fix TestCasePlayer not working as expected 2017-11-23 20:42:07 +09:00
Dean Herbert
69a6905c84
Merge pull request #1559 from FreezyLemon/load-optimization
Reduced usage of AsyncLoadWrapper and merging both load wrappers into a new class LoadWrapper
2017-11-23 20:33:59 +09:00
Dean Herbert
9db6ef6657 Fix unfixed regressions 2017-11-23 20:23:47 +09:00
Dean Herbert
6d88396139 Update framework 2017-11-23 20:22:15 +09:00
Dean Herbert
5ea3292dc5 Merge remote-tracking branch 'upstream/master' into load-optimization 2017-11-23 20:21:44 +09:00
Dean Herbert
ccb531e6b6
Merge pull request #1572 from peppy/fix-nullref-on-dispose
Fix nullref on disposing BeatmapSetOverlay before load
2017-11-23 20:18:19 +09:00
Dean Herbert
292b44d896
Merge branch 'master' into fix-nullref-on-dispose 2017-11-23 19:22:23 +09:00
Dan Balasescu
103bf1ddc9
Merge pull request #1568 from peppy/attribute-descriptions
Move TestCase descriptions to attributes
2017-11-23 19:21:45 +09:00
Dean Herbert
52c971cd75 Fix using incorrect Description attribute 2017-11-23 18:58:25 +09:00
Dean Herbert
4ab919263d Merge remote-tracking branch 'upstream/master' into attribute-descriptions 2017-11-23 18:53:22 +09:00
Dean Herbert
4986ad73f7 Merge remote-tracking branch 'upstream/master' into load-optimization 2017-11-23 18:44:17 +09:00
Dean Herbert
92e169eb71
Merge pull request #1523 from EVAST9919/kudosu-section
Add Kudosu Info container in the kudosu section
2017-11-23 18:23:36 +09:00
Dean Herbert
38f5c55f80 Remove not-accessed field 2017-11-23 18:11:35 +09:00
Dean Herbert
d93911ae97 Improve user ratings calculations to make more sense
Closes #1552.
2017-11-23 18:10:08 +09:00
Dean Herbert
30db2ce18a Rename KudosuValue to count and remove pointless local storage 2017-11-23 17:37:02 +09:00
Dean Herbert
cf4fc05be3 Fix nullref on disposing BeatmapSetOverlay before load
Only affects VisualTests
2017-11-23 17:33:46 +09:00
Dean Herbert
6d9951d9af Use FillFlow rather than manually specifying positions 2017-11-23 17:32:41 +09:00