Commit Graph

2584 Commits

Author SHA1 Message Date
a6ea6738e5 add some spaces after commas 2017-04-24 17:10:00 +02:00
7ef90e6597 Merge branch 'master' of git://github.com/ppy/osu into slider-stuff 2017-04-24 17:05:32 +02:00
a475f1f237 Remove redundant qualifier. 2017-04-24 14:16:51 +09:00
ba2db75890 Merge branch 'master' into nodal-hit-sounds 2017-04-24 14:14:33 +09:00
239f19ad02 Fix incorrect line endings. 2017-04-24 14:10:44 +09:00
6a05440e6c Only schedule when faulted 2017-04-23 00:53:21 -05:00
4b69477531 Trim whitespace 2017-04-23 00:41:15 -05:00
1d254f4a56 Take MusicController back to life 2017-04-23 00:13:58 -05:00
60bb45358c remove more casts and usings 2017-04-22 18:36:37 +02:00
b151c71c0e remove casts 2017-04-22 18:36:36 +02:00
e53c4be356 I guess this works... 2017-04-22 18:36:36 +02:00
02249dcd67 add a function to OsuSliderBar to manually set the tooltip text 2017-04-22 18:34:57 +02:00
1d2f19b5a2 change background dim from integer to double 2017-04-22 18:34:03 +02:00
b7ac7297b4 Merge branch 'master' into clr-vscode-debugging 2017-04-22 23:30:49 +09:00
6fb8676215 Merge branch 'master' into nodal-hit-sounds 2017-04-22 22:11:19 +09:00
2af9bf1423 Prefix everything inside Rulesets.Objects.Legacy with "Convert" to avoid naming clashes with Ruleset projects. 2017-04-22 21:33:11 +09:00
ec04ceaece Fix off-by-one on repeatCount. 2017-04-22 20:53:55 +09:00
1bb0b96ddc Make IHasCurve not depend on a SliderCurve object. 2017-04-22 20:43:20 +09:00
2d91400239 Fix nullref due to framework change. 2017-04-22 16:56:17 +09:00
96a5d7032d Fix regression causing menu cursor to stick to screen edges. 2017-04-21 22:37:55 +09:00
caf3d311cd Merge remote-tracking branch 'upstream/master' into speed-adjust-mods 2017-04-21 20:55:20 +09:00
d94035e9da Merge branch 'master' into general-fixes 2017-04-21 20:42:46 +09:00
d7477955ac CI fixes. 2017-04-21 20:42:13 +09:00
5cdbb226f8 Remove CurvedHitObject to make RepeatSamples not tied to curve. 2017-04-21 20:40:11 +09:00
b8f9a2be6e Whoops fix xmldoc. 2017-04-21 20:40:05 +09:00
748f13501a Remove HeadSamples and TailSamples, combine into RepeatSamples. 2017-04-21 20:04:40 +09:00
382e656e9f CI fixes. 2017-04-21 19:51:23 +09:00
6c8bd4dfe4 More trimming. 2017-04-21 19:41:46 +09:00
47f9b2d55b Trim whitespace. 2017-04-21 19:38:04 +09:00
b8c10aa595 Improve xmldoc. 2017-04-21 19:37:16 +09:00
3345ba180f Update with framework rename. 2017-04-21 19:26:32 +09:00
cae4c7c6e5 Combine construction and assignment. 2017-04-21 19:12:16 +09:00
a999c42d8a Split slider samples into head + tail + repeats + body (the original HitObject.Samples). 2017-04-21 18:49:49 +09:00
3f832731c9 Add DoubleTime, HalfTime and Nightcore support. 2017-04-21 17:33:37 +09:00
a7afde02bf Oops, apparently normal hit sound should always be added. 2017-04-21 16:27:35 +09:00
5fdc9819cf Add basic UO support (now called Audio Offset). 2017-04-21 16:20:05 +09:00
ca824de91c Implement RepeatSamples in IHasRepeats. 2017-04-21 16:18:34 +09:00
b4a4597366 Transform legacy HitObjectParsers to give repeat slider sounds, instead of all sounds. 2017-04-21 16:18:11 +09:00
25a7d99a8e Remove unused reference. 2017-04-21 16:11:24 +09:00
5aa90df819 Allow OsuScreens to decide whether ruleset switching should be allowed.
Tidies up ToolbarModeSelector a lot by using DI.
2017-04-21 16:03:59 +09:00
4a3ae6937d Improve the look of ScreenWhiteBox. 2017-04-21 15:41:22 +09:00
83f1f9d7e5 Add ability to parse per-repeat sounds. 2017-04-21 14:38:46 +09:00
bd7341c5a1 Restructure reading normal/add/volume members into class to make code a bit more readable/usable. 2017-04-21 14:36:28 +09:00
ef7bc0f92e Update UI controls to understand DisabledChanged. 2017-04-21 14:02:04 +09:00
2d53ad4c0a Remove xmldoc-only using usage. 2017-04-21 14:01:58 +09:00
d656090aab Move tooltips below the cursor. 2017-04-21 14:01:31 +09:00
ac9f0ccb48 Fix hit normals always being played, regardless of sound type. 2017-04-21 13:59:55 +09:00
6e3125e115 Merge pull request #656 from smoogipooo/taiko-fixes
Taiko fixes
2017-04-20 20:10:29 +09:00
3342a97b20 Remove using. 2017-04-20 19:52:32 +09:00
c7411c47d6 Update User API stuff. 2017-04-20 19:51:28 +09:00