7386 Commits

Author	SHA1	Message	Date
smoogipoo	50f9d810dd	Add more testcases + fix up seeking a bit more	2018-03-15 15:40:52 +09:00
Dean Herbert	0474b7ca2d	Merge branch 'master' into api-as-component	2018-03-15 14:13:23 +09:00
Dean Herbert	a42035f494	Make DrawableHitObject a CompositeDrawable ... No reason for it to be a container.	2018-03-15 13:41:06 +09:00
Dean Herbert	cdf435aedd	Merge branch 'master' into DoNotMoveToPlayerWhileDragging	2018-03-15 11:14:30 +09:00
Dean Herbert	8d433cb4bf	Merge branch 'master' into cursor-trail	2018-03-15 11:14:21 +09:00
TocoToucan	34dc8e7375	Resolve merge conflict	2018-03-14 23:22:19 +03:00
TocoToucan	5a1af062d3	Handle GlobalAction.TakeScreenshot in ScreenshotManager	2018-03-14 22:55:24 +03:00
Dean Herbert	551b67ac16	Merge branch 'master' into fix-autoplay-button-deselect	2018-03-14 21:46:19 +09:00
smoogipoo	0da3ae0944	Add some basic tests + fixes to seek/seekforward functionality	2018-03-14 20:52:48 +09:00
FreezyLemon	070decf890	small code cleanups	2018-03-14 12:38:22 +01:00
FreezyLemon	a438e45434	make SelectTypes set mods instead of only adding new ones ... also made the method actually take types as parameter to make it consistent	2018-03-14 12:33:08 +01:00
TocoToucan	25f738c4ae	Do not support bmp screenshots	2018-03-14 12:57:55 +03:00
Joseph Madamba	1eeacb7bf7	Change descriptions and special section	2018-03-14 01:05:19 -07:00
Dean Herbert	a0691168cb	Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement	2018-03-14 15:35:24 +09:00
Dean Herbert	81f82d98a1	Rework a lot of naming and structure	2018-03-14 15:18:21 +09:00
Dean Herbert	ea649f9650	Avoid scheduling during non-current screen	2018-03-14 12:09:19 +09:00
Joseph Madamba	d122aa80e4	Edit mods description, multiplier, and code	2018-03-13 20:07:03 -07:00
Dean Herbert	ef8d595914	Apply formatting changes	2018-03-14 11:44:19 +09:00
Dean Herbert	c3a3d76b88	Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging	2018-03-14 11:43:33 +09:00
Dean Herbert	13f64a1d12	Merge branch 'master' into cursor-trail	2018-03-14 11:42:40 +09:00
smoogipoo	e2dc9a975a	Merge branch 'master' into editor-wheel-movement	2018-03-14 11:39:02 +09:00
Dean Herbert	ce2997419a	Expose API scheduling internally	2018-03-14 11:37:50 +09:00
Dean Herbert	07642546bb	Make APIAccess a component	2018-03-14 11:29:54 +09:00
Dean Herbert	83cd2fd317	Move token saving logic to APIAccess	2018-03-14 10:15:05 +09:00
Dean Herbert	afc3646450	Move API configuration hooks out of OsuGameBase ... Also makes username more private, and password completely private.	2018-03-14 10:15:05 +09:00
Dean Herbert	1d7be2ad0b	Fix incorrect variable name	2018-03-14 10:14:42 +09:00
Dean Herbert	d2a0ca6faa	Merge remote-tracking branch 'upstream/master' into fix-combo-colours	2018-03-14 10:13:48 +09:00
TocoToucan	0e69ab1615	Introduce ScreenshotManager class	2018-03-14 00:17:12 +03:00
Dean Herbert	c55d70ec13	Merge branch 'master' into fix-combo-colours	2018-03-13 19:19:45 +09:00
Dean Herbert	16eab2eebf	Fix combo colours not working until now	2018-03-13 19:19:08 +09:00
Dean Herbert	e43de68ad3	Move colour parsing to LegacyDecoder	2018-03-13 19:13:50 +09:00
vperus	ba44813c00	Fixed exit from game save username instead of email. Resolve #2156	2018-03-13 12:10:47 +02:00
smoogipoo	299de4b866	Rewrite seeking to better handle timing point boundaries	2018-03-13 16:54:34 +09:00
Dean Herbert	d6fa7d69d7	Add missing fonts section	2018-03-13 16:13:07 +09:00
smoogipoo	e97349fd63	Derive ScreenTestCase + use LoadComponentAsync	2018-03-13 16:00:56 +09:00
smoogipoo	0c705b0397	Rename to EditorTestCase	2018-03-13 15:57:05 +09:00
Dean Herbert	b93e83e3d2	Merge branch 'master' into base-editor-testcase	2018-03-13 15:53:33 +09:00
Dean Herbert	e9cd97c43a	Merge branch 'master' into test-beatmap	2018-03-13 15:42:30 +09:00
smoogipoo	e32eec9259	No more caching	2018-03-13 15:22:46 +09:00
smoogipoo	df352c98d6	Change wheel direction to match stable	2018-03-13 14:30:50 +09:00
smoogipoo	e580819621	Rename to seekAmount	2018-03-13 14:08:43 +09:00
smoogipoo	6c148930b5	Don't skip beats when scrolling in the direction of the closest beat	2018-03-13 14:02:37 +09:00
smoogipoo	8acba47a2b	Implement mouse wheel movement in the editor	2018-03-13 11:23:44 +09:00
smoogipoo	706c26c32b	Remove extra whitespace	2018-03-13 09:27:33 +09:00
FreezyLemon	95c84ea7fe	remove (now) unnecessary line	2018-03-12 23:00:06 +01:00
FreezyLemon	ddc1f03a96	deselect autoplay button after ctrl-enter play ... before, the mod was removed, but the button was still active	2018-03-12 22:35:45 +01:00
Dean Herbert	107ad8cfff	Merge remote-tracking branch 'FreezyLemon/master' into more-skinning	2018-03-12 22:01:59 +09:00
Dean Herbert	3354849cc9	Fix code formatting regression	2018-03-12 22:01:18 +09:00
smoogipoo	d2859d779d	Create a base TestCaseEditor for rulests to derive	2018-03-12 19:43:52 +09:00
smoogipoo	13c20438ef	Fix build issues	2018-03-12 19:41:51 +09:00
smoogipoo	b91524dbba	Give TestWorkingBeatmap's track a valid length	2018-03-12 19:41:15 +09:00
smoogipoo	7406cb290f	Split out test beatmap from TestCasePlayer into instantiable class	2018-03-12 19:41:09 +09:00
smoogipoo	8c4bcb4a04	Only accept drag movement on the overlays	2018-03-12 17:33:10 +09:00
smoogipoo	212142429f	Derive from IHasPosition	2018-03-12 17:25:34 +09:00
Dean Herbert	8cbcdeb665	Merge branch 'master' into mania-difficulty	2018-03-12 14:07:14 +09:00
Dean Herbert	ab4c527ebc	Merge branch 'master' into decoders	2018-03-12 13:38:22 +09:00
Dean Herbert	9f644571ea	Merge branch 'master' into mania-difficulty	2018-03-12 13:31:48 +09:00
smoogipoo	3cd203699b	Apply beatmap converter mods in PerformanceCalculator	2018-03-12 13:09:19 +09:00
smoogipoo	81186f8423	Apply beatmap converter mods in DifficultyCalculator	2018-03-12 13:06:42 +09:00
Dean Herbert	1d0a44a0bb	Merge branch 'master' into fix-login-failure	2018-03-12 12:41:45 +09:00
Dan Balasescu	fce61943bd	Merge branch 'master' into smoother-parallax-scale	2018-03-12 12:12:01 +09:00
Dean Herbert	eb643b690a	Merge branch 'master' into more-skinning	2018-03-12 11:55:50 +09:00
Dean Herbert	1bcda4930e	Add back beatmap version set	2018-03-12 11:33:12 +09:00
Dean Herbert	c70be29eda	Move legacy conversion to LegacySkin	2018-03-12 11:30:13 +09:00
Dan Balasescu	50acab8d86	Merge branch 'master' into relative-date-drawable	2018-03-12 11:28:43 +09:00
Dan Balasescu	0da407f75c	Merge branch 'master' into fix-duplicate-judgements	2018-03-12 11:02:54 +09:00
Dean Herbert	1447ca55a3	Add xmldoc, make restrictSize private	2018-03-12 11:02:02 +09:00
smoogipoo	86d93ffe3c	Fix tooltip not working due to not handling input	2018-03-12 10:49:50 +09:00
Dean Herbert	d27cf16bf9	Merge remote-tracking branch 'ppy/master' into more-skinning	2018-03-12 10:46:37 +09:00
Dan Balasescu	96e2aca1ba	Merge branch 'master' into relative-date-drawable	2018-03-12 10:36:43 +09:00
smoogipoo	209d91fe21	Fix duplicate item in csproj	2018-03-12 10:35:37 +09:00
Dan Balasescu	8ba87dfdbd	Merge branch 'master' into fix-duplicate-judgements	2018-03-12 10:29:50 +09:00
smoogipoo	33c721bcbb	Fix post-merge errors	2018-03-12 09:51:32 +09:00
smoogipoo	6e51b74890	Merge remote-tracking branch 'origin/master' into rewrite-break-overlay	2018-03-12 09:47:05 +09:00
HoLLy	9c75c392f2	Only check by null instead of sign	2018-03-11 21:27:49 +01:00
HoLLy	a321bcf3af	Fix check against LegacyID for non-default rulesets	2018-03-11 20:19:03 +01:00
TocoToucan	e6c22e2287	Taking screenshot support initial commit	2018-03-10 21:59:20 +03:00
Dean Herbert	487a03d0d7	Merge branch 'master' into cursor-trail	2018-03-11 02:07:05 +09:00
Dean Herbert	db2a663234	Use private instead of protected	2018-03-11 01:26:03 +09:00
Dean Herbert	9233266fe1	Fix login failure for users with no country rank ... Closes #2148.	2018-03-11 00:44:16 +09:00
smoogipoo	4103c66cff	Move selection overlay to HitObjectOverlayLayer for extensibility	2018-03-10 00:48:57 +09:00
smoogipoo	0e8fbc47b7	Give HitObjectOverlayLayer full input state information	2018-03-10 00:03:02 +09:00
smoogipoo	376f6eec58	SetPosition -> OffsetPosition	2018-03-10 00:02:13 +09:00
smoogipoo	ad72d3816b	Allow dragging anywhere in a capture box to move objects	2018-03-09 23:43:50 +09:00
smoogipoo	4a48136e4f	Make hitobject positions adjustable	2018-03-09 23:12:34 +09:00
smoogipoo	3b766b8ec8	Make CaptureBox account for changes in hitobject states	2018-03-09 23:11:48 +09:00
naoey	56730247e3	Merge branch 'fix-unplayable-beatmaps' of github.com:naoey/osu into fix-unplayable-beatmaps	2018-03-09 19:40:00 +05:30
naoey	2c0488b1f1	Invert bool, add test, and handle ruleset change.	2018-03-09 19:39:28 +05:30
Dean Herbert	9ad9fc5aa9	Merge branch 'master' into fix-unplayable-beatmaps	2018-03-09 21:39:48 +09:00
Dean Herbert	217dd2ecdc	Initial push for better decoders	2018-03-09 21:24:15 +09:00
naoey	d04f47718f	Make song select choose random when initial selection fails. ... - Revert TestCasePlaySongSelect to master	2018-03-09 17:36:55 +05:30
naoey	25fb527cc7	Remove previous fix and move filtered logic to carousel. ... - Add an optional bool parameter to SelectBeatmap to skip selecting filtered maps	2018-03-09 15:51:00 +05:30
Dean Herbert	6ad962fc8b	Interpolate ParallaxContainer's scale ... Things were a bit jumpy when a screen was adjusting `ParallaxAmount`. This smoothes the applied scale changes to look great again. Most noticeable when hitting the retry hotkey (`~`) from gameplay.	2018-03-09 14:35:53 +09:00
Dean Herbert	6d91889ca6	Move player-specific configuration bindables back to player	2018-03-08 22:16:47 +09:00
Dean Herbert	94ed4ab01b	Add debouncing to player loading ... Allows the mouse to temporarily exit and re-enter overlay elements without triggering a load	2018-03-08 20:28:55 +09:00
Dean Herbert	d3e91024a7	Block player enter when a drag initiates from an overlaying container	2018-03-08 18:16:23 +09:00
TocoToucan	2cb197d0c4	Replace ConfigureBackgroundUpdate with OnEntering	2018-03-08 11:35:00 +03:00
Dean Herbert	8f3f886805	Merge branch 'master' into PlayerBase	2018-03-08 16:12:12 +09:00
Dean Herbert	81c1ec2005	Merge branch 'master' into fix-unplayable-beatmaps	2018-03-08 13:02:57 +09:00
Dean Herbert	3b56999118	Add drawable to display (and update) relative dates	2018-03-08 12:58:16 +09:00
Dean Herbert	70a16667b6	Fix difficulty calculator regression when applying mods	2018-03-08 12:57:36 +09:00
Dean Herbert	91c984ed97	Merge branch 'master' into rewrite-break-overlay	2018-03-08 09:31:59 +09:00
Dean Herbert	81b778fdcf	Merge branch 'master' into cursor-trail	2018-03-08 09:31:42 +09:00
Dean Herbert	453fd83e01	Merge branch 'master' into user-profile-recent	2018-03-08 00:42:02 +09:00
naoey	983cefbe40	Add VisualTest.	2018-03-07 19:08:26 +05:30
pdrapoport	3731cbe5eb	Removing "mouse wheel disabled" checkbox from visual settings gameplay menu	2018-03-07 14:20:59 +01:00
Dean Herbert	f78538fea8	Merge branch 'master' into user-profile-recent	2018-03-07 19:41:52 +09:00
Dean Herbert	b62ed004f2	Remove judgements when deciding a new judgement for a HitObject ... Generally happens when rewinding.	2018-03-07 19:14:42 +09:00
Dean Herbert	05eb678654	Add skin support for judgements	2018-03-07 18:21:05 +09:00
Dean Herbert	bd952ce370	Allow skinnable drawables to be of non-restricted size	2018-03-07 18:21:05 +09:00
Dean Herbert	6a768e378a	Merge branch 'master' into rewrite-break-overlay	2018-03-07 17:00:34 +09:00
Dan Balasescu	fb349e68a3	Merge branch 'master' into api-error-shouldnt-retry	2018-03-07 16:50:14 +09:00
Dan Balasescu	0c154e07ed	Merge branch 'master' into nullable-legacy-id	2018-03-07 16:12:08 +09:00
Dan Balasescu	5fda7881c3	Merge branch 'master' into fix-textbox-arrows	2018-03-07 16:01:44 +09:00
Dean Herbert	a71e5ce19c	Tidy up	2018-03-07 14:54:54 +09:00
Dean Herbert	4094ffbddd	Remove unnecessary comment	2018-03-07 14:54:15 +09:00
Dean Herbert	96ea42d3ba	Ensure initial value is set even if that value is zero	2018-03-07 14:51:34 +09:00
Dean Herbert	05a13d4d39	Improve the way bindings are done	2018-03-07 14:50:50 +09:00
Dean Herbert	51a9dd038e	Add default bindable values	2018-03-07 14:38:41 +09:00
Dean Herbert	fac4cd6a32	Move to overlayContent	2018-03-07 14:20:47 +09:00
Dean Herbert	e2f9e237e8	Use GradientHorizontal helper function	2018-03-07 14:07:04 +09:00
Dean Herbert	c176e309e1	Merge branch 'master' into volume-control	2018-03-07 14:03:09 +09:00
Dean Herbert	e82cadc811	Make LegacyID nullable ... The -1 default was getting stored to the database.	2018-03-06 17:40:14 +09:00
Dean Herbert	07bf8549eb	Fix arbitrary API request errors getting identified as timeouts	2018-03-06 17:39:34 +09:00
smoogipoo	78d73d4c11	Additional fixes for flow ordering after framework changes	2018-03-06 17:20:58 +09:00
smoogipoo	148551afa2	osu!-side changes in-line with framework layout changes	2018-03-06 14:12:37 +09:00
naoey	9669c5aee3	Make locally used things local and rename method.	2018-03-06 09:33:15 +05:30
Dean Herbert	90828cca8f	Fix left and right arrows keys in chat overlay not working ... Misplaced override. Resolves ppy/osu-framework#1444	2018-03-06 08:59:40 +09:00
TocoToucan	697ad63d72	Resolve merge conflicts	2018-03-05 22:24:25 +03:00
Dean Herbert	c4c1b0b6ff	Fix merge regression	2018-03-06 01:39:01 +09:00
Dean Herbert	7b18e8a5ca	Merge branch 'master' into fix-taiko-conversion	2018-03-06 01:16:47 +09:00
Dean Herbert	4aafc2228e	Improve skip button behaviour when mouse buttons are down	2018-03-06 00:53:40 +09:00
Dean Herbert	d115c56742	Avoid using input blocking	2018-03-06 00:27:55 +09:00
Dean Herbert	792a3ac469	SkipButton -> SkipOverlay	2018-03-06 00:10:53 +09:00
Dean Herbert	d1a115f4ec	Merge remote-tracking branch 'upstream/master' into cursor-trail	2018-03-05 23:34:04 +09:00
Dean Herbert	41727509d7	Merge branch 'master' into fix-drumroll-nullref	2018-03-05 22:46:33 +09:00
smoogipoo	2a9fb2c2c6	Make NestedHitObjects lazily-constructed	2018-03-05 21:40:26 +09:00
Dean Herbert	02690e5f25	Move to private implementation	2018-03-05 21:27:37 +09:00
Dean Herbert	0d817e8e98	Merge remote-tracking branch 'ppy/master' into fix-skin-performance	2018-03-05 21:23:18 +09:00
Dan Balasescu	25e2844e49	Merge branch 'master' into storyboard-rewind-support	2018-03-05 21:11:00 +09:00
Dan Balasescu	56550e4dd8	Merge branch 'master' into fix-parallax-during-rewind	2018-03-05 20:39:16 +09:00
Dan Balasescu	65d510baf2	Merge branch 'master' into add-internal-legacy-offsets	2018-03-05 20:27:27 +09:00
Dean Herbert	53edfedfc8	Remove unneeded HighFrequencyMousePosition from GameplayMenuOverlay	2018-03-05 19:43:57 +09:00
Dean Herbert	7d11e55d06	Only block mouse input when the shaded portion of the SkipButton is hovered	2018-03-05 19:43:33 +09:00
Dean Herbert	2003887cc8	Merge branch 'master' into clock-fixes	2018-03-05 17:45:08 +09:00
smoogipoo	d44dc1a4f9	Fix SliderMultiplier/SliderTickRate parsing inaccuracy	2018-03-05 16:01:05 +09:00
smoogipoo	49b8670dfc	Fix beatmap conversion tests not properly constructing decoder	2018-03-05 14:53:57 +09:00
Dean Herbert	e46f363fdc	Fix failing unit test	2018-03-04 22:46:50 +09:00
Dean Herbert	bc0bc8d459	Add legacy timing offsets ... These have been in release builds since January, but implemented in a hacky way. This brings them with a sane implementation.	2018-03-04 21:57:50 +09:00
jorolf	ec013dbee8	remove blank line and try to get test case working	2018-03-03 21:55:19 +01:00
jorolf	1cda58fe29	another blank line	2018-03-03 19:51:11 +01:00
jorolf	9293ec635a	add license headers and remove blank line	2018-03-03 19:49:38 +01:00
jorolf	8e0a524c4d	change colours	2018-03-03 19:31:29 +01:00
jorolf	ef63366d91	simplify VolumeMeter	2018-03-03 19:25:34 +01:00
Dean Herbert	30b1447318	Fix skin file path lookup performance ... Move path mapping to the resource store, so caching can happen against the component's name rather than the skin path. Fixes regression of beatmap load time when a custom skin is selected.	2018-03-04 03:19:01 +09:00
jorolf	9a29c53c5e	Merge branch 'master' of git://github.com/ppy/osu into volume-control	2018-03-03 19:09:08 +01:00
jorolf	3a420ba826	add the volume overlay	2018-03-03 19:08:35 +01:00
Dean Herbert	66493d200b	Merge branch 'master' into user-profile-recent	2018-03-04 02:45:12 +09:00
Dean Herbert	8273288048	Add xmldoc	2018-03-04 02:12:45 +09:00
Dean Herbert	0e928429d4	Merge branch 'master' into ruleset-replayframes	2018-03-04 01:57:43 +09:00
Dean Herbert	659578e8fa	Add rewind support for storyboards	2018-03-04 01:48:31 +09:00
Dean Herbert	26e50043b7	Fix parallax container during rewinds	2018-03-04 00:52:00 +09:00
Dean Herbert	c6c55c40ed	Rewrite BreakOverlay ... No longer relies on Schedule calls (could not be rewound). Also no longer sucks.	2018-03-04 00:51:24 +09:00
naoey	a57dc154f9	More specific tests.	2018-03-03 20:34:29 +05:30
jorolf	bd75422d88	Merge branch 'master' of git://github.com/ppy/osu into volume-control	2018-03-03 14:10:50 +01:00
naoey	307147a8a3	Merge remote-tracking branch 'upstream/master' into fix-unplayable-beatmaps	2018-03-03 16:10:22 +05:30
naoey	fb724ca8a7	Make song select ensure current beatmap is always playable in the active ruleset. ... - Add a to TestCasePlaySongSelect testing this scenario	2018-03-03 16:09:24 +05:30
Dean Herbert	0b2cbf88bb	Merge branch 'master' into clock-fixes	2018-03-02 22:18:32 +09:00
Dean Herbert	06cf9cbd63	Merge branch 'master' into fix-perfectcurve	2018-03-02 21:49:33 +09:00
Dean Herbert	bd510e5356	Merge remote-tracking branch 'upstream/master' into clock-fixes	2018-03-02 21:01:53 +09:00
smoogipoo	a2c239d5e3	Rename to IBeatmapConverter, move to separate file	2018-03-02 20:19:47 +09:00
smoogipoo	8a15d4e677	Fix linear perfect-curves not being cased to CurveType.Linear ... Fixes #2151.	2018-03-02 18:21:40 +09:00
smoogipoo	cdca7371a3	Replace testcases with a basic test suite	2018-03-02 18:20:33 +09:00
Dan Balasescu	4aff659272	Merge branch 'master' into beatmap-conversion-testcases	2018-03-02 16:04:32 +09:00
smoogipoo	1f834825dc	Add testcase to osu.Game in-case nunit tries to discover tests in it	2018-03-02 15:43:55 +09:00
smoogipoo	2e3ee00c19	Remove unnecessary changes	2018-03-02 13:13:01 +09:00
smoogipoo	573d6d1b5f	Allow multiple mappings to be generated for a single hitobject	2018-03-02 13:13:01 +09:00
smoogipoo	4e363664fd	Add beatmap parameter to beatmapconverter creation	2018-03-02 13:13:01 +09:00
smoogipoo	070c5a95ee	Improve output	2018-03-02 13:13:01 +09:00
smoogipoo	797d03a65f	Implement basic structure for beatmap conversion testing	2018-03-02 13:13:00 +09:00
Dean Herbert	c54c1699bf	Merge branch 'master' into ruleset-replayframes	2018-03-01 22:26:16 +09:00
Dean Herbert	603a98f6cc	Merge branch 'master' into editor-hitobject-overlays	2018-03-01 21:33:27 +09:00
Dean Herbert	6dc9411a90	Don't use BufferedContainer for OsuLogo ... Minor performance improvement. Not sure why this was done but it's not required any more.	2018-03-01 16:01:42 +09:00
smoogipoo	d5d4bcb558	Merge branch 'master' into editor-hitobject-overlays	2018-03-01 14:04:38 +09:00
smoogipoo	e869f7d05b	Fix converted frames not getting time values	2018-03-01 02:28:15 +09:00
smoogipoo	fb16c3db87	Privatise CurrentTime's setter	2018-03-01 02:28:14 +09:00
smoogipoo	19911193cf	Minify LegacyReplayFrame	2018-03-01 02:28:14 +09:00
smoogipoo	cf42d5bbd5	Remove mostly-unused Score parameter	2018-03-01 02:28:14 +09:00
smoogipoo	c9c65cab53	CreateReplayFrame -> CreateConvertibleReplayFrame	2018-03-01 02:28:14 +09:00
smoogipoo	ab4d7fa46e	Remove IScoreParser interface ... It's too early for this.	2018-03-01 02:28:14 +09:00
smoogipoo	a3c7755ade	Implement a conversion process for ReplayFrames	2018-03-01 02:28:14 +09:00
Dean Herbert	b8ea4b11ab	Adjust range further ... This is not a great idea.	2018-03-01 00:39:59 +09:00
Dean Herbert	e2f57ae346	Merge branch 'master' into parser-sanity-checks	2018-03-01 00:38:44 +09:00
jorolf	46dfb761c5	basic volume meter and testcase	2018-02-28 16:14:52 +01:00
Dean Herbert	eacb9ba743	Merge branch 'master' into user-profile-recent	2018-02-28 23:49:33 +09:00
Dean Herbert	36beaffa7a	Merge branch 'master' into editor-hitobject-overlays	2018-02-28 23:48:54 +09:00
Dean Herbert	bda673e6fe	Merge branch 'master' into player-reduced-parallax	2018-02-28 23:15:25 +09:00
Dean Herbert	572d3b1316	Move bpm clamping to TimingControlPoint, adjust range to 1-10000bpm ... In line with stable editor restrictions	2018-02-28 22:53:28 +09:00
Dan Balasescu	33a64cb497	Merge branch 'master' into fix-multiple-tracks-playing	2018-02-28 22:53:02 +09:00
Dan Balasescu	25c748ed45	Merge branch 'master' into fix-player-exit	2018-02-28 22:05:44 +09:00