8092d70402
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
2018-06-11 20:17:33 +09:00
41452a0754
Merge branch 'master' into multiple_previews_different_overlays
2018-06-11 18:56:50 +09:00
7de8e1cfc4
Merge branch 'master' into refactor-api
2018-06-11 18:49:15 +09:00
3981f56157
Merge branch 'master' into exponential-scoring-toggle
2018-06-11 18:34:55 +09:00
78daf1c7ad
Merge branch 'master' into exponential-scoring-toggle
2018-06-11 18:19:33 +09:00
b9391b3c6b
Fix bindable not working under non-debug due to weak references
2018-06-11 18:18:24 +09:00
9994c69d58
Merge branch 'master' into fix-object-ordering
2018-06-11 17:53:33 +09:00
b51e714ae5
Fix xmldoc
2018-06-11 15:44:59 +09:00
563a2667d3
Merge branch 'ruleset-configs' into mania-playfield-inversions
2018-06-11 15:08:48 +09:00
14b7530994
Use a global ruleset config cache
2018-06-11 15:07:42 +09:00
be01dbae3a
Move ruleset dependency caching to CreateLocalDependencies
...
In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.
2018-06-11 15:07:29 +09:00
f49b7d6e16
Add mania direction to settings
2018-06-11 14:36:19 +09:00
93696fb5e5
Merge branch 'ruleset-configs' into mania-playfield-inversions
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-06-11 13:46:39 +09:00
4fb6a8627e
Merge remote-tracking branch 'origin/master' into mania-playfield-inversions
2018-06-11 13:45:47 +09:00
f4fbf27d42
Give ruleset settings a ruleset-specific config manager
2018-06-11 13:28:50 +09:00
eca016ec6c
Move ruleset config managers to Ruleset
2018-06-11 13:17:08 +09:00
22e8a0bb6e
Make ruleset config manager variants nullable
2018-06-11 13:13:36 +09:00
63ec36b3be
Explicitly handle null settings case + add annotations
2018-06-11 12:57:56 +09:00
b219c17115
Move dependency creation under ctor
2018-06-11 12:57:26 +09:00
fbc0cd6f5f
Split AffectsCombo into IsBonus
2018-06-09 18:14:33 -07:00
86fb9666b2
Rename "Exponential" to "Classic"
2018-06-10 01:45:05 +09:00
cc37a355d2
Add comment about matching stable scoring
...
Also updated equation to be close to what is expected
2018-06-10 01:44:46 +09:00
aaa65c428f
Merge branch 'master' into diffcalc-modtypes
2018-06-09 23:35:17 +09:00
8702a70524
Resolve merge conflicts in DirectOverlay
2018-06-08 21:03:16 +03:00
d3570df64f
Merge pull request #2764 from peppy/update-dependencies
...
Update framework and other packages
2018-06-08 22:07:25 +09:00
a5ddae3f37
Merge pull request #2763 from peppy/revert-update-subtree
...
Revert InputManager UpdateSubTree change
2018-06-08 22:06:55 +09:00
fd4f61fc88
Update framework and other packages
2018-06-08 21:51:43 +09:00
a880e626d8
Use for loop and SetLayoutPosition
2018-06-08 21:20:15 +09:00
1e7bffe5e3
Merge branch 'master' into badge-ordering
2018-06-08 21:13:35 +09:00
9bdb3113ce
Revert "Always update children when ruleset input manager is updated"
...
This reverts commit 4eb7a34944
2018-06-08 21:05:28 +09:00
803598c3d0
Merge remote-tracking branch 'upstream/master' into DrabWeb-beatmap-set-downloader
2018-06-08 20:54:14 +09:00
ecc0f5e575
Use Any() instead of Count()
2018-06-08 20:54:09 +09:00
064e8190be
Add basic documentation
2018-06-08 20:53:58 +09:00
59e5a8556f
Fix volume control adjustment being extreme when precision scrolling
2018-06-08 18:15:03 +09:00
66d28aa9fc
Merge branch 'master' into beatmap-set-downloader
2018-06-08 16:28:25 +09:00
e1bc0fa552
Fix csproj file ending line
2018-06-08 15:59:59 +09:00
a775d00bd8
Add online fetch support for online IDs
2018-06-08 15:59:45 +09:00
955a78e76d
Remove OnlineBeatmapSetID from BeatmapInfo
...
It should now be retrieved via the linked BeatmapSetInfo
2018-06-08 15:26:27 +09:00
2a48e0e44a
Fix sequential speed change visualiser not working with 0 control points
2018-06-08 15:11:43 +09:00
e8455dc1e4
Fix incorrect hash usage
2018-06-08 14:38:04 +09:00
21c8ef576c
Expose result for synchronous consumption
2018-06-08 14:37:48 +09:00
b265f02d56
Add comment about scheduled invocation
2018-06-08 14:37:27 +09:00
8220e0c79a
Remove OnlineBeatmapSetID from BeatmapMetadata
2018-06-08 12:46:34 +09:00
d1e9dba4aa
Move beatmap lookup ability to new request
2018-06-08 12:21:12 +09:00
b45354ce97
Add missing header
2018-06-08 12:06:58 +09:00
1716975a37
Move out APIBeatmap
2018-06-08 12:04:33 +09:00
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
0fae49ee21
Don't add a 'with Video' subtitle.
2018-06-07 20:47:27 -03:00
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
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
