h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 04:33:22 +08:00
Code Issues Releases Wiki Activity
12,299 Commits 3 Branches 657 Tags 366 MiB
38e5e35743
Commit Graph

7867 Commits

Author SHA1 Message Date
Dan Balasescu
552e7e314d
Merge branch 'master' into bail-on-invalid-archive 2018-03-22 11:32:38 +09:00
Dean Herbert
101caf3064 Apply same logic fixes to delete/restore all notifications 2018-03-22 11:28:40 +09:00
Dean Herbert
e0b74a357a Fix osu! logo making hover beat sounds when not visible 2018-03-22 03:31:14 +09:00
Dean Herbert
8f71d53c17 Fix retry not allowing continuing beyond PlayerLoader 
Resolves #2265.
 2018-03-22 02:10:31 +09:00
TocoToucan
4991f2ad2e Change filename format 2018-03-21 18:27:08 +03:00
Dean Herbert
62229300c4 Fix DummyRuleset getting selected 
Resolves #2261.
 2018-03-22 00:26:48 +09:00
Dean Herbert
4a93abcc36 Add scale adjusts to bring legacy skins in-line with lazer sizing 2018-03-21 20:07:58 +09:00
Dean Herbert
65b6a2faad Fix mod button sounds playing when mod overlay is not visible 
Resolves #2240.
 2018-03-21 18:41:21 +09:00
Dean Herbert
271c082606 Adjust colour assignment 2018-03-21 16:25:32 +09:00
Dean Herbert
48142602ea Adjust text size to match design 2018-03-21 16:04:43 +09:00
Dean Herbert
63f0419d6a Apply minor fixes 2018-03-21 15:40:43 +09:00
Dean Herbert
f944c29505 Merge remote-tracking branch 'upstream/master' into take_screenshot 2018-03-21 12:32:27 +09:00
Dean Herbert
ccdd11d7b2 Add missing licence header 2018-03-21 12:29:44 +09:00
Dean Herbert
8ac660b0c6 Fixes for keyboard handling and general code quality 2018-03-20 22:25:15 +09:00
Dean Herbert
aa8b0d017c Adjust colours and spacing 2018-03-20 21:59:56 +09:00
Dean Herbert
dac1ba21db Make keyboard control work 2018-03-20 21:38:22 +09:00
Dean Herbert
045610dbfe Adjust styling and colours 2018-03-20 21:31:17 +09:00
Dean Herbert
5a10270a2a
return -> break 
no real reason but whatever works
 2018-03-20 20:32:32 +09:00
Dean Herbert
c2eb32c0e9 DrawableBeatDivisor -> BeatDivisorControl 2018-03-20 20:10:27 +09:00
Dean Herbert
6fd650777c Move value change logic to bindable 
Also add drag support
 2018-03-20 20:09:55 +09:00
Dean Herbert
625e561fc8 Fix whitespace 2018-03-20 18:01:09 +09:00
Dean Herbert
fb3d319d0e Make fallback bool into a function 
Allows correct handling now that beatmap skins are also a thing.
 2018-03-20 16:40:11 +09:00
Dean Herbert
f03abb3145 Add GetTexture method to ISkinSource 
Used to shortcut lookup checks without potentially expensive drawable creation overhead.
 2018-03-20 16:40:11 +09:00
Dean Herbert
9ad4e9284a Add skin source fallback chain 2018-03-20 16:40:11 +09:00
Dean Herbert
fd0391daf7 Merge branch 'accent-colour-properties' 2018-03-20 16:25:22 +09:00
Dean Herbert
d1c2aa71d0 Add beatmap sample override support 2018-03-20 16:24:06 +09:00
Dean Herbert
9a0fc9e29a Move combo colours completely out of beatmap 2018-03-20 16:24:06 +09:00
Dean Herbert
dbcf755618 Make Beatmaps parsable as skins 2018-03-20 16:05:29 +09:00
Dean Herbert
c38c26eacb Move combo index processing to BeatmapProcessor 2018-03-20 15:57:43 +09:00
smoogipoo
786e6242e1 Make bdl beat divisor nullable 2018-03-20 14:01:06 +09:00
smoogipoo
50192b21e3 Give DrawableBeatDivisor a ctor 2018-03-20 13:57:25 +09:00
TocoToucan
ee73bd4568 Update ScreenshotManager inline with framework changes 2018-03-19 22:39:00 +03:00
Dean Herbert
553fd3b789 Give DefaultSkin an empty Configuration 2018-03-19 21:00:27 +09:00
smoogipoo
b1d09500f2 Integrate beat snap divisor into editor seeking 2018-03-19 20:42:06 +09:00
Dean Herbert
f565cc861d Hard bail on attempting to import an invalid archive format 2018-03-19 20:41:12 +09:00
Dean Herbert
994c7bfabd Further improvements to messaging 2018-03-19 20:40:14 +09:00
smoogipoo
c5eab7a227 Actually rename to DrawableBeatDivisor... 2018-03-19 20:34:24 +09:00
smoogipoo
5ecbc5612c Integrate with dependency injection 2018-03-19 20:33:58 +09:00
Dean Herbert
b71c123214 Allow import of skins which don't have ini files 2018-03-19 20:26:16 +09:00
smoogipoo
4c0ccffe08 Merge remote-tracking branch 'origin/master' into beat-snap-divisor 2018-03-19 20:23:15 +09:00
smoogipoo
df0b8a24c5 Rename + renamespace 2018-03-19 20:21:19 +09:00
smoogipoo
879dbc75b5 Nest TickContainer in BeatSnapVisualiser 2018-03-19 20:20:29 +09:00
Dean Herbert
18368d2446 Make import notifications fail when any imports fail 2018-03-19 20:18:23 +09:00
smoogipoo
b25c564ecb Integrate into editor's compose screen 2018-03-19 20:14:58 +09:00
smoogipoo
32fecc6ff4 Adjust icon scale + text 2018-03-19 20:14:34 +09:00
smoogipoo
e96dad441d Offset the icon buttons a little bit to look a bit more centered 
Maybe it's just me, but this is really triggering me.
 2018-03-19 20:14:13 +09:00
Dean Herbert
7272ba2f1b Add migration for skins which didn't get a proper name assigned 
Also correctly imports new skins
 2018-03-19 20:06:44 +09:00
Dean Herbert
ec851648da Add better ToString output from SkinInfo 2018-03-19 20:06:44 +09:00
Dean Herbert
397b06283a Add basic skin configuration decoding support 2018-03-19 20:06:44 +09:00
Dean Herbert
8e52d91180 Handle missing files without hard failure 
Also adds support for lookups with file extensions
 2018-03-19 20:06:44 +09:00
Dean Herbert
62e908e22c Add default separator character 2018-03-19 20:06:44 +09:00
Dean Herbert
c4f5b46d72 Add basic structure for skin configurations 2018-03-19 20:06:44 +09:00
smoogipoo
c86ddb7ee3 Add slight easing to marker movements 2018-03-19 19:57:02 +09:00
smoogipoo
fbc92bfa01 Add previous/next divisor button actions 2018-03-19 19:55:49 +09:00
smoogipoo
070db63157 Privatise tick to TickContainer 2018-03-19 19:52:22 +09:00
smoogipoo
7182442b21 Add divisor text 2018-03-19 19:49:57 +09:00
smoogipoo
6b035e8c53 Add basic structure/layout for the beat snap visualiser 2018-03-19 19:46:26 +09:00
Dean Herbert
4b812279bb
Merge branch 'master' into fix-editor-clocks 2018-03-19 19:06:38 +09:00
smoogipoo
8d4c9eda48 Fix attempting to add selection boxes with no selection 
E.g. because DrawableSpinner doesn't (currently) create an overlay, SelectionBox was being constructed with 0 hitobjects and then calculating a non-finite size for itself.
 2018-03-19 18:00:11 +09:00
smoogipoo
e25d1f6982 Pass down editor clocks through DI 2018-03-19 16:27:52 +09:00
TocoToucan
245200d3ee Add simple screenshot notification 2018-03-16 21:25:00 +03:00
TocoToucan
8429408974 Change screenshot file name 2018-03-16 21:05:25 +03:00
TocoToucan
604e725f3f Remove redundant code 2018-03-16 20:42:05 +03:00
Dean Herbert
4b83278cf4
Merge branch 'master' into fix-editor-clocks 2018-03-16 23:32:54 +09:00
smoogipoo
6f7163769d Adjust comment for readability 2018-03-16 19:57:14 +09:00
Dean Herbert
e8f7f2c8ab
Merge branch 'master' into editor-wheel-movement 2018-03-16 18:19:42 +09:00
Dean Herbert
4411758ff7
Merge branch 'master' into fix-autoplay-button-deselect 2018-03-16 17:31:14 +09:00
Dean Herbert
bca4b620b6
Merge branch 'master' into editor-wheel-movement 2018-03-16 15:56:51 +09:00
Dean Herbert
7e7f8ed7a2
Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:53:16 +09:00
Dean Herbert
23ffee3d38
Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:38:52 +09:00
Dean Herbert
46f5c0fc19
Merge branch 'master' into mod-fixes 2018-03-16 15:38:41 +09:00
smoogipoo
aa82393824 Merge master into api-as-component 2018-03-16 15:22:48 +09:00
Dan Balasescu
cdc61d5f0d
Merge branch 'master' into fix-combo-colours 2018-03-16 14:59:45 +09:00
smoogipoo
b27b6c7eb7 Merge branch 'master' into cursor-trail 2018-03-16 14:43:27 +09:00
Dean Herbert
7ed84465fb
Merge branch 'master' into mod-fixes 2018-03-16 11:27:39 +09:00
smoogipoo
fc15c63a88 Re-order methods 2018-03-15 18:28:08 +09:00
smoogipoo
c937ef5d24 Fix not being able to scroll before the first timing point 2018-03-15 18:26:53 +09:00
smoogipoo
d05947ef48 Pass adjustable clocks to components, rather than relying on the track 2018-03-15 18:19:28 +09:00
smoogipoo
c8f6a6980b Move clock construction to Editor 2018-03-15 17:27:37 +09:00
smoogipoo
5e742eb466 Move editor constructions to BDL load 2018-03-15 17:10:08 +09:00
smoogipoo
9e0aeec574 Use a decoupled clock for accurate clock times 2018-03-15 17:03:33 +09:00
smoogipoo
50f9d810dd Add more testcases + fix up seeking a bit more 2018-03-15 15:40:52 +09:00
Dean Herbert
0474b7ca2d
Merge branch 'master' into api-as-component 2018-03-15 14:13:23 +09:00
Dean Herbert
a42035f494 Make DrawableHitObject a CompositeDrawable 
No reason for it to be a container.
 2018-03-15 13:41:06 +09:00
Dean Herbert
cdf435aedd
Merge branch 'master' into DoNotMoveToPlayerWhileDragging 2018-03-15 11:14:30 +09:00
Dean Herbert
8d433cb4bf
Merge branch 'master' into cursor-trail 2018-03-15 11:14:21 +09:00
TocoToucan
34dc8e7375 Resolve merge conflict 2018-03-14 23:22:19 +03:00
TocoToucan
5a1af062d3 Handle GlobalAction.TakeScreenshot in ScreenshotManager 2018-03-14 22:55:24 +03:00
Dean Herbert
551b67ac16
Merge branch 'master' into fix-autoplay-button-deselect 2018-03-14 21:46:19 +09:00
smoogipoo
0da3ae0944 Add some basic tests + fixes to seek/seekforward functionality 2018-03-14 20:52:48 +09:00
FreezyLemon
070decf890 small code cleanups 2018-03-14 12:38:22 +01:00
FreezyLemon
a438e45434 make SelectTypes set mods instead of only adding new ones 
also made the method actually take types as parameter to make it consistent
 2018-03-14 12:33:08 +01:00
TocoToucan
25f738c4ae Do not support bmp screenshots 2018-03-14 12:57:55 +03:00
Joseph Madamba
1eeacb7bf7
Change descriptions and special section 2018-03-14 01:05:19 -07:00
Dean Herbert
a0691168cb Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement 2018-03-14 15:35:24 +09:00
Dean Herbert
81f82d98a1 Rework a lot of naming and structure 2018-03-14 15:18:21 +09:00
Dean Herbert
ea649f9650 Avoid scheduling during non-current screen 2018-03-14 12:09:19 +09:00
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code 2018-03-13 20:07:03 -07:00
Dean Herbert
ef8d595914 Apply formatting changes 2018-03-14 11:44:19 +09:00
Dean Herbert
c3a3d76b88 Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging 2018-03-14 11:43:33 +09:00
Dean Herbert
13f64a1d12
Merge branch 'master' into cursor-trail 2018-03-14 11:42:40 +09:00
smoogipoo
e2dc9a975a Merge branch 'master' into editor-wheel-movement 2018-03-14 11:39:02 +09:00
Dean Herbert
ce2997419a Expose API scheduling internally 2018-03-14 11:37:50 +09:00
Dean Herbert
07642546bb Make APIAccess a component 2018-03-14 11:29:54 +09:00
Dean Herbert
83cd2fd317 Move token saving logic to APIAccess 2018-03-14 10:15:05 +09:00
Dean Herbert
afc3646450 Move API configuration hooks out of OsuGameBase 
Also makes username more private, and password completely private.
 2018-03-14 10:15:05 +09:00
Dean Herbert
1d7be2ad0b Fix incorrect variable name 2018-03-14 10:14:42 +09:00
Dean Herbert
d2a0ca6faa Merge remote-tracking branch 'upstream/master' into fix-combo-colours 2018-03-14 10:13:48 +09:00
TocoToucan
0e69ab1615 Introduce ScreenshotManager class 2018-03-14 00:17:12 +03:00
Dean Herbert
c55d70ec13
Merge branch 'master' into fix-combo-colours 2018-03-13 19:19:45 +09:00
Dean Herbert
16eab2eebf Fix combo colours not working until now 2018-03-13 19:19:08 +09:00
Dean Herbert
e43de68ad3 Move colour parsing to LegacyDecoder 2018-03-13 19:13:50 +09:00
vperus
ba44813c00 Fixed exit from game save username instead of email. Resolve #2156 2018-03-13 12:10:47 +02:00
smoogipoo
299de4b866 Rewrite seeking to better handle timing point boundaries 2018-03-13 16:54:34 +09:00
Dean Herbert
d6fa7d69d7 Add missing fonts section 2018-03-13 16:13:07 +09:00
smoogipoo
e97349fd63 Derive ScreenTestCase + use LoadComponentAsync 2018-03-13 16:00:56 +09:00
smoogipoo
0c705b0397 Rename to EditorTestCase 2018-03-13 15:57:05 +09:00
Dean Herbert
b93e83e3d2
Merge branch 'master' into base-editor-testcase 2018-03-13 15:53:33 +09:00
Dean Herbert
e9cd97c43a
Merge branch 'master' into test-beatmap 2018-03-13 15:42:30 +09:00
smoogipoo
e32eec9259 No more caching 2018-03-13 15:22:46 +09:00
smoogipoo
df352c98d6 Change wheel direction to match stable 2018-03-13 14:30:50 +09:00
smoogipoo
e580819621 Rename to seekAmount 2018-03-13 14:08:43 +09:00
smoogipoo
6c148930b5 Don't skip beats when scrolling in the direction of the closest beat 2018-03-13 14:02:37 +09:00
smoogipoo
8acba47a2b Implement mouse wheel movement in the editor 2018-03-13 11:23:44 +09:00
smoogipoo
706c26c32b Remove extra whitespace 2018-03-13 09:27:33 +09:00
FreezyLemon
95c84ea7fe remove (now) unnecessary line 2018-03-12 23:00:06 +01:00
FreezyLemon
ddc1f03a96 deselect autoplay button after ctrl-enter play 
before, the mod was removed, but the button was still active
 2018-03-12 22:35:45 +01:00
Dean Herbert
107ad8cfff Merge remote-tracking branch 'FreezyLemon/master' into more-skinning 2018-03-12 22:01:59 +09:00
Dean Herbert
3354849cc9 Fix code formatting regression 2018-03-12 22:01:18 +09:00
smoogipoo
d2859d779d Create a base TestCaseEditor for rulests to derive 2018-03-12 19:43:52 +09:00
smoogipoo
13c20438ef Fix build issues 2018-03-12 19:41:51 +09:00
smoogipoo
b91524dbba Give TestWorkingBeatmap's track a valid length 2018-03-12 19:41:15 +09:00
smoogipoo
7406cb290f Split out test beatmap from TestCasePlayer into instantiable class 2018-03-12 19:41:09 +09:00
smoogipoo
8c4bcb4a04 Only accept drag movement on the overlays 2018-03-12 17:33:10 +09:00
smoogipoo
212142429f Derive from IHasPosition 2018-03-12 17:25:34 +09:00
Dean Herbert
8cbcdeb665
Merge branch 'master' into mania-difficulty 2018-03-12 14:07:14 +09:00
Dean Herbert
ab4c527ebc
Merge branch 'master' into decoders 2018-03-12 13:38:22 +09:00
Dean Herbert
9f644571ea
Merge branch 'master' into mania-difficulty 2018-03-12 13:31:48 +09:00
smoogipoo
3cd203699b Apply beatmap converter mods in PerformanceCalculator 2018-03-12 13:09:19 +09:00
smoogipoo
81186f8423 Apply beatmap converter mods in DifficultyCalculator 2018-03-12 13:06:42 +09:00
Dean Herbert
1d0a44a0bb
Merge branch 'master' into fix-login-failure 2018-03-12 12:41:45 +09:00
Dan Balasescu
fce61943bd
Merge branch 'master' into smoother-parallax-scale 2018-03-12 12:12:01 +09:00
Dean Herbert
eb643b690a
Merge branch 'master' into more-skinning 2018-03-12 11:55:50 +09:00
Dean Herbert
1bcda4930e Add back beatmap version set 2018-03-12 11:33:12 +09:00
Dean Herbert
c70be29eda Move legacy conversion to LegacySkin 2018-03-12 11:30:13 +09:00
Dan Balasescu
50acab8d86
Merge branch 'master' into relative-date-drawable 2018-03-12 11:28:43 +09:00
Dan Balasescu
0da407f75c
Merge branch 'master' into fix-duplicate-judgements 2018-03-12 11:02:54 +09:00
Dean Herbert
1447ca55a3 Add xmldoc, make restrictSize private 2018-03-12 11:02:02 +09:00
smoogipoo
86d93ffe3c Fix tooltip not working due to not handling input 2018-03-12 10:49:50 +09:00
Dean Herbert
d27cf16bf9 Merge remote-tracking branch 'ppy/master' into more-skinning 2018-03-12 10:46:37 +09:00
Dan Balasescu
96e2aca1ba
Merge branch 'master' into relative-date-drawable 2018-03-12 10:36:43 +09:00
smoogipoo
209d91fe21 Fix duplicate item in csproj 2018-03-12 10:35:37 +09:00
Dan Balasescu
8ba87dfdbd
Merge branch 'master' into fix-duplicate-judgements 2018-03-12 10:29:50 +09:00
smoogipoo
33c721bcbb Fix post-merge errors 2018-03-12 09:51:32 +09:00
smoogipoo
6e51b74890 Merge remote-tracking branch 'origin/master' into rewrite-break-overlay 2018-03-12 09:47:05 +09:00
HoLLy
9c75c392f2 Only check by null instead of sign 2018-03-11 21:27:49 +01:00
HoLLy
a321bcf3af Fix check against LegacyID for non-default rulesets 2018-03-11 20:19:03 +01:00
TocoToucan
e6c22e2287 Taking screenshot support initial commit 2018-03-10 21:59:20 +03:00
Dean Herbert
487a03d0d7
Merge branch 'master' into cursor-trail 2018-03-11 02:07:05 +09:00
Dean Herbert
db2a663234 Use private instead of protected 2018-03-11 01:26:03 +09:00
Dean Herbert
9233266fe1 Fix login failure for users with no country rank 
Closes #2148.
 2018-03-11 00:44:16 +09:00
smoogipoo
4103c66cff Move selection overlay to HitObjectOverlayLayer for extensibility 2018-03-10 00:48:57 +09:00
smoogipoo
0e8fbc47b7 Give HitObjectOverlayLayer full input state information 2018-03-10 00:03:02 +09:00
smoogipoo
376f6eec58 SetPosition -> OffsetPosition 2018-03-10 00:02:13 +09:00
smoogipoo
ad72d3816b Allow dragging anywhere in a capture box to move objects 2018-03-09 23:43:50 +09:00
smoogipoo
4a48136e4f Make hitobject positions adjustable 2018-03-09 23:12:34 +09:00
smoogipoo
3b766b8ec8 Make CaptureBox account for changes in hitobject states 2018-03-09 23:11:48 +09:00
naoey
56730247e3
Merge branch 'fix-unplayable-beatmaps' of github.com:naoey/osu into fix-unplayable-beatmaps 2018-03-09 19:40:00 +05:30
naoey
2c0488b1f1
Invert bool, add test, and handle ruleset change. 2018-03-09 19:39:28 +05:30
Dean Herbert
9ad9fc5aa9
Merge branch 'master' into fix-unplayable-beatmaps 2018-03-09 21:39:48 +09:00
Dean Herbert
217dd2ecdc Initial push for better decoders 2018-03-09 21:24:15 +09:00
naoey
d04f47718f
Make song select choose random when initial selection fails. 
- Revert TestCasePlaySongSelect to master
 2018-03-09 17:36:55 +05:30
naoey
25fb527cc7
Remove previous fix and move filtered logic to carousel. 
- Add an optional bool parameter to SelectBeatmap to skip selecting
filtered maps
 2018-03-09 15:51:00 +05:30
Dean Herbert
6ad962fc8b Interpolate ParallaxContainer's scale 
Things were a bit jumpy when a screen was adjusting `ParallaxAmount`. This smoothes the applied scale changes to look great again.

Most noticeable when hitting the retry hotkey (`~`) from gameplay.
 2018-03-09 14:35:53 +09:00
Dean Herbert
6d91889ca6 Move player-specific configuration bindables back to player 2018-03-08 22:16:47 +09:00
Dean Herbert
94ed4ab01b Add debouncing to player loading 
Allows the mouse to temporarily exit and re-enter overlay elements without triggering a load
 2018-03-08 20:28:55 +09:00
Dean Herbert
d3e91024a7 Block player enter when a drag initiates from an overlaying container 2018-03-08 18:16:23 +09:00
TocoToucan
2cb197d0c4 Replace ConfigureBackgroundUpdate with OnEntering 2018-03-08 11:35:00 +03:00
Dean Herbert
8f3f886805
Merge branch 'master' into PlayerBase 2018-03-08 16:12:12 +09:00
Dean Herbert
81c1ec2005
Merge branch 'master' into fix-unplayable-beatmaps 2018-03-08 13:02:57 +09:00
Dean Herbert
3b56999118 Add drawable to display (and update) relative dates 2018-03-08 12:58:16 +09:00
Dean Herbert
70a16667b6 Fix difficulty calculator regression when applying mods 2018-03-08 12:57:36 +09:00
Dean Herbert
91c984ed97
Merge branch 'master' into rewrite-break-overlay 2018-03-08 09:31:59 +09:00
Dean Herbert
81b778fdcf
Merge branch 'master' into cursor-trail 2018-03-08 09:31:42 +09:00
Dean Herbert
453fd83e01
Merge branch 'master' into user-profile-recent 2018-03-08 00:42:02 +09:00
naoey
983cefbe40
Add VisualTest. 2018-03-07 19:08:26 +05:30
pdrapoport
3731cbe5eb Removing "mouse wheel disabled" checkbox from visual settings gameplay menu 2018-03-07 14:20:59 +01:00
Dean Herbert
f78538fea8
Merge branch 'master' into user-profile-recent 2018-03-07 19:41:52 +09:00
Dean Herbert
b62ed004f2 Remove judgements when deciding a new judgement for a HitObject 
Generally happens when rewinding.
 2018-03-07 19:14:42 +09:00
Dean Herbert
05eb678654 Add skin support for judgements 2018-03-07 18:21:05 +09:00
Dean Herbert
bd952ce370 Allow skinnable drawables to be of non-restricted size 2018-03-07 18:21:05 +09:00
Dean Herbert
6a768e378a
Merge branch 'master' into rewrite-break-overlay 2018-03-07 17:00:34 +09:00
Dan Balasescu
fb349e68a3
Merge branch 'master' into api-error-shouldnt-retry 2018-03-07 16:50:14 +09:00
Dan Balasescu
0c154e07ed
Merge branch 'master' into nullable-legacy-id 2018-03-07 16:12:08 +09:00
Dan Balasescu
5fda7881c3
Merge branch 'master' into fix-textbox-arrows 2018-03-07 16:01:44 +09:00
Dean Herbert
a71e5ce19c Tidy up 2018-03-07 14:54:54 +09:00
Dean Herbert
4094ffbddd Remove unnecessary comment 2018-03-07 14:54:15 +09:00
Dean Herbert
96ea42d3ba Ensure initial value is set even if that value is zero 2018-03-07 14:51:34 +09:00
Dean Herbert
05a13d4d39 Improve the way bindings are done 2018-03-07 14:50:50 +09:00
Dean Herbert
51a9dd038e Add default bindable values 2018-03-07 14:38:41 +09:00
Dean Herbert
fac4cd6a32 Move to overlayContent 2018-03-07 14:20:47 +09:00
Dean Herbert
e2f9e237e8 Use GradientHorizontal helper function 2018-03-07 14:07:04 +09:00
Dean Herbert
c176e309e1
Merge branch 'master' into volume-control 2018-03-07 14:03:09 +09:00
Dean Herbert
e82cadc811 Make LegacyID nullable 
The -1 default was getting stored to the database.
 2018-03-06 17:40:14 +09:00
Dean Herbert
07bf8549eb Fix arbitrary API request errors getting identified as timeouts 2018-03-06 17:39:34 +09:00
smoogipoo
78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
smoogipoo
148551afa2 osu!-side changes in-line with framework layout changes 2018-03-06 14:12:37 +09:00
naoey
9669c5aee3
Make locally used things local and rename method. 2018-03-06 09:33:15 +05:30
Dean Herbert
90828cca8f Fix left and right arrows keys in chat overlay not working 
Misplaced override. Resolves ppy/osu-framework#1444
 2018-03-06 08:59:40 +09:00
TocoToucan
697ad63d72 Resolve merge conflicts 2018-03-05 22:24:25 +03:00
Dean Herbert
c4c1b0b6ff Fix merge regression 2018-03-06 01:39:01 +09:00
Dean Herbert
7b18e8a5ca Merge branch 'master' into fix-taiko-conversion 2018-03-06 01:16:47 +09:00
Dean Herbert
4aafc2228e Improve skip button behaviour when mouse buttons are down 2018-03-06 00:53:40 +09:00
Dean Herbert
d115c56742 Avoid using input blocking 2018-03-06 00:27:55 +09:00
Dean Herbert
792a3ac469 SkipButton -> SkipOverlay 2018-03-06 00:10:53 +09:00
Dean Herbert
d1a115f4ec Merge remote-tracking branch 'upstream/master' into cursor-trail 2018-03-05 23:34:04 +09:00
Dean Herbert
41727509d7
Merge branch 'master' into fix-drumroll-nullref 2018-03-05 22:46:33 +09:00
smoogipoo
2a9fb2c2c6 Make NestedHitObjects lazily-constructed 2018-03-05 21:40:26 +09:00
Dean Herbert
02690e5f25 Move to private implementation 2018-03-05 21:27:37 +09:00
Dean Herbert
0d817e8e98 Merge remote-tracking branch 'ppy/master' into fix-skin-performance 2018-03-05 21:23:18 +09:00
Dan Balasescu
25e2844e49
Merge branch 'master' into storyboard-rewind-support 2018-03-05 21:11:00 +09:00
Dan Balasescu
56550e4dd8
Merge branch 'master' into fix-parallax-during-rewind 2018-03-05 20:39:16 +09:00
Dan Balasescu
65d510baf2
Merge branch 'master' into add-internal-legacy-offsets 2018-03-05 20:27:27 +09:00
Dean Herbert
53edfedfc8 Remove unneeded HighFrequencyMousePosition from GameplayMenuOverlay 2018-03-05 19:43:57 +09:00
Dean Herbert
7d11e55d06 Only block mouse input when the shaded portion of the SkipButton is hovered 2018-03-05 19:43:33 +09:00
Dean Herbert
2003887cc8
Merge branch 'master' into clock-fixes 2018-03-05 17:45:08 +09:00
smoogipoo
d44dc1a4f9 Fix SliderMultiplier/SliderTickRate parsing inaccuracy 2018-03-05 16:01:05 +09:00
smoogipoo
49b8670dfc Fix beatmap conversion tests not properly constructing decoder 2018-03-05 14:53:57 +09:00
Dean Herbert
e46f363fdc Fix failing unit test 2018-03-04 22:46:50 +09:00
Dean Herbert
bc0bc8d459 Add legacy timing offsets 
These have been in release builds since January, but implemented in a hacky way.

This brings them with a sane implementation.
 2018-03-04 21:57:50 +09:00
jorolf
ec013dbee8 remove blank line and try to get test case working 2018-03-03 21:55:19 +01:00
jorolf
1cda58fe29 another blank line 2018-03-03 19:51:11 +01:00
jorolf
9293ec635a add license headers and remove blank line 2018-03-03 19:49:38 +01:00
jorolf
8e0a524c4d change colours 2018-03-03 19:31:29 +01:00
jorolf
ef63366d91 simplify VolumeMeter 2018-03-03 19:25:34 +01:00
Dean Herbert
30b1447318 Fix skin file path lookup performance 
Move path mapping to the resource store, so caching can happen against the component's name rather than the skin path.

Fixes regression of beatmap load time when a custom skin is selected.
 2018-03-04 03:19:01 +09:00
jorolf
9a29c53c5e Merge branch 'master' of git://github.com/ppy/osu into volume-control 2018-03-03 19:09:08 +01:00
jorolf
3a420ba826 add the volume overlay 2018-03-03 19:08:35 +01:00
Dean Herbert
66493d200b
Merge branch 'master' into user-profile-recent 2018-03-04 02:45:12 +09:00
Dean Herbert
8273288048 Add xmldoc 2018-03-04 02:12:45 +09:00
Dean Herbert
0e928429d4
Merge branch 'master' into ruleset-replayframes 2018-03-04 01:57:43 +09:00
Dean Herbert
659578e8fa Add rewind support for storyboards 2018-03-04 01:48:31 +09:00
Dean Herbert
26e50043b7 Fix parallax container during rewinds 2018-03-04 00:52:00 +09:00
Dean Herbert
c6c55c40ed Rewrite BreakOverlay 
No longer relies on Schedule calls (could not be rewound).
Also no longer sucks.
 2018-03-04 00:51:24 +09:00
naoey
a57dc154f9
More specific tests. 2018-03-03 20:34:29 +05:30
jorolf
bd75422d88 Merge branch 'master' of git://github.com/ppy/osu into volume-control 2018-03-03 14:10:50 +01:00
naoey
307147a8a3
Merge remote-tracking branch 'upstream/master' into fix-unplayable-beatmaps 2018-03-03 16:10:22 +05:30
naoey
fb724ca8a7
Make song select ensure current beatmap is always playable in the active ruleset. 
- Add a to TestCasePlaySongSelect testing this scenario
 2018-03-03 16:09:24 +05:30
Dean Herbert
0b2cbf88bb
Merge branch 'master' into clock-fixes 2018-03-02 22:18:32 +09:00
Dean Herbert
06cf9cbd63
Merge branch 'master' into fix-perfectcurve 2018-03-02 21:49:33 +09:00
Dean Herbert
bd510e5356 Merge remote-tracking branch 'upstream/master' into clock-fixes 2018-03-02 21:01:53 +09:00
smoogipoo
a2c239d5e3 Rename to IBeatmapConverter, move to separate file 2018-03-02 20:19:47 +09:00
smoogipoo
8a15d4e677 Fix linear perfect-curves not being cased to CurveType.Linear 
Fixes #2151.
 2018-03-02 18:21:40 +09:00
smoogipoo
cdca7371a3 Replace testcases with a basic test suite 2018-03-02 18:20:33 +09:00
Dan Balasescu
4aff659272
Merge branch 'master' into beatmap-conversion-testcases 2018-03-02 16:04:32 +09:00
smoogipoo
1f834825dc Add testcase to osu.Game in-case nunit tries to discover tests in it 2018-03-02 15:43:55 +09:00
smoogipoo
2e3ee00c19 Remove unnecessary changes 2018-03-02 13:13:01 +09:00
smoogipoo
573d6d1b5f Allow multiple mappings to be generated for a single hitobject 2018-03-02 13:13:01 +09:00
smoogipoo
4e363664fd Add beatmap parameter to beatmapconverter creation 2018-03-02 13:13:01 +09:00
smoogipoo
070c5a95ee Improve output 2018-03-02 13:13:01 +09:00
smoogipoo
797d03a65f Implement basic structure for beatmap conversion testing 2018-03-02 13:13:00 +09:00
Dean Herbert
c54c1699bf
Merge branch 'master' into ruleset-replayframes 2018-03-01 22:26:16 +09:00
Dean Herbert
603a98f6cc
Merge branch 'master' into editor-hitobject-overlays 2018-03-01 21:33:27 +09:00
Dean Herbert
6dc9411a90 Don't use BufferedContainer for OsuLogo 
Minor performance improvement. Not sure why this was done but it's not required any more.
 2018-03-01 16:01:42 +09:00
smoogipoo
d5d4bcb558 Merge branch 'master' into editor-hitobject-overlays 2018-03-01 14:04:38 +09:00
smoogipoo
e869f7d05b Fix converted frames not getting time values 2018-03-01 02:28:15 +09:00
smoogipoo
fb16c3db87 Privatise CurrentTime's setter 2018-03-01 02:28:14 +09:00
smoogipoo
19911193cf Minify LegacyReplayFrame 2018-03-01 02:28:14 +09:00
smoogipoo
cf42d5bbd5 Remove mostly-unused Score parameter 2018-03-01 02:28:14 +09:00
smoogipoo
c9c65cab53 CreateReplayFrame -> CreateConvertibleReplayFrame 2018-03-01 02:28:14 +09:00
smoogipoo
ab4d7fa46e Remove IScoreParser interface 
It's too early for this.
 2018-03-01 02:28:14 +09:00
smoogipoo
a3c7755ade Implement a conversion process for ReplayFrames 2018-03-01 02:28:14 +09:00
Dean Herbert
b8ea4b11ab
Adjust range further 
This is not a great idea.
 2018-03-01 00:39:59 +09:00
Dean Herbert
e2f57ae346
Merge branch 'master' into parser-sanity-checks 2018-03-01 00:38:44 +09:00
jorolf
46dfb761c5 basic volume meter and testcase 2018-02-28 16:14:52 +01:00
Dean Herbert
eacb9ba743
Merge branch 'master' into user-profile-recent 2018-02-28 23:49:33 +09:00
Dean Herbert
36beaffa7a
Merge branch 'master' into editor-hitobject-overlays 2018-02-28 23:48:54 +09:00
Dean Herbert
bda673e6fe
Merge branch 'master' into player-reduced-parallax 2018-02-28 23:15:25 +09:00
Dean Herbert
572d3b1316 Move bpm clamping to TimingControlPoint, adjust range to 1-10000bpm 
In line with stable editor restrictions
 2018-02-28 22:53:28 +09:00
Dan Balasescu
33a64cb497
Merge branch 'master' into fix-multiple-tracks-playing 2018-02-28 22:53:02 +09:00
Dan Balasescu
25c748ed45
Merge branch 'master' into fix-player-exit 2018-02-28 22:05:44 +09:00
Dean Herbert
f9faf8e3d8 Localise offset clock usage out of Player as much as possible 2018-02-28 22:01:52 +09:00
Dean Herbert
01fcf9c813 Update in line with framework changes 2018-02-28 22:01:48 +09:00
Dan Balasescu
b898226a91
Merge branch 'master' into fix-mod-select 2018-02-28 21:52:07 +09:00
Dan Balasescu
a3d26d7d55
Merge branch 'master' into fix-song-select-iteration 2018-02-28 21:40:25 +09:00
naoey
2e535afb84
Remove redundant subsection title. 
- Also handle opening UserProfile in LinkFlowContainer similar to how
beatmaps and channels are handled
 2018-02-28 15:25:29 +05:30
Dean Herbert
5b4fef0180 Add bare minimum sanity checking of beatmap input values to make broken maps load 
Resolves ppy/osu#1988.
 2018-02-28 18:12:24 +09:00
Dean Herbert
968291c61e Sort hitobjects imported from legacy beatmps 
Apaprently some ranked maps contain unordered hitobjects. We probably never want to allow for this.
 2018-02-28 18:11:28 +09:00
Dean Herbert
6f44db6de0 Clamp at DifficultyControlPoint 
This is what stable did.
 2018-02-28 18:10:38 +09:00
Dean Herbert
08497427fd
Merge branch 'master' into fix-multiple-tracks-playing 2018-02-28 15:32:16 +09:00
Dean Herbert
bc0bbd2e3b
Merge branch 'master' into reduce-transforms 2018-02-28 14:39:31 +09:00
Dean Herbert
4a52db14d1 Fix depth of already-visible panels not being updates after a sorting change 2018-02-28 14:18:25 +09:00
Dean Herbert
dd6cf1379e Reduce parallax effect during gameplay 
This also cleans up some shared code in OsuScreen.
 2018-02-28 11:42:47 +09:00
Dean Herbert
0cd049c6b0 Rely less on zero-duration transform helpers 
They have huge overheads.

See ppy/osu-framework#1411.
 2018-02-28 11:00:54 +09:00
naoey
62913163e0
Fix long recent activity text overlapping timestamp. 
- Also remove unnecessary fallback from absolute URL helper
 2018-02-27 21:21:53 +05:30
Dean Herbert
510ecd7c87 Ensure selection is finalised before exiting song select 
Resolves #2080.
 2018-02-28 00:07:28 +09:00
Dean Herbert
f64afc738d Fix incorrect exit block conditional 
Resolves #2130.
 2018-02-27 23:59:34 +09:00
Dean Herbert
84a8fbe0b3 Fix null ref 2018-02-27 21:26:06 +09:00
Dean Herbert
034875be47 Fix bindings not being unbound on ModSelect 
Resolves #2018.
Closes #2079.
 2018-02-27 20:45:32 +09:00
Dean Herbert
9b44f447ca Fix song select iteration when all panels are filtered 
Resolves #2069.
 2018-02-27 17:52:12 +09:00
Dean Herbert
cff17f1864 Update in line with inverse ShoudProcessClock default 2018-02-27 17:23:38 +09:00
Dean Herbert
8e78a7b114 Fix HUD using incorrect clock for time display 2018-02-27 17:23:38 +09:00
Dean Herbert
37d2a2c3cc Rename clock types to match across classes 2018-02-27 17:23:38 +09:00
Dean Herbert
3d52ead213 Rename sourceClock 2018-02-27 17:23:38 +09:00
Dean Herbert
fee258f2f2 Rework PauseContainer to better pause 2018-02-27 17:23:38 +09:00
Dean Herbert
d4f1723ae6 Remove unnecessary secondary argument from HUDOverlay 2018-02-27 17:23:38 +09:00
Dean Herbert
0635ae2293 Include missing offset 2018-02-27 17:23:38 +09:00
Dean Herbert
9c0dfb7c8c Avoid creating an extra framed clock in SkipButton 2018-02-27 17:23:38 +09:00
Dean Herbert
73fb185132 Change the way ShouldProcessClock is specified in line with framework changes 2018-02-27 17:23:38 +09:00
Dean Herbert
d2f98642a1
Merge branch 'master' into confine-mode-reset 2018-02-26 20:59:53 +09:00
Dean Herbert
bdd88303b3
Merge branch 'master' into editor-hitobject-overlays 2018-02-26 17:53:50 +09:00
naoey
a77d1eedae
Fix achievements parsing and add badges to recent activity. 2018-02-26 13:08:12 +05:30
naoey
a20e4bc2c3
Fix typos and missing fields in JSON mappings. 2018-02-26 11:46:16 +05:30
Dean Herbert
9cbed461c4
Merge branch 'master' into sliderbody-rework 2018-02-26 15:00:18 +09:00
naoey
5724618b2a
Add license headers and sanitise open profile argument. 2018-02-26 09:58:11 +05:30
naoey
1ad45b0941
R# fixes. 2018-02-26 01:21:31 +05:30
naoey
75fdca928e
Handle links correctly and don't re-open profile if the user is same. 2018-02-26 01:21:29 +05:30
naoey
bb40919f9c
Add link handling to recent activities. 
- Add a show user action to link handling
 2018-02-26 01:21:27 +05:30
naoey
7e4bd36391
Create drawable and add response to profile. 
- Add missing JSON fields to response model
- Add missing enum value
 2018-02-26 01:21:24 +05:30
naoey
e3a1b07172
Create API request and reponse model. 2018-02-26 01:21:16 +05:30
Dean Herbert
ab9aed351f Remove null channels from SkinnableSound playable channels 2018-02-25 17:14:35 +09:00
Dean Herbert
4a52df2dd4 Apply review 2018-02-24 23:07:02 +09:00
Dean Herbert
768e0a4e2a Add SkinnableSound class 
Tidy things up, move logic out of SampleInfo.
 2018-02-24 22:47:14 +09:00
Dean Herbert
a312fb365a Merge remote-tracking branch 'ppy/master' into skinning-basics 2018-02-24 22:41:17 +09:00
V.Kalyuzhny
ef6b207c7e Fix file case 2018-02-24 14:18:53 +02:00
smoogipoo
066abfbdbc Rename PositionAt -> CurvePositionAt to represent its new meaning 2018-02-24 02:43:36 +09:00
smoogipoo
8c90abe0dc Make slider control points relative to start position 2018-02-23 20:59:27 +09:00
smoogipoo
278b25bcbd Fix border being the wrong size 2018-02-23 15:29:56 +09:00
smoogipoo
d72290ee24 Make ScaledContainer private 2018-02-23 15:06:08 +09:00
Dean Herbert
a36986ef5a Make ComponentName readonly 2018-02-23 14:28:57 +09:00
Dean Herbert
0e20c4e6bb Fix typo 2018-02-23 14:27:53 +09:00
Dean Herbert
ff75cf6b75 Remove unnecessary braces 2018-02-23 14:27:39 +09:00
Dean Herbert
f81eb2de65 Remove unnecessary local store 2018-02-23 14:24:32 +09:00
Dean Herbert
c0d983bbdf
Merge branch 'master' into PlayerBase 2018-02-23 13:51:11 +09:00
Dean Herbert
92d20eea8c Add missing licence header 2018-02-23 13:38:12 +09:00
Dean Herbert
6ceabfe19e Add basic hitsound skinning 2018-02-23 13:38:12 +09:00
Dean Herbert
84b707f4f8 Add basic hitcircle skinning 2018-02-23 13:38:12 +09:00
Dean Herbert
3726db53b5 Allow instantiation of skins 2018-02-23 13:38:12 +09:00
Dean Herbert
e9c5834387 Add query method for now 2018-02-23 13:26:01 +09:00
Dean Herbert
72fcbfe12b Merge remote-tracking branch 'upstream/master' into editor-hitobject-overlays 2018-02-23 12:37:30 +09:00
Dean Herbert
402d71a8d9 Add user skin setting storage 2018-02-22 16:29:05 +09:00
Dean Herbert
659cf629b6 Add skin seleciton dropdown to settings 2018-02-22 15:46:11 +09:00
Dean Herbert
2351b6ab26 Add migration 2018-02-22 15:46:11 +09:00
Dean Herbert
4c14b32783 Add basic skin database model layout and importing 2018-02-22 15:46:11 +09:00
Dean Herbert
c070c69522 Update framework 2018-02-22 15:01:53 +09:00
smoogipoo
0cdf6fa7e2 Make HitObjectOverlay into an OverlayContainer 2018-02-22 14:36:58 +09:00
Dean Herbert
871bcb4142
Merge branch 'master' into sign-in-edits 2018-02-22 14:35:29 +09:00
smoogipoo
45c579630d Make selectionLayer handle input below object overlays 2018-02-22 14:34:37 +09:00
Dan Balasescu
6cc54a464c
Merge branch 'master' into editor-hitobject-overlays 2018-02-22 14:25:27 +09:00
smoogipoo
07252254eb Fix post-merge issues 2018-02-22 14:22:04 +09:00
Dean Herbert
ee9a45cc45
Merge branch 'master' into sign-in-edits 2018-02-22 14:18:49 +09:00
Dean Herbert
f2b3d9a0e8 Change some missed instances 2018-02-22 14:17:35 +09:00
smoogipoo
99e9eb81f2 Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays 2018-02-22 14:16:01 +09:00
Dean Herbert
a3336f2577
Merge branch 'master' into fix-editor-osu-scale 2018-02-22 14:14:41 +09:00
smoogipoo
ded2644df8 Merge branch 'master' into editor-hitobject-overlays 2018-02-22 14:08:36 +09:00
Joseph Madamba
3d4bed462b
Reword sign in text 2018-02-21 20:54:47 -08:00
Dean Herbert
7c942eb592 Tidy up layer container logic 2018-02-22 13:42:36 +09:00
Dean Herbert
b74cfffc6f
Merge branch 'master' into editor-hitobject-movement 2018-02-22 13:19:39 +09:00
Dean Herbert
c84ded258f Reset mouse confine mode on input setting reset hotkey 2018-02-22 10:08:56 +09:00
smoogipoo
5faec5c2f1 Add a separate property to control playfield area 2018-02-21 20:54:33 +09:00
smoogipoo
6757be2007 Fix incorrect RelativeChildSize in Catch 2018-02-21 20:15:51 +09:00
smoogipoo
f012cce668 Rewrite some xmldocs to make methods easier to understand 2018-02-21 17:33:22 +09:00
smoogipoo
4934ef7429 Add playfield aspect ratio + scaling modifications to composer layers 2018-02-21 11:07:42 +09:00
smoogipoo
7fd7dc1538 Extract playfield scaling into a separate class 
And make it more general.
 2018-02-21 11:07:42 +09:00
Dean Herbert
ba10eb5e50
Merge branch 'master' into osu-rulesetcontainer-aspect 2018-02-21 10:13:44 +09:00
smoogipoo
7fe0989427 Merge branch 'general-slider-improvements' into editor-hitobject-overlays 2018-02-20 23:51:47 +09:00
smoogipoo
ad2f556133 Add hitobject overlays to selected hitobjects 2018-02-20 18:01:45 +09:00
Dean Herbert
cce7855bf9
Merge branch 'master' into fix-selection-border-radius 2018-02-20 15:28:51 +09:00
smoogipoo
2a5bfdb4b8 Deselect hitobjects that are now not in the selection quad 2018-02-20 15:06:51 +09:00
smoogipoo
2f4925d031 Add some xmldocs 2018-02-20 15:06:14 +09:00
smoogipoo
285df52f43 Encapsulate logic for selecting/deselecting further 2018-02-20 14:54:45 +09:00
smoogipoo
995ecb7d94 Make selectedHitObjects into a HashSet for quick Contains checks 2018-02-20 14:48:35 +09:00
smoogipoo
87065a0b13 Rename + publicise DeselectAll 2018-02-20 14:38:57 +09:00
smoogipoo
423fe4eba8 Combine border radiuses of selection and capture boxes 2018-02-20 14:25:42 +09:00
Dan Balasescu
3d7f998c9b
Merge branch 'master' into osu-rulesetcontainer-aspect 2018-02-20 14:07:04 +09:00
smoogipoo
4da93e8f1d Merge remote-tracking branch 'origin/master' into editor-hitobject-movement 2018-02-20 14:03:47 +09:00
smoogipoo
8f25a5da66 Add playfield aspect ratio + scaling modifications to composer layers 2018-02-20 14:01:33 +09:00
smoogipoo
4a5cd6520c Extract playfield scaling into a separate class 
And make it more general.
 2018-02-20 13:50:31 +09:00
Dean Herbert
835136aecb
Merge branch 'master' into api-interface 2018-02-20 09:33:53 +09:00
Dean Herbert
f41a40be15
Merge branch 'master' into editor-hitobject-movement 2018-02-19 17:59:50 +09:00
Dean Herbert
fae6ea1ee2
Merge branch 'master' into storyboard-improvements 2018-02-19 17:28:53 +09:00
smoogipoo
4898c321f8 Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement 2018-02-19 17:07:03 +09:00
smoogipoo
b7be162f28 Remove AspectAdjust property (override GetAspectAdjustedSize instead) 2018-02-19 17:05:10 +09:00
smoogipoo
cd2c9a9de6 Adjust xmldoc and rename to GetAspectAdjustedSize 2018-02-19 17:04:18 +09:00
Dean Herbert
d70d40e3b8 Add back forgotten score store to valid importers 2018-02-19 15:52:14 +09:00
Dan Balasescu
34f76a4136
Merge branch 'master' into storyboard-improvements 2018-02-19 15:40:09 +09:00
Dan Balasescu
80010dd845
Merge branch 'master' into api-interface 2018-02-19 15:24:50 +09:00
Dan Balasescu
5401b0dfcd
Merge branch 'master' into abstract-model-managers 2018-02-19 14:56:21 +09:00
Dean Herbert
7c43a3b4c0
Merge branch 'master' into storyboard-improvements 2018-02-19 14:54:12 +09:00
Dean Herbert
57e61b0b0e Update xmldoc 2018-02-19 14:50:42 +09:00
Dean Herbert
8b89735e9e Improve xmldoc for DatabaseContextFactory.Get 2018-02-19 14:17:41 +09:00
Dean Herbert
a7915e7041 Fix typo 2018-02-19 14:00:48 +09:00
Dean Herbert
e0faf14a3e Actually consume ReplacesBackground 2018-02-19 12:33:07 +09:00
Dean Herbert
58af66bfc0 Merge branch 'master' into editor-hitobject-movement 2018-02-16 13:59:11 +09:00
Dean Herbert
75dcf72520 Improve testability of API 2018-02-16 13:57:39 +09:00
Dean Herbert
29adedfa96 Collapse visual settings by default in player 2018-02-16 12:47:32 +09:00
Dean Herbert
21b641b302 Give storyboards a BeatmapInfo to reduce weird method calls 
Also removes unnecessary background texture (the actual storyboard background spec wasn't implemented correctly anyway).
 2018-02-16 12:09:23 +09:00
Dean Herbert
9760f30ce9 Tidy things up to make more sense 2018-02-16 12:08:36 +09:00
Dean Herbert
f22f9b5de0
Merge branch 'master' into PlayerBase 2018-02-16 11:26:57 +09:00
Dean Herbert
ddf49c2e65 Fix intro not being replaced by a playable song when entering song select 2018-02-16 10:45:15 +09:00
TocoToucan
c57e8785e2 Move all storyboard loading to Player itself 2018-02-15 23:57:53 +03:00
Dean Herbert
9ea7f12f8d
Merge branch 'master' into abstract-model-managers 2018-02-15 20:39:08 +09:00
Dean Herbert
96c23d2a62 Add override to fix left/right arrow control 2018-02-15 19:41:15 +09:00
smoogipoo
cbac4de9c2 Expire + dispose CaptureBoxes 2018-02-15 19:11:29 +09:00
smoogipoo
ebcdb62570 Remove now unneeded hide 2018-02-15 19:10:55 +09:00
smoogipoo
9583191556 Dispose SelectionBoxes when they die 2018-02-15 19:08:03 +09:00
smoogipoo
4ac0c48ba6 Add fadein to SelectionBox 2018-02-15 19:07:53 +09:00
smoogipoo
dcbc8c3dcd Remove animated capture boxes for now 2018-02-15 18:06:33 +09:00
Dean Herbert
fa05822d7d Add missing licence headers 2018-02-15 16:33:33 +09:00
Dean Herbert
b9ef32b09b Further xmldoc and restoring of Cleanup method 2018-02-15 16:31:42 +09:00
Dean Herbert
1b13be1372 Cleanups and xmldoc additions 2018-02-15 16:24:14 +09:00
Dean Herbert
8c1d581fb3 Fix hiding beatmaps not refreshing correctly 2018-02-15 16:15:40 +09:00
Dean Herbert
89cf794f98 Add a lower level ConsumableItems implementation 2018-02-15 16:15:40 +09:00
Dean Herbert
671475f3b4 Ensure undeleted items are populated with includes before firing events 2018-02-15 16:15:40 +09:00
Dean Herbert
e51450a064 Fix query construction 2018-02-15 15:24:28 +09:00
Dean Herbert
d07ab1fbea Fix undelete all 2018-02-15 15:14:55 +09:00
Dean Herbert
fe5df663be Add more xmldoc 2018-02-15 15:14:46 +09:00
Dean Herbert
a0a65abcac Crentalise all import logic 2018-02-15 14:22:39 +09:00
Dean Herbert
d3dd31dadb Make deletion and purging logic even more global 2018-02-15 14:22:39 +09:00
Dean Herbert
d340509b1d Move ArchiveReaders to a more global namespace 
Also moves delete and action logic to a shared implementation
 2018-02-15 14:22:39 +09:00
Dean Herbert
6ff63c2f0c Move deletion to ArchiveModelImportManager 2018-02-15 14:22:39 +09:00
Dean Herbert
d8f84fcca3 Give ArchiveReader a filename 2018-02-15 14:22:39 +09:00
Dean Herbert
e0d28564d0 Move import logic to shared implementation 2018-02-15 14:22:39 +09:00
Dan Balasescu
c5b71d2cb7
Remove unused using 2018-02-14 23:15:34 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests 2018-02-14 22:48:29 +09:00
smoogipoo
115484741d Capture -> Select 2018-02-14 17:54:43 +09:00
smoogipoo
a9d14eadac Add clearSelection method 2018-02-14 17:53:04 +09:00
smoogipoo
344da5965c Add a CaptureBox that encloses hitobjects from the drag selection 2018-02-14 14:38:37 +09:00
smoogipoo
fcbeb97a54 Merge remote-tracking branch 'origin/master' into editor-hitobject-movement 2018-02-14 14:08:36 +09:00
smoogipoo
bfb21d3d69 Merge remote-tracking branch 'origin/master' into drag-lenience 2018-02-13 21:39:28 +09:00
Dean Herbert
30581d03d2
Merge branch 'master' into PlayerResumeHotfix 2018-02-13 20:34:22 +09:00
Dean Herbert
86acc84988 Apply formatting 2018-02-13 20:23:51 +09:00
Dean Herbert
5ecb77fda7 Merge remote-tracking branch 'upstream/master' into default-approachrate 2018-02-13 20:23:01 +09:00
Dean Herbert
6f29cd35af
Merge branch 'master' into PlayerResumeHotfix 2018-02-13 20:21:45 +09:00
Dean Herbert
f4ddc0717b Fix incorrect PlaylistItem drag handling 2018-02-13 20:08:59 +09:00
Dean Herbert
e2d11af4ef Fix incorrect MusicController drag handling 2018-02-13 20:08:59 +09:00
Dean Herbert
58f20c3723
Merge branch 'master' into editor-hitobject-movement 2018-02-13 18:56:16 +09:00
Dean Herbert
179a151653
Merge branch 'master' into beatmap-import-simplification 2018-02-13 16:54:52 +09:00
Dean Herbert
8c42225646 Fix outdated xmldoc 2018-02-13 15:08:51 +09:00
Dean Herbert
50cdb03cd9 Don't dispose read contexts 2018-02-13 15:08:45 +09:00
Dean Herbert
ab34123ba8 Remove unnecessary class variable 2018-02-13 15:05:19 +09:00
Shane Woolcock
d603d032d5 Inlined delete beatmap dialog 2018-02-13 16:26:05 +10:30
Dean Herbert
3561326306 Remove fixed issue 2018-02-13 14:54:46 +09:00
Dean Herbert
e8e093d6f2 Fix incorrect xmldoc 2018-02-13 14:54:01 +09:00
Shane Woolcock
8d313486b3 Add a confirmation dialog to the Delete option in the beatmap context menu 2018-02-13 00:40:34 +10:30
Dean Herbert
a738664167 Add interface for database context factory 2018-02-12 23:10:05 +09:00
Dean Herbert
64cda9fd0f Remove incorrect assert assumption 2018-02-12 22:16:09 +09:00
Dean Herbert
8b37fde15b Only write when writes occur 
Also add finaliser logic for safety. Also better threading. Also more cleanup.
 2018-02-12 19:57:21 +09:00
smoogipoo
87baa6febd Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments 2018-02-12 19:08:13 +09:00
smoogipoo
bfedd1cee0 Remove nested container 2018-02-12 19:01:50 +09:00
smoogipoo
c3212d36ef Remove handles for now (will be re-implemented) 2018-02-12 18:36:16 +09:00
smoogipoo
e10bb2db05 Unify SelectionLayer and HitObjectCapturer, rename SelectionBox 2018-02-12 18:35:01 +09:00
smoogipoo
20c0dee17d Remove SelectionInfo 2018-02-12 18:22:52 +09:00
smoogipoo
ee168f9a77 Split out drag selection box from post-capture box 
Cleans up a lot of code, removes handles for now.
 2018-02-12 18:20:05 +09:00
Dean Herbert
edc3638175 DatabaseWriteUsage 2018-02-12 17:55:11 +09:00
smoogipoo
1adbe3585c HitObjectSelectionBox -> SelectionDragger 2018-02-12 16:03:59 +09:00
smoogipoo
cfb2b3f1e8 Rework SelctionLayer to support click-selections 2018-02-12 16:02:42 +09:00
Dean Herbert
cc948d688f Fix unrelated spacing issue 2018-02-12 15:39:13 +09:00
Dean Herbert
e54de0c267 Remove sqlite-net migration 
Anyone that may have benefited from this already has.
 2018-02-12 15:25:09 +09:00
TocoToucan
86f200e257 Fix possible nullref 2018-02-09 22:04:39 +03:00
TocoToucan
a86a4f49cf Resolve "Pressing escape on continuing causes the game to return to song select" problem without removing Delay 2018-02-09 21:20:49 +03:00
Dean Herbert
721bb7e4dd Add proper handling for OnlineBeatmapSetID conflicts 
Not yet working
 2018-02-09 21:31:33 +09:00
Dean Herbert
a1513351c0 Add missing licence header 2018-02-09 20:35:54 +09:00
Dean Herbert
d547caa04e Further improve xmldoc 2018-02-09 19:44:17 +09:00
Dean Herbert
867b1b5f65 Move public methods up 2018-02-09 19:39:02 +09:00
Dean Herbert
c84cb0b33c Fix/add some xmldoc 2018-02-09 19:32:28 +09:00
Dean Herbert
db654004b7 Move BeatmapManagerWorkingBeatmap to its own file 2018-02-09 19:32:18 +09:00
Dean Herbert
fb6dc922c6 Reorder file 2018-02-09 19:25:55 +09:00
Dean Herbert
c7de79caf6 Remove storage class variable 2018-02-09 19:24:17 +09:00
Dean Herbert
5e0cb9d4b9 Simplify beatmap store retrieval 2018-02-09 19:12:29 +09:00
Dean Herbert
a166932468 Add deletion test 2018-02-09 17:51:29 +09:00
Dean Herbert
3b7018fcd6 Simplify beatmap import process 2018-02-09 17:22:48 +09:00
smoogipoo
0dab70cc05 Fix license header 2018-02-09 12:48:22 +09:00
Bang Sunghwan
3894622ddc Remove redundant initializing field by default 2018-02-09 09:55:02 +09:00
Bang Sunghwan
f20e3ff31d Fix ApproachRate setting only DEFAULT_DIFFICULTY 2018-02-09 09:45:43 +09:00
Bang Sunghwan
cc6114b344 Fix ApproachRate not inheriting OverallDifficulty when it is undefined 2018-02-09 09:31:19 +09:00
TocoToucan
4535e09607 Add missing license header 2018-02-09 00:36:31 +03:00
TocoToucan
a860dd7208 Preview visual settings at the “loading” screen 2018-02-09 00:06:24 +03:00
TocoToucan
d437c1d7ec Introduce PlayerBase class 2018-02-08 23:28:42 +03:00
TocoToucan
77a8b36529 Schedule Resume method call without delay 2018-02-08 22:30:15 +03:00
smoogipoo
77149b00ce Merge branch 'codestyle-fixes' into update-branch 2018-02-08 23:47:31 +09:00
smoogipoo
4699b5ad7c Fix a few code styling issues 
These are present in the netstandard branch (the rules aren't working there - probably using the wrong configuration).
 2018-02-08 23:47:03 +09:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Dean Herbert
e107566575 Update user object to match new standardised api 2018-02-08 18:06:04 +09:00
Dean Herbert
534eb223b3
Merge branch 'master' into unified-hitwindows 2018-02-08 17:46:29 +09:00
smoogipoo
0511728fbe Remove "keypress" from comment 2018-02-08 17:38:46 +09:00
Dean Herbert
789e25069f Fix non-visual tests not cleaning up previous executions 2018-02-08 17:07:59 +09:00
Dean Herbert
cafa605b90 Fix visual settings checkboxes playing sounds in bindable binding 
Move sound binding to much later in the process to avoid programmatic checkbox changes triggering interaction sounds
 2018-02-08 14:43:47 +09:00
smoogipoo
46284c61ae Return HitResult.None instead of null 2018-02-08 14:25:59 +09:00
smoogipoo
c537af0289 Fix/improve commends 2018-02-08 14:25:44 +09:00
smoogipoo
a6f1a4689e Fix incorrect value copy-pasta 2018-02-08 14:16:37 +09:00
smoogipoo
17aa915c77 Rename DifficultyRange parameters 2018-02-08 13:57:45 +09:00
smoogipoo
802aaefe35 Give rulesets a way to disable/enable perfect/ok hit results 2018-02-08 13:54:08 +09:00
smoogipoo
cfdeac6428 Make hit windows settable by derived classes 2018-02-08 13:38:31 +09:00
smoogipoo
beaecbafbd Merge branch 'master' into unified-hitwindows 2018-02-08 13:22:44 +09:00
smoogipoo
ccc948a0b9 Update framework (testing) 2018-02-08 12:45:51 +09:00
Dean Herbert
a70989cb70 Rely on bindable's formatting rather than setting a default 2018-02-08 11:12:05 +09:00
Dean Herbert
7e83aedb86
Merge branch 'master' into slider-tooltip-precision 2018-02-08 11:00:46 +09:00
Dean Herbert
67bd375bfa Merge remote-tracking branch 'upstream/master' into raw-input-fixes 2018-02-07 22:05:44 +09:00
smoogipoo
ee93c0bc19 Use an endian-independent method to find precision 2018-02-07 20:03:37 +09:00
Dean Herbert
6b6d4f9527
Merge branch 'master' into country_rank 2018-02-07 18:49:40 +09:00
Dean Herbert
4c3606f8fb Handle non-present country rank 2018-02-07 18:34:38 +09:00
Dean Herbert
93c4612f4f Add comment about deserialising helper 2018-02-07 18:18:26 +09:00
Dean Herbert
647cc4bdad Remove in-between properties 2018-02-07 18:04:32 +09:00
smoogipoo
23d4c20726 Apply suggestions to normalisation function 2018-02-07 17:31:18 +09:00
Dean Herbert
20c00720e5 Fix formatting 2018-02-07 17:18:38 +09:00
smoogipoo
8e280b6b0c Use 0.1 precision for playback speed 2018-02-07 13:28:10 +09:00
smoogipoo
bd5db6fc8d Make playback speed sliderbar use the tooltip text as its display 2018-02-07 13:26:41 +09:00
smoogipoo
406ec6e92d Make OsuSliderBar always use number of digits from precision 2018-02-07 13:26:17 +09:00
tgi74000
bcd568e607 Check for possible null ranks 2018-02-06 23:00:52 +01:00
tgi74000
d86ce816c7 Add support for country rank 2018-02-06 21:40:52 +01:00
Shane Woolcock
e0c52c69cf Prevent revert-to-default OnHover from hiding visual settings at beatmap load 2018-02-06 22:31:30 +10:30
Dan Balasescu
b46c388b4c
Merge branch 'master' into fix-skip-button 2018-02-06 14:50:37 +09:00
Dean Herbert
9bfec9b233 Tidy up state change logic 2018-02-06 14:30:01 +09:00
smoogipoo
3fe3123cdc Merge branch 'master' into ismaskedaway-fix 2018-02-06 14:29:52 +09:00
Dean Herbert
dd8955cd90 Fix skip button not receiving screen-wide input 2018-02-06 14:29:03 +09:00
Dean Herbert
dfc344b47a Update OpenTK version 2018-02-06 13:47:54 +09:00
Dean Herbert
30b9439263 Fix default mouse sensitivity not reverting correctly 2018-02-05 20:00:36 +09:00
Dean Herbert
7e56519d6a Add setting for absolute input mapping 2018-02-05 16:13:39 +09:00
Dean Herbert
6b35ef7063 Update OpenTK version 2018-02-05 16:13:30 +09:00
Imnooby
c4f3223e34 Stops non-url text from being hyperlinks 
Fixed crash when you attempted to click one
 2018-02-03 18:24:49 -06:00
smoogipoo
9225e883c1 Add + use HalfHitWindow 2018-02-02 20:29:50 +09:00
smoogipoo
6976347d64 Protect hit window values 2018-02-02 20:28:59 +09:00
smoogipoo
e45b26c742 Cleanup/minify HitWindows 2018-02-02 19:35:44 +09:00
smoogipoo
d371425c87 BAD -> MEH 2018-02-02 18:56:44 +09:00
smoogipoo
70462ebee3 Make HitWindows settable by derived HitObjects 2018-02-02 18:53:05 +09:00
smoogipoo
acf20c079c General improvements around usage of HitWindows for mania 2018-02-02 18:47:54 +09:00
smoogipoo
558c53a6ba Give HitObject some HitWindows 2018-02-02 18:47:10 +09:00
smoogipoo
a0c1662fb7 Move mania's HitWindows to osu.Game 2018-02-02 17:52:55 +09:00
smoogipoo
75858bd3de Update in-line with framework changes 2018-02-02 15:41:54 +09:00
Dean Herbert
39160d895c Update design of "revert to default" button 
Also fixes some inconsistencies in padding
 2018-02-02 15:18:39 +09:00
Dan Balasescu
2c45fc67a4
Merge branch 'master' into PlayerSettigsOverlay_InputHandle 2018-02-02 11:12:33 +09:00
tgi74000
b0fbae9dfc Fix PlayerSettingsOverlay not reappearing when Hidden 2018-02-01 16:07:49 +01:00
tgi74000
e08a9350a0 Store and show SSPlus and SPlus statistics 2018-02-01 15:19:49 +01:00
Dean Herbert
5ba84a67f1
Merge branch 'master' into catmull-sliders 2018-02-01 20:58:33 +09:00
Dan Balasescu
c486609174
Merge branch 'master' into fix-replay-time-stop 2018-02-01 20:08:58 +09:00
smoogipoo
13f16077d4 Implement Catmull-Rom curve approximator 2018-02-01 20:04:41 +09:00
Dean Herbert
9d4ec6f8b5 Merge branch 'master' into ismaskedaway-input-fix 2018-02-01 19:29:10 +09:00
Dean Herbert
1d687c470c Fix clock not incrementing beyond last frame of replay 2018-02-01 18:49:14 +09:00
Dean Herbert
1cc7c23982 Hits -> JudgedHits 2018-02-01 18:08:15 +09:00
Dan Balasescu
c1d5a68e4d
Merge branch 'master' into VisualSettingsOverlay 2018-02-01 16:37:04 +09:00
Dan Balasescu
0589708da5
Merge branch 'master' into inactive-volume-duck 2018-02-01 16:21:33 +09:00
Dan Balasescu
d332a2dddd
Merge branch 'master' into url-parsing-support 2018-02-01 16:13:32 +09:00
smoogipoo
1b99e54005 Fix IsMaskedAway not being up-to-date when fastfowarding replays 2018-02-01 15:21:23 +09:00
Dean Herbert
cd37be9440
Merge branch 'master' into better-slider-objects 2018-02-01 08:39:39 +09:00
Dean Herbert
cdf4d9b033 Remove empty line 2018-01-31 18:33:18 +09:00
Dean Herbert
46a7de1845
Merge branch 'master' into fix-taiko-fastforwarding 2018-01-31 18:30:41 +09:00
Dean Herbert
888d2362fd
Merge branch 'master' into fix-taiko-fastforwarding 2018-01-31 18:30:15 +09:00
Dean Herbert
335f0d577c Add the ability to duck volume when the game is inactive 2018-01-31 18:16:55 +09:00
Dean Herbert
fef69cea04 Revert "Add volume ducking" 
This reverts commit 01325de3a2897a24b2ba0f585d7e976d0fb44b70.
 2018-01-31 18:12:25 +09:00
Dean Herbert
47b92f3d1d Fix mute button not prolonging volume control display 2018-01-31 18:00:44 +09:00
Dean Herbert
93ffa1f8a2 Fix button alignment and animation 2018-01-31 17:36:53 +09:00
Dean Herbert
86f5c9d6f1 Add inactive volume ducking, rather than outright mute 2018-01-31 16:57:26 +09:00
Dean Herbert
97ae44f23c Remove outwards exposure of mute property 2018-01-31 16:56:26 +09:00
Dean Herbert
2865dd3a10 Replace missed hardcoded int with enum reference 2018-01-31 16:20:01 +09:00
Dean Herbert
5a99651561 Remove unnecessary arrays 2018-01-31 16:10:55 +09:00
Dean Herbert
042a34e1c2 Add migration to ensure database aligns to changed enum 2018-01-31 16:10:48 +09:00
Dean Herbert
b47061f43d Merge remote-tracking branch 'upstream/master' into mute-toggle 2018-01-31 14:20:15 +09:00
Dean Herbert
a94b4a9ea0
Merge branch 'master' into url-parsing-support 2018-01-30 18:55:50 +09:00
Dean Herbert
df65443f07 Merge branch 'master' 
Conflicts:
	osu-framework
	osu.Game/Screens/Play/Player.cs
 2018-01-30 18:31:03 +09:00
Dean Herbert
28b67e3d77
Merge branch 'master' into url-parsing-support 2018-01-30 17:47:55 +09:00
Dean Herbert
53129e5235 Fix text getting truncated after last link in chat line 2018-01-30 17:47:22 +09:00
Dean Herbert
e5188fd151 Add better channel test cases (testing non-existent channels) 2018-01-30 17:43:19 +09:00
Dean Herbert
d81d884a01 Remove unnecessary paren handling from regex 
Can't find a reason for this to exist
 2018-01-30 17:16:01 +09:00
Dean Herbert
662c7c5bdc Fix osump links 2018-01-30 16:44:43 +09:00
Dean Herbert
dd2731b873 Add support for markdown style links 2018-01-30 16:38:45 +09:00
smoogipoo
c97ea3ed60 Post-process beatmap before applying defaults 2018-01-30 15:49:55 +09:00
smoogipoo
b4cd8ea716 GlobalKeyBindingContainer -> GlobalActionContainer 
Consitent with "FrameworkActionContainer".
 2018-01-30 14:54:30 +09:00
smoogipoo
ef3fb8c05a InputManager -> Container where KeyBindings are involved 2018-01-30 14:49:12 +09:00
Dean Herbert
df221b6786 Remove usage of ValueTuple to allow for dynamic recompilation 2018-01-29 17:45:23 +09:00
Dan Balasescu
2bae22999d
Merge branch 'master' into global-mod-binding 2018-01-29 15:18:11 +09:00
Dean Herbert
6e0cb1adb3 Remove redundant arguments 2018-01-29 15:05:07 +09:00
Dan Balasescu
ea0ef96557
Merge branch 'master' into global-mod-binding 2018-01-29 15:04:20 +09:00
Dean Herbert
0879366a30 Merge remote-tracking branch 'upstream/master' into add-r#-annotation-support 2018-01-29 13:52:21 +09:00
Dean Herbert
2b14438fe4 Merge remote-tracking branch 'upstream/master' into url-parsing-support 2018-01-29 12:55:32 +09:00
Dean Herbert
247833174c Fix incorrect case on migration file 2018-01-27 23:20:49 +09:00
Dean Herbert
a5b0d51205 Merge remote-tracking branch 'upstream/master' into url-parsing-support 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2018-01-27 14:06:58 +09:00
TocoToucan
ce4122b3c4 Display visual settings overlay on PlayerLoader screen 2018-01-26 23:29:54 +03:00
TocoToucan
d82835107c Remove autohide and clock related logic from Visual settings overlay 2018-01-26 22:20:24 +03:00
TocoToucan
615c831069 Merge from ppy/master 2018-01-26 21:56:17 +03:00
FreezyLemon
8f0ab2040f Add Jetbrains.Annotations NuGet package 2018-01-26 12:46:28 +01:00
Dean Herbert
7852015db3 Remember mod selection when re-entering song select 
Removes mod application when exiting back to main menu.

Alternative to #1968.
Closes #1961.
 2018-01-26 19:32:57 +09:00
smoogipoo
5742e61e68 Merge remote-tracking branch 'origin/master' into ruleset-configs 2018-01-26 15:39:09 +09:00
smoogipoo
929a710dfc Merge remote-tracking branch 'peppy/databased-config' into ruleset-configs 2018-01-26 15:37:57 +09:00
Dan Balasescu
81c759f1e1
Make field readonly 2018-01-26 15:17:56 +09:00
smoogipoo
0a505dde2e Remove MaskingAffectsInput override 2018-01-26 14:47:16 +09:00
Dean Herbert
7a2420ead2 Fix a couple of regressions 2018-01-26 08:21:09 +09:00
Dean Herbert
03154dbc63 Fix incorrect initial migration 
Also adds variant to settings
 2018-01-25 23:41:03 +09:00
Dean Herbert
80b8780f56 Revert "Remove game-wise settings store for the time being" 
This reverts commit 72df2c681b.
 2018-01-25 18:08:50 +09:00
smoogipoo
57cd50c45e Reorder the way input is handled for replays 
Fixes https://github.com/ppy/osu/issues/1625 .
 2018-01-25 17:39:50 +09:00
Dean Herbert
fd7d7c3953
Merge branch 'master' into MakeMusicControllerDraggableAgain 2018-01-25 09:01:54 +09:00
Dean Herbert
b06f60ac3f
Merge branch 'master' into fix-settings 2018-01-25 07:17:21 +09:00
Dean Herbert
284ff226b1
Merge branch 'master' into local-name-fix 2018-01-25 06:50:28 +09:00
TocoToucan
51e188401f Make MusicController draggable again 2018-01-25 00:38:22 +03:00
Dean Herbert
df43b7d84e
Merge branch 'master' into fix-settings 2018-01-25 01:21:41 +09:00
Dean Herbert
1e80908022
Merge branch 'master' into fix-settings 2018-01-25 01:19:44 +09:00
smoogipoo
b77f08941c Make mania play the next note's sounds if no note is hit 
Fixes #1911.

This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.
 2018-01-24 20:05:37 +09:00
Dean Herbert
53c6526b22 Remove unused code file 2018-01-24 18:04:54 +09:00
Dean Herbert
72df2c681b Remove game-wise settings store for the time being 2018-01-24 18:01:39 +09:00
Dean Herbert
29e98a58f2 Combine Setting and DatabasedSetting 2018-01-24 17:59:49 +09:00