6640 Commits

Author	SHA1	Message	Date
Dean Herbert	cd37be9440	Merge branch 'master' into better-slider-objects	2018-02-01 08:39:39 +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	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	df65443f07	Merge branch 'master' ... Conflicts: osu-framework osu.Game/Screens/Play/Player.cs	2018-01-30 18:31:03 +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
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	247833174c	Fix incorrect case on migration file	2018-01-27 23:20:49 +09: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 72df2c681b6c63a32b9d3da4c23bbed9c0613f6c.	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
smoogipoo	8d11596b2f	Minor cleanups	2018-01-24 17:48:42 +09:00
Dean Herbert	aa913f6de5	Merge branch 'master' into ruleset-configs	2018-01-24 17:45:47 +09:00
Dean Herbert	5a00ae36d1	Add database-based configuration for rulesets	2018-01-24 17:45:28 +09:00
smoogipoo	7f299b2533	Merge remote-tracking branch 'origin/master' into RefactorPlayerOverlaysInitialization	2018-01-24 17:44:28 +09:00
Aergwyn	205d3ed896	fix settings not getting injected	2018-01-23 19:42:21 +01:00
Michael Manis	6dfd0b5cc2	Unnecessary because of prior commit.	2018-01-23 10:55:22 -05:00
Michael Manis	d12e18d59b	merged with master	2018-01-23 10:50:57 -05:00
james58899	fa800f0977	fix storyboard path	2018-01-23 18:18:54 +08:00
Dean Herbert	b197cd56af	Allow DI'd OnScreenDisplay to be null	2018-01-23 16:42:31 +09:00