7433 Commits

Author	SHA1	Message	Date
Dean Herbert	5f1bb8d753	Merge branch 'master' into fix-player-loader	2018-03-22 15:46:37 +09:00
Dan Balasescu	13a3c728dc	Merge branch 'master' into fix-dummy-ruleset	2018-03-22 15:29:43 +09:00
smoogipoo	3f3f57e51e	Use cached vertexbatch add delegate	2018-03-22 15:13:38 +09:00
Dean Herbert	7bdca0ff39	Merge remote-tracking branch 'upstream/master' into accent-colour-properties	2018-03-22 15:07:28 +09:00
Dean Herbert	9a20839b74	Merge branch 'master' into better-import-notice	2018-03-22 14:57:04 +09:00
Dan Balasescu	dd99a210e2	Merge branch 'master' into ignore-unknown-sections	2018-03-22 14:48:06 +09:00
smoogipoo	dc9fb84e25	Update progress with the current item, not the next item ... In the case where there is no next item, the progress will not get updated, so we'll essentially skip one element from filling the progress bar further. In the future we may/will want to not hide the notification upon completion, so this will look better in such scenarios.	2018-03-22 14:46:25 +09:00
Dean Herbert	5104ba8118	Merge branch 'master' into beatmap-as-a-skin	2018-03-22 13:45:30 +09:00
Dean Herbert	917334a39a	Move cancel code to exit paths for screen	2018-03-22 13:01:40 +09:00
Dean Herbert	e39b7b8d35	Don't hard-crash when an unknown section is encountered in a legacy file	2018-03-22 12:58:02 +09:00
Dean Herbert	504c3ff0ba	BeatmapSkin -> LegacyBeatmapSkin	2018-03-22 12:50:48 +09:00
Dan Balasescu	976702aef9	Merge branch 'master' into fix-osu-logo-sounds	2018-03-22 12:50:45 +09:00
Dean Herbert	c5eecae32f	Improve shared code paths in legacy skins	2018-03-22 12:50:23 +09:00
Dean Herbert	78a8f60b39	IHasComboIndex -> IHasComboInformation	2018-03-22 12:35:17 +09:00
Dean Herbert	1a782a840c	Fix xmldoc	2018-03-22 12:34:29 +09:00
Dan Balasescu	77ebd94804	Merge branch 'master' into beatmap-as-a-skin	2018-03-22 11:33:27 +09:00
Dan Balasescu	552e7e314d	Merge branch 'master' into bail-on-invalid-archive	2018-03-22 11:32:38 +09:00
Dean Herbert	101caf3064	Apply same logic fixes to delete/restore all notifications	2018-03-22 11:28:40 +09:00
Dean Herbert	e0b74a357a	Fix osu! logo making hover beat sounds when not visible	2018-03-22 03:31:14 +09:00
Dean Herbert	8f71d53c17	Fix retry not allowing continuing beyond PlayerLoader ... Resolves #2265.	2018-03-22 02:10:31 +09:00
TocoToucan	4991f2ad2e	Change filename format	2018-03-21 18:27:08 +03:00
Dean Herbert	62229300c4	Fix DummyRuleset getting selected ... Resolves #2261.	2018-03-22 00:26:48 +09:00
Dean Herbert	4a93abcc36	Add scale adjusts to bring legacy skins in-line with lazer sizing	2018-03-21 20:07:58 +09:00
Dean Herbert	65b6a2faad	Fix mod button sounds playing when mod overlay is not visible ... Resolves #2240.	2018-03-21 18:41:21 +09:00
Dean Herbert	271c082606	Adjust colour assignment	2018-03-21 16:25:32 +09:00
Dean Herbert	48142602ea	Adjust text size to match design	2018-03-21 16:04:43 +09:00
Dean Herbert	63f0419d6a	Apply minor fixes	2018-03-21 15:40:43 +09:00
Dean Herbert	f944c29505	Merge remote-tracking branch 'upstream/master' into take_screenshot	2018-03-21 12:32:27 +09:00
Dean Herbert	ccdd11d7b2	Add missing licence header	2018-03-21 12:29:44 +09:00
Dean Herbert	8ac660b0c6	Fixes for keyboard handling and general code quality	2018-03-20 22:25:15 +09:00
Dean Herbert	aa8b0d017c	Adjust colours and spacing	2018-03-20 21:59:56 +09:00
Dean Herbert	dac1ba21db	Make keyboard control work	2018-03-20 21:38:22 +09:00
Dean Herbert	045610dbfe	Adjust styling and colours	2018-03-20 21:31:17 +09:00
Dean Herbert	5a10270a2a	return -> break ... no real reason but whatever works	2018-03-20 20:32:32 +09:00
Dean Herbert	c2eb32c0e9	DrawableBeatDivisor -> BeatDivisorControl	2018-03-20 20:10:27 +09:00
Dean Herbert	6fd650777c	Move value change logic to bindable ... Also add drag support	2018-03-20 20:09:55 +09:00
Dean Herbert	625e561fc8	Fix whitespace	2018-03-20 18:01:09 +09:00
Dean Herbert	fb3d319d0e	Make fallback bool into a function ... Allows correct handling now that beatmap skins are also a thing.	2018-03-20 16:40:11 +09:00
Dean Herbert	f03abb3145	Add GetTexture method to ISkinSource ... Used to shortcut lookup checks without potentially expensive drawable creation overhead.	2018-03-20 16:40:11 +09:00
Dean Herbert	9ad4e9284a	Add skin source fallback chain	2018-03-20 16:40:11 +09:00
Dean Herbert	fd0391daf7	Merge branch 'accent-colour-properties'	2018-03-20 16:25:22 +09:00
Dean Herbert	d1c2aa71d0	Add beatmap sample override support	2018-03-20 16:24:06 +09:00
Dean Herbert	9a0fc9e29a	Move combo colours completely out of beatmap	2018-03-20 16:24:06 +09:00
Dean Herbert	dbcf755618	Make Beatmaps parsable as skins	2018-03-20 16:05:29 +09:00
Dean Herbert	c38c26eacb	Move combo index processing to BeatmapProcessor	2018-03-20 15:57:43 +09:00
smoogipoo	786e6242e1	Make bdl beat divisor nullable	2018-03-20 14:01:06 +09:00
smoogipoo	50192b21e3	Give DrawableBeatDivisor a ctor	2018-03-20 13:57:25 +09:00
TocoToucan	ee73bd4568	Update ScreenshotManager inline with framework changes	2018-03-19 22:39:00 +03:00
Dean Herbert	553fd3b789	Give DefaultSkin an empty Configuration	2018-03-19 21:00:27 +09:00
smoogipoo	b1d09500f2	Integrate beat snap divisor into editor seeking	2018-03-19 20:42:06 +09:00
Dean Herbert	f565cc861d	Hard bail on attempting to import an invalid archive format	2018-03-19 20:41:12 +09:00
Dean Herbert	994c7bfabd	Further improvements to messaging	2018-03-19 20:40:14 +09:00
smoogipoo	c5eab7a227	Actually rename to DrawableBeatDivisor...	2018-03-19 20:34:24 +09:00
smoogipoo	5ecbc5612c	Integrate with dependency injection	2018-03-19 20:33:58 +09:00
Dean Herbert	b71c123214	Allow import of skins which don't have ini files	2018-03-19 20:26:16 +09:00
smoogipoo	4c0ccffe08	Merge remote-tracking branch 'origin/master' into beat-snap-divisor	2018-03-19 20:23:15 +09:00
smoogipoo	df0b8a24c5	Rename + renamespace	2018-03-19 20:21:19 +09:00
smoogipoo	879dbc75b5	Nest TickContainer in BeatSnapVisualiser	2018-03-19 20:20:29 +09:00
Dean Herbert	18368d2446	Make import notifications fail when any imports fail	2018-03-19 20:18:23 +09:00
smoogipoo	b25c564ecb	Integrate into editor's compose screen	2018-03-19 20:14:58 +09:00
smoogipoo	32fecc6ff4	Adjust icon scale + text	2018-03-19 20:14:34 +09:00
smoogipoo	e96dad441d	Offset the icon buttons a little bit to look a bit more centered ... Maybe it's just me, but this is really triggering me.	2018-03-19 20:14:13 +09:00
Dean Herbert	7272ba2f1b	Add migration for skins which didn't get a proper name assigned ... Also correctly imports new skins	2018-03-19 20:06:44 +09:00
Dean Herbert	ec851648da	Add better ToString output from SkinInfo	2018-03-19 20:06:44 +09:00
Dean Herbert	397b06283a	Add basic skin configuration decoding support	2018-03-19 20:06:44 +09:00
Dean Herbert	8e52d91180	Handle missing files without hard failure ... Also adds support for lookups with file extensions	2018-03-19 20:06:44 +09:00
Dean Herbert	62e908e22c	Add default separator character	2018-03-19 20:06:44 +09:00
Dean Herbert	c4f5b46d72	Add basic structure for skin configurations	2018-03-19 20:06:44 +09:00
smoogipoo	c86ddb7ee3	Add slight easing to marker movements	2018-03-19 19:57:02 +09:00
smoogipoo	fbc92bfa01	Add previous/next divisor button actions	2018-03-19 19:55:49 +09:00
smoogipoo	070db63157	Privatise tick to TickContainer	2018-03-19 19:52:22 +09:00
smoogipoo	7182442b21	Add divisor text	2018-03-19 19:49:57 +09:00
smoogipoo	6b035e8c53	Add basic structure/layout for the beat snap visualiser	2018-03-19 19:46:26 +09:00
Dean Herbert	4b812279bb	Merge branch 'master' into fix-editor-clocks	2018-03-19 19:06:38 +09:00
smoogipoo	8d4c9eda48	Fix attempting to add selection boxes with no selection ... E.g. because DrawableSpinner doesn't (currently) create an overlay, SelectionBox was being constructed with 0 hitobjects and then calculating a non-finite size for itself.	2018-03-19 18:00:11 +09:00
smoogipoo	e25d1f6982	Pass down editor clocks through DI	2018-03-19 16:27:52 +09:00
TocoToucan	245200d3ee	Add simple screenshot notification	2018-03-16 21:25:00 +03:00
TocoToucan	8429408974	Change screenshot file name	2018-03-16 21:05:25 +03:00
TocoToucan	604e725f3f	Remove redundant code	2018-03-16 20:42:05 +03:00
Dean Herbert	4b83278cf4	Merge branch 'master' into fix-editor-clocks	2018-03-16 23:32:54 +09:00
smoogipoo	6f7163769d	Adjust comment for readability	2018-03-16 19:57:14 +09:00
Dean Herbert	e8f7f2c8ab	Merge branch 'master' into editor-wheel-movement	2018-03-16 18:19:42 +09:00
Dean Herbert	4411758ff7	Merge branch 'master' into fix-autoplay-button-deselect	2018-03-16 17:31:14 +09:00
Dean Herbert	bca4b620b6	Merge branch 'master' into editor-wheel-movement	2018-03-16 15:56:51 +09:00
Dean Herbert	7e7f8ed7a2	Merge branch 'master' into drawable-composite-hit-object	2018-03-16 15:53:16 +09:00
Dean Herbert	23ffee3d38	Merge branch 'master' into drawable-composite-hit-object	2018-03-16 15:38:52 +09:00
Dean Herbert	46f5c0fc19	Merge branch 'master' into mod-fixes	2018-03-16 15:38:41 +09:00
smoogipoo	aa82393824	Merge master into api-as-component	2018-03-16 15:22:48 +09:00
Dan Balasescu	cdc61d5f0d	Merge branch 'master' into fix-combo-colours	2018-03-16 14:59:45 +09:00
smoogipoo	b27b6c7eb7	Merge branch 'master' into cursor-trail	2018-03-16 14:43:27 +09:00
Dean Herbert	7ed84465fb	Merge branch 'master' into mod-fixes	2018-03-16 11:27:39 +09:00
smoogipoo	fc15c63a88	Re-order methods	2018-03-15 18:28:08 +09:00
smoogipoo	c937ef5d24	Fix not being able to scroll before the first timing point	2018-03-15 18:26:53 +09:00
smoogipoo	d05947ef48	Pass adjustable clocks to components, rather than relying on the track	2018-03-15 18:19:28 +09:00
smoogipoo	c8f6a6980b	Move clock construction to Editor	2018-03-15 17:27:37 +09:00
smoogipoo	5e742eb466	Move editor constructions to BDL load	2018-03-15 17:10:08 +09:00
smoogipoo	9e0aeec574	Use a decoupled clock for accurate clock times	2018-03-15 17:03:33 +09:00
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