11883 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipoo	193142e901	Fix missed BDL case	2018-03-19 16:44:46 +09:00
smoogipoo	e25d1f6982	Pass down editor clocks through DI	2018-03-19 16:27:52 +09:00
Dean Herbert	2c7a18984e	Merge branch 'master' into fix-catch-droplets	2018-03-19 00:36:05 +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
smoogipoo	abb5dcf678	Fix null-refing testcase ... This would also be fixed with BDL loading children after we're fully loaded ;).	2018-03-16 23:53:55 +09:00
Dean Herbert	4b83278cf4	Merge branch 'master' into fix-editor-clocks	2018-03-16 23:32:54 +09:00
Dean Herbert	cbe2de33c5	Merge pull request #2225 from smoogipoo/editor-wheel-movement ... Implement mousewheel time scrolling in the editor	2018-03-16 23:31:45 +09:00
smoogipoo	6f7163769d	Adjust comment for readability	2018-03-16 19:57:14 +09:00
Dean Herbert	7c7f2e2dce	Merge branch 'master' into fix-catch-droplets	2018-03-16 19:05:58 +09:00
Dean Herbert	e8f7f2c8ab	Merge branch 'master' into editor-wheel-movement	2018-03-16 18:19:42 +09:00
Dean Herbert	1b2e4bb8f7	Merge pull request #2207 from FreezyLemon/fix-autoplay-button-deselect ... Fix autoplay button wrongly being active after a Ctrl-Enter play	2018-03-16 18:01:55 +09:00
Dean Herbert	4411758ff7	Merge branch 'master' into fix-autoplay-button-deselect	2018-03-16 17:31:14 +09:00
Dean Herbert	8d790e180d	Fix juice stream droplets spawning in incorrect locations ... Closes #2149.	2018-03-16 17:03:38 +09:00
Dan Balasescu	18615ce8fd	Merge pull request #2223 from peppy/drawable-composite-hit-object ... Make DrawableHitObject a CompositeDrawable	2018-03-16 16:24:26 +09:00
smoogipoo	20acc601bb	Fix up breaking taiko changes	2018-03-16 16:10:09 +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	f640b874df	Merge pull request #2219 from Joehuu/mod-fixes ... Improve mods description and adjust multipliers to match stable	2018-03-16 15:53:04 +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
Dan Balasescu	39bf393682	Merge pull request #2218 from peppy/api-as-component ... Consolidate API into its own component	2018-03-16 15:38:17 +09:00
smoogipoo	2ba2556d2a	Update submodules	2018-03-16 15:24:47 +09:00
smoogipoo	aa82393824	Merge master into api-as-component	2018-03-16 15:22:48 +09:00
Dan Balasescu	41036ab79e	Merge pull request #2215 from peppy/fix-combo-colours ... Fix beatmap combo colours not being applied	2018-03-16 15:19:43 +09:00
Dan Balasescu	cdc61d5f0d	Merge branch 'master' into fix-combo-colours	2018-03-16 14:59:45 +09:00
Dan Balasescu	e406cf2207	Merge pull request #2170 from peppy/cursor-trail ... Make gameplay cursor vs skip button feel nice again	2018-03-16 14:57:00 +09:00
smoogipoo	b27b6c7eb7	Merge branch 'master' into cursor-trail	2018-03-16 14:43:27 +09:00
smoogipoo	7ded1635fa	Update submodules	2018-03-16 14:43:14 +09:00
Dan Balasescu	b39c04e122	Merge pull request #2078 from UselessToucan/DoNotMoveToPlayerWhileDragging ... Improve mouse-based load inhibition at player loading screen	2018-03-16 14:31:19 +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	8fbaa86e64	Fix testcases	2018-03-15 18:24:57 +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
smoogipoo	f693fbf92d	Add forward snapping from inbetween beat test	2018-03-14 23:08:43 +09: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