2183 Commits

Author	SHA1	Message	Date
Huo Yaoyuan	9b1e010dcc	Fix filename mismatch.	2017-04-06 16:05:41 +08:00
smoogipooo	0107772737	Fix using.	2017-04-06 16:25:46 +09:00
Dan Balasescu	6fc1384927	Merge branch 'master' into taiko-fixes	2017-04-06 16:23:22 +09:00
Dean Herbert	1942ef9e8f	Fix merge fail.	2017-04-06 16:06:02 +09:00
Dean Herbert	4783d17d94	Merge branch 'master' into better-hitsounds	2017-04-06 16:00:56 +09:00
smoogipooo	cec8bca78a	Implement IJsonSerializable, BeatmapInfo IJsonSerializable.	2017-04-06 15:54:50 +09:00
Dean Herbert	7c63c8394b	Remove unnecessary depth setting.	2017-04-06 15:36:03 +09:00
Dean Herbert	a18367454d	InGameOverlay -> MenuOverlay.	2017-04-06 15:34:52 +09:00
Dean Herbert	856696b17e	Fix incorrect verbatim strings.	2017-04-06 15:31:21 +09:00
Dean Herbert	6285f3eea8	Merge branch 'master' into pause_buttons_refactor	2017-04-06 15:00:48 +09:00
smoogipooo	37129bf03d	Make combo be changed by the base ScoreProcessor.	2017-04-06 14:37:21 +09:00
Dean Herbert	2bb99eac72	fix typo	2017-04-06 14:27:23 +09:00
Dean Herbert	efe82ef88c	Merge branch 'master' into hud_visibility	2017-04-06 13:40:10 +09:00
Dean Herbert	18ff8efd46	Mark TODO for BeatmapVersion.	2017-04-06 13:15:33 +09:00
Dean Herbert	f193af2a2a	Add better defaults for BaseDifficulty.	2017-04-06 13:15:21 +09:00
Dean Herbert	c50960af63	Add better defaults for ControlPoint.	2017-04-06 13:15:12 +09:00
Dan Balasescu	326baae615	Merge branch 'master' into taiko-wtf	2017-04-06 12:30:44 +09:00
smoogipooo	982dbb5bba	Cleanup + bow down to resharper.	2017-04-06 12:27:35 +09:00
smoogipooo	73e2ddaf26	Revert DrawableHitObject changes, make them less conflicting.	2017-04-06 12:24:17 +09:00
smoogipooo	4cc309e5a7	Make hit sounds into consts.	2017-04-06 12:14:06 +09:00
smoogipooo	c65ab5b6f1	General cleanup.	2017-04-06 11:56:19 +09:00
smoogipooo	acfcd30cc6	Simplify lambda.	2017-04-06 11:51:04 +09:00
smoogipooo	5beab4c43d	Absolute default bank should be normal.	2017-04-06 11:48:48 +09:00
smoogipooo	c73d6a52ec	Add a few comments.	2017-04-06 11:47:54 +09:00
smoogipooo	eb82a4c090	Back to using SampleInfo + fix taiko beatmap conversion.	2017-04-06 11:41:16 +09:00
Dean Herbert	863dc44c4d	Some minor improvements.	2017-04-06 09:57:34 +09:00
Dean Herbert	8354fb5eb5	Fix judgements being constructed too late.	2017-04-06 09:57:12 +09:00
smoogipooo	e903241c7b	Implement sample + addition sample reading from hit objects.	2017-04-06 09:43:47 +09:00
Andrey Zavadskiy	0946e42363	removed useless stuff	2017-04-05 22:51:43 +03:00
Andrey Zavadskiy	6a510097df	InGameOverlay fixes	2017-04-05 22:36:03 +03:00
smoogipooo	1ef465716d	Proper legacy timing point parsing.	2017-04-05 21:59:40 +09:00
smoogipooo	d607207b69	Ability to contain multiple sample banks. Get default bank name from control point.	2017-04-05 21:59:07 +09:00
smoogipooo	8d720e39c6	Going forward, explicit ToLower should not be needed.	2017-04-05 21:39:09 +09:00
smoogipooo	2d8239a3f7	Re-implement the SampleBank/Sample structure. No parsing support yet.	2017-04-05 21:34:28 +09:00
Dean Herbert	4aafc172ca	Allow playfield to specify whether it has a cursor or not.	2017-04-05 17:38:57 +09:00
Dean Herbert	4b1588a21d	Fix correct mode filter not being applied when first entering song select.	2017-04-05 17:33:19 +09:00
Dean Herbert	8173d01d78	Fix crash on changing play mode too early.	2017-04-05 17:26:45 +09:00
Dean Herbert	6a922da87e	Move legacy_velocity_multiplier application to LegacyTimingInfo.	2017-04-05 12:05:48 +09:00
Andrey Zavadskiy	c4c8604afd	A little change to woke up AppVeyor	2017-04-04 19:06:53 +03:00
Andrey Zavadskiy	f2a9ec0f24	Converted constructor to protected	2017-04-04 19:02:36 +03:00
Andrey Zavadskiy	7b95f2d46a	InGameOverlay now is abstract	2017-04-04 18:53:13 +03:00
Andrey Zavadskiy	62655b70c9	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-04-04 18:41:37 +03:00
Andrey Zavadskiy	bec4bf36ac	hud->content and style fixes	2017-04-04 17:47:41 +03:00
Andrey Zavadskiy	009909dd4b	Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility	2017-04-04 17:39:53 +03:00
smoogipooo	1d4a371ded	A few general fixes.	2017-04-04 14:38:50 +09:00
smoogipooo	5e67bcb581	Remove a few unused classes.	2017-04-04 13:14:45 +09:00
smoogipooo	4b424263ce	Fully parse control points.	2017-04-04 13:13:27 +09:00
Dean Herbert	1233fb5b82	Split noto out into individual ranges.	2017-04-04 11:34:55 +09:00
Dean Herbert	c6216dbde1	Remove outdated todo.	2017-04-04 11:34:45 +09:00
Dean Herbert	7c74951454	Update bindables. ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCaseResults.cs # osu.Game/Screens/Ranking/ResultModeButton.cs # osu.Game/Screens/Ranking/Results.cs	2017-04-04 11:34:13 +09:00