3958 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	c61f69569c	Merge pull request #662 from smoogipooo/nodal-hit-sounds ... Nodal hit sounds	2017-04-24 14:22:45 +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	8ee7968dc9	Merge pull request #667 from ColdVolcano/music-controller-fixes ... Fix MusicController not being able to change song	2017-04-24 00:05:22 +09:00
ColdVolcano	6a05440e6c	Only schedule when faulted	2017-04-23 00:53:21 -05:00
ColdVolcano	4b69477531	Trim whitespace	2017-04-23 00:41:15 -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	db72bfe03b	Merge pull request #666 from smoogipooo/clr-vscode-debugging ... Clr vscode debugging	2017-04-22 23:36:36 +09:00
Dean Herbert	b7ac7297b4	Merge branch 'master' into clr-vscode-debugging	2017-04-22 23:30:49 +09:00
Dean Herbert	35cf4af9e7	Update framework.	2017-04-22 23:17:59 +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
Dan Balasescu	99db871e6c	Update OsuDifficultyCalculator.cs	2017-04-22 20:59:35 +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
Dan Balasescu	dbee95e859	Merge pull request #664 from peppy/general-fixes ... Fix regression causing menu cursor to stick to screen edges.	2017-04-22 18:11:49 +09:00
smoogipooo	c108a7b48e	Generate portable PDBs + add rebuild task.	2017-04-22 17:10:50 +09:00
smoogipooo	0b67cf0e91	Bring framework up to date.	2017-04-22 17:10:49 +09:00
smoogipooo	8dd7781925	Add clr-specific attach request.	2017-04-22 17:10:49 +09:00
smoogipooo	307dc3e2e1	Make VSCode use CLR on Windows platform.	2017-04-22 17:10:34 +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	c6590417ed	Merge pull request #661 from peppy/speed-adjust-mods ... Add DoubleTime, HalfTime and Nightcore support.	2017-04-21 21:14:03 +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	612c1b99de	Merge pull request #659 from peppy/general-fixes ... Update UI controls to understand DisabledChanged	2017-04-21 20:54:51 +09:00
Dean Herbert	4e4372b1d7	Update framework.	2017-04-21 20:48:43 +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
smoogipooo	5cdbb226f8	Remove CurvedHitObject to make RepeatSamples not tied to curve.	2017-04-21 20:40:11 +09:00
smoogipooo	b8f9a2be6e	Whoops fix xmldoc.	2017-04-21 20:40:05 +09:00
Dean Herbert	45bccf883a	Update framework.	2017-04-21 20:34:07 +09:00
smoogipooo	748f13501a	Remove HeadSamples and TailSamples, combine into RepeatSamples.	2017-04-21 20:04:40 +09:00
smoogipooo	382e656e9f	CI fixes.	2017-04-21 19:51:23 +09:00
Dan Balasescu	6c8bd4dfe4	More trimming.	2017-04-21 19:41:46 +09:00
smoogipooo	47f9b2d55b	Trim whitespace.	2017-04-21 19:38:04 +09:00
smoogipooo	b8c10aa595	Improve xmldoc.	2017-04-21 19:37:16 +09:00
Dean Herbert	3345ba180f	Update with framework rename.	2017-04-21 19:26:32 +09:00
smoogipooo	cae4c7c6e5	Combine construction and assignment.	2017-04-21 19:12:16 +09:00
Dan Balasescu	ed5f072151	Merge pull request #660 from peppy/audio-offset ... Add basic UO support (now called Audio Offset).	2017-04-21 19:07:04 +09:00
smoogipooo	a999c42d8a	Split slider samples into head + tail + repeats + body (the original HitObject.Samples).	2017-04-21 18:49:49 +09:00
Dean Herbert	3f832731c9	Add DoubleTime, HalfTime and Nightcore support.	2017-04-21 17:33:37 +09:00
smoogipooo	a7afde02bf	Oops, apparently normal hit sound should always be added.	2017-04-21 16:27:35 +09:00