4193 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	b98ae5d7c3	Merge pull request #704 from smoogipooo/mania-stage ... Mania playfield	2017-05-04 17:02:42 +09:00
Dean Herbert	efa60ee287	Merge branch 'master' into mania-stage	2017-05-04 16:58:16 +09:00
smoogipooo	72b2467e74	Throw exception if SpecialColumnPosition is set after IsLoaded.	2017-05-04 15:18:20 +09:00
smoogipooo	e307b6d563	Make SpecialColumnPosition only have an effect during load().	2017-05-04 15:12:32 +09:00
smoogipooo	a2bdd020e5	ColumnStyle -> ColumnPosition.	2017-05-04 14:54:31 +09:00
Dean Herbert	f5981b1ab9	Merge pull request #699 from peppy/options-implementation ... Confine mouse mode and more	2017-05-03 22:02:58 +09:00
Dean Herbert	19f6d58723	Merge remote-tracking branch 'upstream/master' into options-implementation	2017-05-03 21:54:27 +09:00
Dean Herbert	c39b314ac2	Update framework.	2017-05-03 21:29:42 +09:00
Dean Herbert	330dd458bd	Trim whitespace.	2017-05-03 20:49:52 +09:00
Dean Herbert	489f586887	Add FPS display toggling. ... Kinda temporary but better than nothing.	2017-05-03 20:34:53 +09:00
Dan Balasescu	5574a8770b	Merge branch 'master' into mania-stage	2017-05-03 20:19:00 +09:00
Dan Balasescu	5024a74192	Update ManiaPlayfield.cs	2017-05-03 20:11:24 +09:00
smoogipooo	8aa6bb636c	Reset column key when it can't be set.	2017-05-03 19:43:20 +09:00
smoogipooo	8d82a52942	Add revert to normal special style after all steps.	2017-05-03 19:38:27 +09:00
smoogipooo	14e4714f08	Rewrite a lot of ManiaPlayfield/Column to support left/right special styles and arbitrary number of columns.	2017-05-03 19:38:15 +09:00
smoogipooo	06e014708a	Defer virtual method to load().	2017-05-03 15:57:15 +09:00
Dan Balasescu	d21c3358b9	Less array explicivity.	2017-05-03 13:03:46 +09:00
smoogipooo	7de36b7aa2	CI cleanups.	2017-05-03 12:58:46 +09:00
smoogipooo	71acf1c57d	Move classes out of test case.	2017-05-03 12:37:47 +09:00
smoogipooo	b4052a099f	Create ManiaPlayfield, support up to 9 columns, improve testcase automation.	2017-05-03 12:30:03 +09:00
Dean Herbert	8da5686007	Merge pull request #703 from smoogipooo/taiko-fixes ... Fix taiko auto replay generation not working.	2017-05-03 11:30:02 +09:00
smoogipooo	4d27e0abb6	Oops i didn't save the solution.	2017-05-03 11:25:54 +09:00
smoogipooo	60c2e2a90a	Fix taiko auto replay generation not working.	2017-05-03 11:22:09 +09:00
smoogipooo	27e16b8cfd	Merge remote-tracking branch 'origin/master' into mania-stage	2017-05-03 10:50:10 +09:00
Dean Herbert	c8e5f8bd95	Merge pull request #696 from smoogipooo/custom-drawings-flags ... Custom drawings flags	2017-05-03 09:41:01 +09:00
Dean Herbert	8825277656	Merge branch 'master' into custom-drawings-flags	2017-05-03 09:36:51 +09:00
Dean Herbert	a036b059e8	Use provided parameters to avoid a second lookup.	2017-05-02 21:40:06 +09:00
Dean Herbert	691742b828	Remove most options which have not yet been implemented.	2017-05-02 19:40:30 +09:00
Dean Herbert	f9de733128	Formatting.	2017-05-02 18:53:33 +09:00
Dean Herbert	d4045ee2c0	We only have one release stream, so let's unlock it.	2017-05-02 18:40:30 +09:00
Dean Herbert	57c2dd1f49	Fix options dropdown labels never being displayed.	2017-05-02 18:35:23 +09:00
Dan Balasescu	087f22e7ca	Merge pull request #698 from peppy/music-controller-fixes ... Music controller fixes	2017-05-02 18:04:53 +09:00
smoogipooo	8e88d86639	Fix naming confusion.	2017-05-02 18:00:37 +09:00
smoogipooo	f1f7a26dbd	Fix incorrect inheritance.	2017-05-02 17:58:59 +09:00
Dean Herbert	a993790a66	Ensure all searchable terms are non-null non-empty.	2017-05-02 17:54:07 +09:00
Dean Herbert	1b0f353af3	Add support for framework-level mouse confining.	2017-05-02 17:45:42 +09:00
Dean Herbert	bef15fe637	Improve organisation of some options and config code.	2017-05-02 17:45:22 +09:00
smoogipooo	9ca8295149	Oops.	2017-05-02 17:09:16 +09:00
Dean Herbert	116e92a542	Remove silly platform specific logic.	2017-05-02 17:00:30 +09:00
smoogipooo	40d2fee1dc	Split up adding of local store from the ctor.	2017-05-02 16:55:04 +09:00
smoogipooo	e2620e2840	Make Team not inherit Country.	2017-05-02 16:54:43 +09:00
Dean Herbert	46ae8bc86b	Use value because we need to.	2017-05-02 16:49:27 +09:00
Dean Herbert	f1d0b77d10	Base the music controller transform direction on relative indices in playlist.	2017-05-02 16:40:29 +09:00
smoogipooo	ee0a5409bb	CI fixes.	2017-05-02 16:33:48 +09:00
smoogipooo	9eaf6b3ccb	Merge branch 'master' into custom-drawings-flags ... # Conflicts: # osu-framework	2017-05-02 16:29:54 +09:00
Dean Herbert	beb98c14b6	Fix layout not being invalidated when re-filtering playlist display.	2017-05-02 16:26:11 +09:00
Dean Herbert	57e63b9934	Merge pull request #697 from peppy/general-fixes ... Update framework with new DI changes.	2017-05-02 15:41:29 +09:00
Dean Herbert	d06b3c898f	Update framework with new DI changes.	2017-05-02 15:32:47 +09:00
smoogipooo	91e000fd44	Back to sanity.	2017-05-02 14:21:22 +09:00
smoogipooo	f17046abaf	Add ability to load Drawings flags from osu/Drawings/Flags.	2017-05-02 13:28:35 +09:00