10487 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Manis	530e0afa2c	Use IsCurrentScreen instead of a bool for both checks now.	2018-01-21 22:27:15 -05:00
Michael Manis	964c6da9a4	Use IsCurrentScreen instead of a bool	2018-01-21 22:00:18 -05:00
Michael Manis	806da21760	Removed rreduntant initialization.	2018-01-21 20:24:19 -05:00
Michael Manis	ad2df8d8df	Fixed tilde-key crash at end of beatmap.	2018-01-21 20:09:44 -05:00
TocoToucan	e88f514cf4	Resolve merge conflicts	2018-01-21 18:32:21 +03:00
TocoToucan	4875443e12	Resolve merge conflicts	2018-01-21 18:11:43 +03:00
aQaTL	c4feb67bce	Using field properties to set mute / unmute instead of separate methods	2018-01-20 11:45:04 +01:00
Shawdooow	29466438a3	fix values	2018-01-19 20:58:43 -05:00
Shawdooow	c29eea870d	correct values	2018-01-19 20:56:41 -05:00
Aergwyn	596044e19d	show beatmapsets with pending deletion in osu!direct	2018-01-19 17:25:32 +01:00
Shawdooow	e109d5fe20	fix slider heads	2018-01-19 11:13:49 -05:00
Shawdooow	4d1142a0ce	overall difficulty	2018-01-19 11:11:28 -05:00
Shawdooow	f0dbf2e18c	Merge remote-tracking branch 'refs/remotes/ppy/master'	2018-01-19 11:04:17 -05:00
為什麼	feb79ff9e7	Merge branch 'master' into mania_stage_fix	2018-01-19 20:08:24 +08:00
Dean Herbert	652f273961	Ensure previews stop playing when they are removed from the draw hierarchy	2018-01-19 15:46:42 +09:00
aQaTL	4a85266fca	Using BindableBool to mute the volume when it's value changes	2018-01-18 17:23:02 +01:00
Dan Balasescu	64c32f5715	Merge pull request #1926 from Aergwyn/preview-fixes ... Minor preview fixes	2018-01-19 00:12:41 +09:00
Dan Balasescu	250e936099	Merge branch 'master' into preview-fixes	2018-01-19 00:03:47 +09:00
Aergwyn	56619ae926	use ternary expression	2018-01-18 15:53:53 +01:00
Dan Balasescu	66c1568fd2	Merge pull request #1934 from peppy/fix-repeat-point-snaking ... Fix repeat points not following slider snaking correctly	2018-01-18 23:52:46 +09:00
smoogipoo	6908597b95	Fix inverted ternary ... See #1935 - repeat index 1 is at the end of the slider, not the start.	2018-01-18 23:44:00 +09:00
Dan Balasescu	46ba2cda10	Remove unused using	2018-01-18 21:19:06 +09:00
Dean Herbert	1a83770a06	Fix incorrect math	2018-01-18 21:16:15 +09:00
Dean Herbert	065d2a4887	Add licence header	2018-01-18 21:12:53 +09:00
Dean Herbert	01ff1584c2	Fix repeat points not following slider snaking correctly	2018-01-18 21:06:47 +09:00
Dan Balasescu	cc6f541374	Merge pull request #1932 from peppy/fix-slider-tick-sample-doubling ... Fix slider samples playing twice when additions are present	2018-01-18 20:58:50 +09:00
Dean Herbert	e2965e1682	Remove unused using	2018-01-18 20:46:57 +09:00
Dean Herbert	063767e381	Prioritise hit normal ... It's always first but not strictly guaranteed anywhere yet.	2018-01-18 20:37:46 +09:00
Dean Herbert	97884e1d05	Remove unnecessary null checks	2018-01-18 19:57:49 +09:00
Dean Herbert	b4f2bea37b	Fix slider samples playing twice when additions are present	2018-01-18 19:50:26 +09:00
smoogipoo	a94ea7025e	Register/Unregister -> BeginTracking/StopTracking and add exceptions	2018-01-18 18:45:48 +09:00
Dan Balasescu	754f3216ab	Merge pull request #1928 from peppy/stop-direct-previews ... Stop any playing preview when closing the direct overlay	2018-01-18 18:25:30 +09:00
smoogipoo	dee298c395	No more statics + better unregistration	2018-01-18 17:40:05 +09:00
Dean Herbert	7ceed8b5eb	Stop any playing preview when closing the direct overlay ... Resolves #1925	2018-01-18 17:28:56 +09:00
smoogipoo	89f4bfa7b5	Track mania scroll speed	2018-01-18 17:00:41 +09:00
smoogipoo	7910b47868	Move ConfigManager registration/dependency injection to RulesetContainer	2018-01-18 17:00:23 +09:00
smoogipoo	c2c478750d	Remove generics from OSD registration methods	2018-01-18 16:57:32 +09:00
smoogipoo	09dfea7e29	Use tracked settings from ConfigManager changes	2018-01-18 15:26:03 +09:00
aQaTL	9c09b33e4e	Removed no longer used "lastVolume" field	2018-01-17 23:17:59 +01:00
aQaTL	18ff57fdf9	Inline changing mute icon properties with object creation	2018-01-17 21:09:46 +01:00
aQaTL	8471a579e0	Removed no longer neccessary "exiting" flag	2018-01-17 20:56:44 +01:00
aQaTL	a8fb732256	Added muted/unmuted icon	2018-01-17 20:43:08 +01:00
Aergwyn	65bac6d31a	return preview instead of nothing if it exists already ... allows listening to it again after reaching the end	2018-01-17 20:36:47 +01:00
Aergwyn	f86cb30e47	prevent negative width on progress bar	2018-01-17 20:35:28 +01:00
ANDY840119-PC\andy840119	6c67f96fdb	fix ci error	2018-01-18 02:01:01 +09:00
Dean Herbert	95a1556376	Merge pull request #1923 from smoogipoo/fix-replays ... A lot of fixes to replay playback	2018-01-18 01:36:58 +09:00
aQaTL	1440edbf8b	Use AudioManager adjustments to mute volume	2018-01-17 17:15:13 +01:00
Dean Herbert	864d106635	Merge branch 'master' into fix-replays	2018-01-18 00:49:02 +09:00
Dan Balasescu	afb55b5c43	Merge pull request #1924 from peppy/mute-global-track-when-preview ... Mute global track volume when a beatmap preview is playing	2018-01-18 00:48:46 +09:00
smoogipoo	a05032779f	Remove unneeded event binding	2018-01-18 00:04:33 +09:00