7612 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jorolf	de2181b8f5	Merge branch 'master' of git://github.com/ppy/osu into direct-previews	2017-10-06 21:02:48 +02:00
Jorolf	5a8b8dacbb	move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton	2017-10-06 21:02:00 +02:00
Dean Herbert	c22e1520a0	Merge pull request #1337 from smoogipoo/editor-screens ... Initial implementation of editor screens	2017-10-07 01:09:04 +08:00
smoogipoo	10abaa866b	Put screens below the top and bottom bars of the editor	2017-10-07 01:56:11 +09:00
smoogipoo	c0b394811f	Make compose mode the default ... Hopefully we can keep this at a ScreenSelectionTabControl level, but it may need to be moved to the Editor at some point. I'm leaving that for a future change however, if it's needed.	2017-10-07 01:46:54 +09:00
smoogipoo	d432ab7510	Reorder screen tab control items	2017-10-07 01:44:20 +09:00
smoogipoo	38ae9d905e	Fix bindable binding to make the editor load a screen by default again	2017-10-07 01:42:45 +09:00
smoogipoo	837d1ba12e	Remove rounded corners on the editor menu bar	2017-10-07 01:38:13 +09:00
smoogipoo	d3109a5950	Hook up BeatmapPanel "Edit" item	2017-10-07 00:59:14 +09:00
smoogipoo	a154ee3a89	Add File -> Exit to editor menu	2017-10-07 00:51:30 +09:00
smoogipoo	fc99860f4e	Remove EditorMenuBarItem	2017-10-07 00:51:20 +09:00
Dean Herbert	19c663da11	Remove scale effect on editor screen switches	2017-10-06 23:41:49 +08:00
Dean Herbert	3557737a18	Update framework	2017-10-06 23:20:56 +08:00
Dean Herbert	55267abe67	Merge branch 'master' into editor-screens	2017-10-06 23:19:16 +08:00
Dean Herbert	79fcfda10a	Merge pull request #1279 from EVAST9919/break_overlay_take_three ... Initial implementation of the Break Overlay	2017-10-06 13:09:31 +08:00
EVAST9919	95ac4e9265	Remove useless using	2017-10-06 04:57:46 +03:00
EVAST9919	96fcc095eb	Apply suggested shrinking bar changes	2017-10-06 04:49:16 +03:00
EVAST9919	2bc8fe027b	Extend the testcase to test short breaks	2017-10-05 06:17:48 +03:00
EVAST9919	5caca1d328	Don't use '#' in RankDisplay for now	2017-10-05 05:27:52 +03:00
EVAST9919	cb0dbc6d9e	Fix shrinking bar lingering on the screen for too long	2017-10-05 05:23:18 +03:00
EVAST9919	cc99678a96	Remove useless usings	2017-10-05 05:09:23 +03:00
Dean Herbert	20bf0502ab	Use scheduling rather than raw transform delays	2017-10-05 10:03:48 +08:00
EVAST9919	22a59d753b	Make all the overlays IStateful	2017-10-05 04:38:13 +03:00
EVAST9919	80fb14e3dc	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-10-04 14:50:02 +03:00
smoogipoo	8a52fdc8fa	Use a bindable for the current screen in EditorMenuBar ... Replaces the current Action.	2017-10-04 19:37:17 +09:00
smoogipoo	34eede0d04	Re-namespace EditorScreenMode	2017-10-04 19:36:55 +09:00
smoogipoo	e2824d4732	Reduce harshness of scale for now ... Though I don't feel like we should worry about this much just yet until we have actual designs and can see how it looks. It's very well possible that we use different transitions here...	2017-10-04 19:26:26 +09:00
smoogipoo	357a467337	Implement design mode	2017-10-04 19:24:19 +09:00
smoogipoo	cf44868bcd	Give EditorScreen a Beatmap	2017-10-04 15:02:11 +09:00
Dean Herbert	4930dfe87e	Merge pull request #1328 from EVAST9919/clickable_users ... Show mapper's profile when clicking on avatar in BeatmapSetOverlay	2017-10-04 12:12:02 +08:00
EVAST9919	d61e72b5a3	Merge remote-tracking branch 'refs/remotes/ppy/master' into clickable_users	2017-10-03 01:51:10 +03:00
EVAST9919	aafead5057	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-10-03 01:34:42 +03:00
Dan Balasescu	da4af724db	Merge pull request #1335 from peppy/catch-refactors ... osu!catch refactoring	2017-10-02 23:30:44 +09:00
Dean Herbert	37393ab2c9	Move brace	2017-10-02 22:24:22 +08:00
Dean Herbert	3338024c17	Fix incorrect whitespace	2017-10-02 22:12:53 +08:00
Dean Herbert	7168629b2a	Remove CatcherArea abstraction ... Also fixes catcher size being relative to aspect ratio.	2017-10-02 21:55:37 +08:00
Dean Herbert	12a9cbad56	Allow Beatmap to populate some metadata defaults if they aren't provided via BetamapInfo	2017-10-02 21:54:26 +08:00
Dean Herbert	66afba6219	Allow TestCasePlayer to instantiate only one ruleset type	2017-10-02 20:48:24 +08:00
EVAST9919	b6ed977e1e	Fix hard crash and fix breaks have been initialized twice	2017-10-02 09:04:03 +03:00
EVAST9919	7052462863	Update inline with framework	2017-10-02 08:51:00 +03:00
EVAST9919	c2f487aa3e	Add Rank as a property to the Score Processor	2017-10-02 05:56:38 +03:00
EVAST9919	5ce2723719	Don't use linq query	2017-10-02 05:12:56 +03:00
smoogipoo	7211dd2015	Remove unnecessary usings	2017-10-02 10:11:43 +09:00
smoogipoo	69b61a62a5	Implement base Compose screen	2017-10-02 10:09:21 +09:00
smoogipoo	af4c6276e4	Adjust transforms of EditorScreen	2017-10-02 10:09:10 +09:00
smoogipoo	91cede79c2	Mask the editor screens	2017-10-02 10:07:34 +09:00
smoogipoo	6018b4e5e4	Make EditorScreen a Container	2017-10-02 09:34:51 +09:00
smoogipoo	2a310f02bc	modeContainer -> screenContainer	2017-10-02 09:27:27 +09:00
smoogipoo	c2d63eb0bd	Add EditorScreen + screen changing functionality	2017-10-02 09:26:52 +09:00
smoogipoo	221902f4fe	Restructure Editor construction	2017-10-02 09:26:16 +09:00