4618 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
EVAST9919	4d0d27aa88	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 15:25:48 +03:00
Dan Balasescu	9e9df4ada5	Merge pull request #788 from smoogipooo/mania-beatmap-conversion ... Mania beatmap conversion	2017-05-19 21:18:21 +09:00
Dean Herbert	da31d129ee	Merge branch 'master' into mania-beatmap-conversion	2017-05-19 18:18:59 +09:00
smoogipooo	7b05930fc2	Revert "Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects." ... This reverts commit 6821197a6a.	2017-05-19 17:38:06 +09:00
smoogipooo	860b607f45	A bit more cleanup.	2017-05-19 16:49:05 +09:00
smoogipooo	1cb3fc7262	Oops fix unused using.	2017-05-19 16:45:06 +09:00
smoogipooo	6821197a6a	Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects.	2017-05-19 16:40:01 +09:00
smoogipooo	2cea5f0fa3	Add comments.	2017-05-19 16:39:02 +09:00
Dean Herbert	1390cb5550	Merge pull request #799 from peppy/fix-early-inactive-pause ... Fix audio beginning to play when potentially paused due to inactive window	2017-05-19 16:32:11 +09:00
smoogipooo	9191c4f3e3	Remove LegacyBeatmapConverter.	2017-05-19 16:31:56 +09:00
Dean Herbert	36b628bbcc	Merge branch 'master' into fix-early-inactive-pause	2017-05-19 16:21:20 +09:00
Dean Herbert	069569fefd	Merge pull request #797 from peppy/fix-unnecessary-seeks ... Fix audio seeking when entering play mode in certain cases	2017-05-19 16:21:15 +09:00
smoogipooo	67cf64062a	Add flag to determine whether the beatmap requested for conversion is for the current ruleset.	2017-05-19 16:02:40 +09:00
Dan Balasescu	0e469feb17	Merge branch 'master' into fix-unnecessary-seeks	2017-05-19 15:10:13 +09:00
Dan Balasescu	a43b122914	Merge pull request #796 from peppy/allow-searching-author ... Add support for searching beatmap author at song select	2017-05-19 15:10:03 +09:00
Dan Balasescu	f2cbba48ef	Merge branch 'master' into allow-searching-author	2017-05-19 15:05:22 +09:00
Dean Herbert	01398fae56	Merge pull request #787 from MrTheMake/auto-fix ... Fixes the auto mod not hitting stacks of notes on certain maps.	2017-05-19 14:26:42 +09:00
Dean Herbert	85339ace02	Merge branch 'master' into auto-fix	2017-05-19 13:54:32 +09:00
Dean Herbert	bfd37d0350	Fix audio beginning to play when potentially paused due to inactive window ... Also removes all usage of Delay() in Player. Resolves #793.	2017-05-19 13:53:09 +09:00
Dean Herbert	5ae3a7143e	Fix audio seeking when entering play mode in certain cases ... Resolves #794	2017-05-19 13:23:11 +09:00
Dean Herbert	c51d640241	Add support for searching beatmap author at song select ... Resolves #792	2017-05-19 13:13:27 +09:00
EVAST9919	bbe0abbe04	removed forgotten file	2017-05-19 06:48:31 +03:00
EVAST9919	91b081f0b2	Change visibility on ctrl+h	2017-05-19 06:41:33 +03:00
EVAST9919	e18f95185f	More constants	2017-05-19 06:39:39 +03:00
EVAST9919	c3647e4056	dropdown-like animation	2017-05-19 06:26:54 +03:00
EVAST9919	f2af31aceb	Naming fixes	2017-05-18 20:21:58 +03:00
EVAST9919	a1b90ee70e	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 18:26:38 +03:00
Dean Herbert	9b8d7745c7	Merge pull request #791 from peppy/spinner-refresh ... Spinner design refresh	2017-05-18 22:37:45 +09:00
Dean Herbert	3004a44b98	Further colour adjustments	2017-05-18 22:21:41 +09:00
Dean Herbert	c78dfb4a13	Oops colours were wrong	2017-05-18 21:56:19 +09:00
Dean Herbert	e3ae2bca6d	Design improvements ... paired with smoogi	2017-05-18 21:38:19 +09:00
Dean Herbert	4100c4fe9f	Fix order of methods	2017-05-18 21:04:09 +09:00
Dean Herbert	ae676b48b2	Fix whitespace	2017-05-18 19:51:45 +09:00
Dean Herbert	9cd41c0e87	Spinner design refresh	2017-05-18 19:42:20 +09:00
Dean Herbert	f112546085	Don't load a mode when opening TestCaseHitObjects	2017-05-18 19:42:20 +09:00
smoogipooo	4e8ead9cf4	Fix possible nullref.	2017-05-18 19:05:03 +09:00
smoogipooo	c80e2e8f0a	Attempt to solve warnings...	2017-05-18 18:46:50 +09:00
smoogipooo	af129b3eab	Add siblings, will be used in generator branches.	2017-05-18 18:13:08 +09:00
smoogipooo	afd3eb4b8d	Implement things a bit more to remove warnings.	2017-05-18 18:04:32 +09:00
EVAST9919	640c940fce	Make field readonly	2017-05-18 11:50:15 +03:00
EVAST9919	1d80555d3b	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 11:47:52 +03:00
smoogipooo	873ff34487	This function can't be used for all pattern generations. So let's not use it.	2017-05-18 17:43:59 +09:00
EVAST9919	83a89ce22d	options -> settings	2017-05-18 11:39:22 +03:00
smoogipooo	af34777f44	Trim whitespace.	2017-05-18 17:00:11 +09:00
Dan Balasescu	f7a1b21e77	Merge branch 'master' into mania-beatmap-conversion	2017-05-18 15:44:32 +09:00
smoogipooo	164a1bb743	Remove distance object pattern generator for now (next PR).	2017-05-18 15:38:15 +09:00
Dean Herbert	dc5a9eb740	Merge pull request #775 from smoogipooo/fast-random ... Add FastRandom class for use in beatmap conversion.	2017-05-18 15:38:14 +09:00
Dean Herbert	521a0d8d04	Merge branch 'master' into fast-random	2017-05-18 15:33:00 +09:00
smoogipooo	1fa1897d71	Define the concept of patterns + additional comments.	2017-05-18 15:05:45 +09:00
smoogipooo	618c162535	Move more functions to ObjectConversion + resharper cleanup.	2017-05-18 14:17:23 +09:00