4819 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Huo Yaoyuan	da47b0a260	Fix margin and offset calculating.	2017-05-21 02:11:55 +08:00
MrTheMake	031fddc995	Fix current beatmap track is started again when entering songselect and changing to another difficulty from the same beatmap set.	2017-05-20 19:53:18 +02:00
Dean Herbert	3ff5c271ea	Merge branch 'master' into replay-no-pausing	2017-05-21 02:00:00 +09:00
MrTheMake	57b9ed0f54	Do not pause a running replay if the window is not focused.	2017-05-20 18:56:50 +02:00
ColdVolcano	07d148f708	Merge branch 'master' of ppy/osu into beat-syncing	2017-05-20 11:46:51 -05:00
Dean Herbert	82f2927f1a	Merge pull request #808 from DrabWeb/playlist-item-paragraph ... Make PlaylistItem use Paragraphs	2017-05-20 15:54:54 +09:00
Dean Herbert	fb72693c96	Merge branch 'master' into playlist-item-paragraph	2017-05-20 15:47:54 +09:00
Dean Herbert	808f5c3ae3	Merge pull request #807 from DrabWeb/mod-tooltips ... Mod button tooltips	2017-05-20 15:46:34 +09:00
DrabWeb	995a573b9c	@"" -> string.Empty	2017-05-20 03:22:37 -03:00
DrabWeb	7485a78128	Update framework	2017-05-20 03:14:22 -03:00
DrabWeb	139b03a1ce	Only recreate text once per unicode option change	2017-05-20 02:05:13 -03:00
DrabWeb	43bd0f686b	Fix artist being the opposite value	2017-05-20 01:25:42 -03:00
DrabWeb	48417beb81	Unused using directive	2017-05-20 01:22:33 -03:00
DrabWeb	615082d757	Remove whitespace	2017-05-20 01:17:04 -03:00
DrabWeb	dcc3dbf5e2	Make PlaylistItem use Paragraphs	2017-05-20 01:11:20 -03:00
DrabWeb	bfedd42ca4	Add mod tooltips	2017-05-19 23:56:48 -03:00
Huo Yaoyuan	ecc222c043	Allow custom SectionsContainer.	2017-05-20 07:20:46 +08:00
Huo Yaoyuan	473441dfd4	Fix fields being null.	2017-05-20 07:07:27 +08:00
Huo Yaoyuan	e06c917c95	Selection support of SectionsContainer.	2017-05-20 06:39:01 +08:00
Huo Yaoyuan	058c5e18a4	Scrolling support for SectionsContainer.	2017-05-20 05:48:40 +08:00
Huo Yaoyuan	24a813e907	Basic children management of SectionsContainer.	2017-05-20 05:15:57 +08:00
Dean Herbert	5d818620c9	Merge pull request #804 from peppy/debug-config-rename ... FrameworkDebugConfig -> DebugSetting	2017-05-20 01:44:40 +09:00
Dean Herbert	c2572eea27	Merge branch 'master' into debug-config-rename	2017-05-20 01:15:55 +09:00
Dean Herbert	c33f418c02	Merge pull request #801 from peppy/skip-redesign ... Skip button redesign & refactor	2017-05-20 01:15:43 +09:00
Dean Herbert	a34d9d8b09	Oops	2017-05-20 01:14:51 +09:00
Dean Herbert	9c9c0a64fd	Merge branch 'master' into debug-config-rename	2017-05-20 00:45:16 +09:00
Dean Herbert	9aca8fc843	Update framework	2017-05-20 00:43:17 +09:00
Dean Herbert	561b517dec	Merge branch 'master' into skip-redesign	2017-05-20 00:42:04 +09:00
Dan Balasescu	fb1bd7b3e5	Merge pull request #803 from peppy/osd-fixes ... Minor visual fixes for OSD	2017-05-20 00:35:37 +09:00
Dan Balasescu	7e8ffe8f34	Merge branch 'master' into osd-fixes	2017-05-20 00:12:10 +09:00
Dan Balasescu	14647a0e5f	Merge pull request #802 from peppy/debug-log-option ... Add setting checkbox to toggle debug logs	2017-05-20 00:11:39 +09:00
Dean Herbert	528d79be51	FrameworkDebugConfig -> DebugSetting	2017-05-19 22:53:26 +09:00
Dean Herbert	0332348b24	Correctly display default audio device on OSD	2017-05-19 22:51:09 +09:00
Dean Herbert	5bcef91b89	Add padding to setting value on on screen display ... Long audio device names were destroying all padding.	2017-05-19 22:49:47 +09:00
Dean Herbert	04f7acb68a	Add setting checkbox to toggle debug logs	2017-05-19 22:47:15 +09:00
Dean Herbert	674731f9bb	Add sound back to skip action	2017-05-19 22:23:48 +09:00
Dean Herbert	60f960aafd	Fix audio clock breakage.	2017-05-19 22:19:20 +09:00
Dean Herbert	20156d26f9	Don't rely on parent's clock	2017-05-19 22:12:09 +09:00
Dean Herbert	aef82acb0d	Update skip button design	2017-05-19 21:54:14 +09:00
Dan Balasescu	ff0d32bda5	Merge branch 'master' into mania-distance-object-conversion	2017-05-19 21:18:51 +09:00
Dan Balasescu	9e9df4ada5	Merge pull request #788 from smoogipooo/mania-beatmap-conversion ... Mania beatmap conversion	2017-05-19 21:18:21 +09:00
smoogipooo	8d94c2ef8b	Fix CI errors (for now).	2017-05-19 21:17:14 +09:00
smoogipooo	f8270f31a9	Fix build errors.	2017-05-19 21:15:29 +09:00
smoogipooo	6ab7a91415	Add generator to generate patterns from HitObjects.	2017-05-19 20:57:20 +09:00
Dean Herbert	da31d129ee	Merge branch 'master' into mania-beatmap-conversion	2017-05-19 18:18:59 +09:00
Dean Herbert	a7d16ac213	Move skip logic to inside SkipButton	2017-05-19 18:18:21 +09:00
smoogipooo	e76cb4cc31	Update to match base branch.	2017-05-19 17:51:59 +09:00
smoogipooo	0a596ef1e4	Merge branch 'mania-beatmap-conversion' into mania-endtime-object-conversion ... # Conflicts: # osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs	2017-05-19 17:50:19 +09:00
smoogipooo	90270ac586	Update to match base branch.	2017-05-19 17:48:23 +09:00
smoogipooo	5d8f0a4707	Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion ... # Conflicts: # osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs	2017-05-19 17:42:24 +09:00