2619 Commits

Author	SHA1	Message	Date
smoogipooo	28f7e0cdba	Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings.	2017-04-26 14:12:21 +09:00
Dean Herbert	30e2e7bfe4	Merge branch 'master' into slider-stuff	2017-04-25 19:42:46 +09:00
Dean Herbert	f93adebc52	Minor style fixes.	2017-04-25 13:33:34 +09:00
ColdVolcano	51c577624b	Remove BeatmapInfo field	2017-04-24 22:59:33 -05:00
ColdVolcano	1df50adc3a	Post-merge fixes (and CodeFactor fixes)	2017-04-24 22:48:25 -05:00
ColdVolcano	630c556b80	Merge branch 'master' of https://github.com/ppy/osu into intro-improvements	2017-04-24 22:42:28 -05:00
Dan Balasescu	91b264da1a	Merge branch 'master' into info-wedge-design-update	2017-04-25 08:14:59 +09:00
Dan Balasescu	b3e21f6f99	Merge branch 'master' into general-fixes	2017-04-25 08:05:03 +09:00
Dan Balasescu	f329587bd4	Fix mismatched braces.	2017-04-25 08:02:09 +09:00
Jorolf	a6ea6738e5	add some spaces after commas	2017-04-24 17:10:00 +02:00
Jorolf	7ef90e6597	Merge branch 'master' of git://github.com/ppy/osu into slider-stuff	2017-04-24 17:05:32 +02:00
Dean Herbert	43d09a9734	CI fixes	2017-04-24 20:31:25 +09:00
Dean Herbert	2d6fa711d1	Remove unnecessary base.Update() in PlayerInputManager.	2017-04-24 20:22:21 +09:00
Dean Herbert	3c98170330	Use method group for MusicController fault.	2017-04-24 20:22:21 +09:00
Dean Herbert	9ecfb4e4bf	Last CI fix.	2017-04-24 20:22:04 +09:00
Dean Herbert	c7b789424b	Update BeatmapInfoWedge design ... - Adds colour difficulty strip. - Adjusts paddings. - Fixes source/artist confusion. - Double dash to em-dash.	2017-04-24 20:19:44 +09:00
Dean Herbert	d84f1f05e2	Add better commenting for ambiguous parameter	2017-04-24 20:16:53 +09:00
Dean Herbert	9670ea9a2a	CI fixes	2017-04-24 20:16:41 +09:00
Dean Herbert	8b048a6706	Fix typo.	2017-04-24 19:33:48 +09:00
Dean Herbert	c55d406b44	Fix nullref possibility.	2017-04-24 19:25:35 +09:00
Dean Herbert	6aa6e5eef7	Store and restore the selected details tab at song select.	2017-04-24 19:25:27 +09:00
Dean Herbert	e1a2f1bc7a	Add beatmap metrics lookup.	2017-04-24 19:17:11 +09:00
Dean Herbert	d6c5654924	Reduce paddings and lock in some fixed heights for BeatmapDetails.	2017-04-24 18:55:49 +09:00
Dean Herbert	4fa22146b8	Increase safety of score lookups when leaderboard isn't visible.	2017-04-24 18:48:28 +09:00
Dean Herbert	ee659e7307	Fix decimal display of beatmap details being too precise.	2017-04-24 18:34:27 +09:00
Dean Herbert	a475f1f237	Remove redundant qualifier.	2017-04-24 14:16:51 +09:00
Dean Herbert	ba2db75890	Merge branch 'master' into nodal-hit-sounds	2017-04-24 14:14:33 +09:00
Dean Herbert	239f19ad02	Fix incorrect line endings.	2017-04-24 14:10:44 +09:00
Dean Herbert	c48c10e248	Merge branch 'master' into intro-improvements	2017-04-24 13:05:18 +09:00
ColdVolcano	30b7a029dc	Remove for real this time	2017-04-23 00:57:41 -05:00
ColdVolcano	6a05440e6c	Only schedule when faulted	2017-04-23 00:53:21 -05:00
ColdVolcano	fe35d20def	Remove not needed stuff (+typo fix)	2017-04-23 00:50:02 -05:00
ColdVolcano	4b69477531	Trim whitespace	2017-04-23 00:41:15 -05:00
ColdVolcano	094a0f9639	Move MenuMusic logic to MainMenu	2017-04-23 00:36:23 -05:00
ColdVolcano	1d254f4a56	Take MusicController back to life	2017-04-23 00:13:58 -05:00
Jorolf	60bb45358c	remove more casts and usings	2017-04-22 18:36:37 +02:00
Jorolf	b151c71c0e	remove casts	2017-04-22 18:36:36 +02:00
Jorolf	e53c4be356	I guess this works...	2017-04-22 18:36:36 +02:00
Jorolf	02249dcd67	add a function to OsuSliderBar to manually set the tooltip text	2017-04-22 18:34:57 +02:00
Jorolf	1d2f19b5a2	change background dim from integer to double	2017-04-22 18:34:03 +02:00
Dean Herbert	b7ac7297b4	Merge branch 'master' into clr-vscode-debugging	2017-04-22 23:30:49 +09:00
Dan Balasescu	6fb8676215	Merge branch 'master' into nodal-hit-sounds	2017-04-22 22:11:19 +09:00
smoogipooo	2af9bf1423	Prefix everything inside Rulesets.Objects.Legacy with "Convert" to avoid naming clashes with Ruleset projects.	2017-04-22 21:33:11 +09:00
smoogipooo	ec04ceaece	Fix off-by-one on repeatCount.	2017-04-22 20:53:55 +09:00
smoogipooo	1bb0b96ddc	Make IHasCurve not depend on a SliderCurve object.	2017-04-22 20:43:20 +09:00
smoogipooo	2d91400239	Fix nullref due to framework change.	2017-04-22 16:56:17 +09:00
Dean Herbert	96a5d7032d	Fix regression causing menu cursor to stick to screen edges.	2017-04-21 22:37:55 +09:00
Dean Herbert	caf3d311cd	Merge remote-tracking branch 'upstream/master' into speed-adjust-mods	2017-04-21 20:55:20 +09:00
Dean Herbert	d94035e9da	Merge branch 'master' into general-fixes	2017-04-21 20:42:46 +09:00
smoogipooo	d7477955ac	CI fixes.	2017-04-21 20:42:13 +09:00