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
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
FreezyLemon
00830c190c
Merge branch 'master' of https://github.com/ppy/osu
2017-11-23 12:39:36 +01: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
FreezyLemon
a60e53c382
Changed the text updates into a scheduled (async) operation, and implemented this in the updateStatistics and clearStats methods
2017-11-23 12:31:18 +01: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
Dean Herbert
2ff21bbc6c
Move descriptions to constructor
2017-11-23 17:29:20 +09:00
Dean Herbert
9d481eba96
Merge branch 'master' into kudosu-section
2017-11-23 17:19:42 +09:00
Dean Herbert
b0b3c9167e
Merge pull request #1506 from naoey/beatmap-overlay-download
...
Make beatmap overlay download buttons work
2017-11-23 17:18:33 +09:00
FreezyLemon
2cc2323791
Style changes (removing newline from before second constructor parameter)
2017-11-23 09:12:23 +01:00
FreezyLemon
d6f532171b
Implementation fix (since the default delay is now 500 and not 0 this is necessary to ensure the same functionality)
2017-11-23 09:11:52 +01:00
Dean Herbert
6e51664544
Merge branch 'master' into beatmap-overlay-download
2017-11-23 17:11:28 +09:00
Dean Herbert
85827f83eb
Perform a reload on objects when Refreshing them
...
Previously, it was possible for an object to be "refreshed" with a stale cached state from the current thread's context.
This ensures a check against the database is performed as well.
Resolves #1562 .
2017-11-23 17:04:39 +09:00
Dean Herbert
1824540325
Schedule calls to correct thread
...
These could be fired from an async worker thread (for instance, maintenance operations).
2017-11-23 17:02:54 +09:00
Dean Herbert
f3a84a01da
Update framework
2017-11-23 16:20:50 +09:00
Dean Herbert
288c21dfec
Move TestCase descriptions to attributes
...
Depends on https://github.com/ppy/osu-framework/pull/1186 .
2017-11-23 16:09:32 +09:00
