4930 Commits

Author	SHA1	Message	Date
Dean Herbert	06a655af5d	Move initial position of KeyCounter upwards.	2017-04-07 20:51:37 +09:00
Dean Herbert	0d4f457265	Improve transitions when exiting play mode.	2017-04-07 20:46:35 +09:00
Dean Herbert	54d1afb655	Fade in HitRenderer post entering animation.	2017-04-07 20:38:57 +09:00
Dean Herbert	39175905e4	Fix crashes on completing a taiko map (where a strong his is the last hit in the map).	2017-04-07 16:56:09 +09:00
Dean Herbert	7e99fc47e2	wip	2017-04-07 16:54:54 +09:00
smoogipooo	a9d938e7ed	Fix brace style.	2017-04-07 15:57:00 +09:00
Dean Herbert	06776443eb	Merge branch 'music-controller-improvements' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-07 15:49:14 +09:00
Dean Herbert	2c2a4169c6	Better structure for button layout.	2017-04-07 15:28:18 +09:00
Dean Herbert	7d2af9310b	Expose DragBar's seeking property.	2017-04-07 15:23:03 +09:00
Dean Herbert	3dbf4879c7	Merge branch 'music-controller-improvements' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-07 15:18:58 +09:00
Dean Herbert	361e187949	Temporarily disable button scaling.	2017-04-07 14:33:58 +09:00
Dean Herbert	fa28e7bdc3	Improve clickability and visuals of MusicController buttons.	2017-04-07 14:09:26 +09:00
Dean Herbert	7c9f30c288	MusicController regression fixes.	2017-04-07 13:15:57 +09:00
Dean Herbert	bc4e0bfa8b	Make DragBar animate seeks.	2017-04-07 13:14:41 +09:00
Dan Balasescu	579c351cfd	Merge branch 'master' into details	2017-04-07 12:54:01 +09:00
Dean Herbert	1842d80e28	Update test case.	2017-04-07 09:43:08 +09:00
Dean Herbert	fba72b9a9e	Snaking out on by default.	2017-04-07 09:28:13 +09:00
Dean Herbert	12d2102a88	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-04-07 09:22:18 +09:00
Jorolf	e59c0a770f	Merge branch 'master' into details	2017-04-06 15:42:00 +02:00
Jorolf	28193cbaaa	hide BeatmapDetails on entering the Select screen	2017-04-06 15:39:23 +02:00
Huo Yaoyuan	411988f038	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
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	942699218a	Merge branch 'master' into details	2017-04-06 15:44:43 +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