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

13065 Commits

Author SHA1 Message Date
Dean Herbert
519200c3d3
Merge pull request #2720 from smoogipoo/diffcalc-modtypes
Add difficulty calculation mod combinations
2018-06-09 23:48:56 +09:00
Dean Herbert
aaa65c428f
Merge branch 'master' into diffcalc-modtypes 2018-06-09 23:35:17 +09:00
Roman Kapustin
8702a70524 Resolve merge conflicts in DirectOverlay 2018-06-08 21:03:16 +03:00
Dean Herbert
d3570df64f
Merge pull request #2764 from peppy/update-dependencies
Update framework and other packages
2018-06-08 22:07:25 +09:00
Dean Herbert
a5ddae3f37
Merge pull request #2763 from peppy/revert-update-subtree
Revert InputManager UpdateSubTree change
2018-06-08 22:06:55 +09:00
Dean Herbert
fd4f61fc88 Update framework and other packages 2018-06-08 21:51:43 +09:00
Dean Herbert
d5c42d74ba
Merge pull request #2607 from jorolf/badge-ordering
Ensure profile badges are ordered correctly
2018-06-08 21:28:36 +09:00
Dean Herbert
a880e626d8 Use for loop and SetLayoutPosition 2018-06-08 21:20:15 +09:00
Dean Herbert
1e7bffe5e3
Merge branch 'master' into badge-ordering 2018-06-08 21:13:35 +09:00
Dean Herbert
9bdb3113ce Revert "Always update children when ruleset input manager is updated"
This reverts commit 4eb7a34944.
2018-06-08 21:05:28 +09:00
Dean Herbert
4e1b801dd8
Merge pull request #2735 from DrabWeb/beatmap-set-downloader
Centralise downloaded beatmap set logic
2018-06-08 21:03:21 +09:00
Dean Herbert
803598c3d0 Merge remote-tracking branch 'upstream/master' into DrabWeb-beatmap-set-downloader 2018-06-08 20:54:14 +09:00
Dean Herbert
ecc0f5e575 Use Any() instead of Count() 2018-06-08 20:54:09 +09:00
Dean Herbert
064e8190be Add basic documentation 2018-06-08 20:53:58 +09:00
Thomas Müller
b287b69476
Merge pull request #2762 from peppy/fix-volume-precise-scroll
Fix volume control adjustment being extreme when precision scrolling
2018-06-08 04:37:19 -07:00
Dean Herbert
59e5a8556f Fix volume control adjustment being extreme when precision scrolling 2018-06-08 18:15:03 +09:00
Dan Balasescu
4dfc328117
Remove unused array 2018-06-08 17:46:38 +09:00
Dean Herbert
66d28aa9fc
Merge branch 'master' into beatmap-set-downloader 2018-06-08 16:28:25 +09:00
Dean Herbert
e1bc0fa552 Fix csproj file ending line 2018-06-08 15:59:59 +09:00
Dean Herbert
a775d00bd8 Add online fetch support for online IDs 2018-06-08 15:59:45 +09:00
Dean Herbert
955a78e76d Remove OnlineBeatmapSetID from BeatmapInfo
It should now be retrieved via the linked BeatmapSetInfo
2018-06-08 15:26:27 +09:00
Dean Herbert
e8455dc1e4 Fix incorrect hash usage 2018-06-08 14:38:04 +09:00
Dean Herbert
21c8ef576c Expose result for synchronous consumption 2018-06-08 14:37:48 +09:00
Dean Herbert
b265f02d56 Add comment about scheduled invocation 2018-06-08 14:37:27 +09:00
Dean Herbert
8220e0c79a Remove OnlineBeatmapSetID from BeatmapMetadata 2018-06-08 12:46:34 +09:00
Dean Herbert
d1e9dba4aa Move beatmap lookup ability to new request 2018-06-08 12:21:12 +09:00
Dean Herbert
b45354ce97 Add missing header 2018-06-08 12:06:58 +09:00
Dean Herbert
1716975a37 Move out APIBeatmap 2018-06-08 12:04:33 +09:00
Dean Herbert
8cc31aca54 Reorganise API requests and response classes
They were previously breaking the two-class-per-file rule.
2018-06-08 11:42:35 +09:00
DrabWeb
0fae49ee21 Don't add a 'with Video' subtitle. 2018-06-07 20:47:27 -03:00
Dean Herbert
0b4f5af52e Add setting to toggle standardised or exponential scoring display
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
Dean Herbert
d5e42a8daa
Merge pull request #2755 from rootyElf/master
Update EntityFramework libraries
2018-06-08 01:30:15 +09:00
rootyElf
8aaaa42c50
Update EntityFramework libraries 2018-06-07 15:51:09 +01:00
rootyElf
95bc312799
Update EntityFramework libraries 2018-06-07 15:48:06 +01:00
rootyElf
b3cab35a2c
Update EntityFramework libraries
Updated Microsoft.EntityFrameworkCore.Sqlite and Microsoft.EntityFrameworkCore.Sqlite.Core to 2.1.0 to enable the app to run on arm linux platforms. This also updates SQLitePCLRaw.lib.e_sqlite3.linux from 1.1.7 to  1.1.11. While 1.1.7 only provides native libraries for linux-x64 and linux-x86, 1.1.11 adds alpine-x64, linux-arm, linux-arm64, linux-armel and linux-musl-x64.
2018-06-07 15:46:31 +01:00
Roman Kapustin
1fdbd20471 Nullref quickfix in PlayButton 2018-06-07 14:50:21 +03:00
Roman Kapustin
ab6699b1fb Stop DirectOverlay preview on search update 2018-06-07 14:40:41 +03:00
Roman Kapustin
3033294df1 Stop Preview on BeatmapSet change 2018-06-07 14:30:11 +03:00
Dean Herbert
2c25e5e8da
Merge branch 'master' into mania-step-interval 2018-06-07 20:26:33 +09:00
Dean Herbert
7614061d44
Merge pull request #2621 from smoogipoo/disallow-beatmap-change
Retrieve bindable beatmap directly using DI
2018-06-07 18:01:22 +09:00
Dean Herbert
475fb06559 Use new bind method 2018-06-07 16:46:54 +09:00
Dean Herbert
e6158bc348 Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change 2018-06-07 16:35:07 +09:00
Dan Balasescu
a2a3f50b25
Merge pull request #2746 from peppy/fix-menu-notifications
Fix notifications not showing at main osu! logo on menu
2018-06-07 15:54:25 +09:00
Dan Balasescu
ef287eaa7f
Merge branch 'master' into fix-menu-notifications 2018-06-07 15:35:30 +09:00
Dean Herbert
f3c9049660
Merge branch 'master' into disallow-beatmap-change 2018-06-07 15:34:19 +09:00
Dean Herbert
3039eae0c7
Merge pull request #2753 from peppy/no-more-mono
Remove net471 build configurations
2018-06-07 15:33:11 +09:00
Dean Herbert
ecef93eab2
Merge pull request #2748 from peppy/mania-colours
osu!mania visual improvements
2018-06-07 15:32:59 +09:00
Dan Balasescu
2ad8f6b010
Merge branch 'master' into mania-colours 2018-06-07 15:21:28 +09:00
Dean Herbert
7a451bc8ef
Merge branch 'master' into no-more-mono 2018-06-07 15:18:16 +09:00
Dean Herbert
feb75eecbf
Merge pull request #2655 from smoogipoo/remove-decoder-offset
Apply platform universal offset in Player
2018-06-07 15:17:45 +09:00