7564 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DrabWeb	01e70f9bef	Change type check to safe cast.	2017-09-21 14:53:42 -03:00
DrabWeb	46af17f00c	Fix preview button potential null ref.	2017-09-21 14:46:51 -03:00
DrabWeb	cb4818e84e	Merge https://github.com/ppy/osu into online-beatmap-set-overlay	2017-09-21 14:25:34 -03:00
EVAST9919	9667270336	Remove using	2017-09-21 01:56:50 +03:00
EVAST9919	e051bcc6df	Fix wrong arrows position on startup	2017-09-21 01:51:40 +03:00
EVAST9919	c79568135a	Add arrows	2017-09-21 01:44:30 +03:00
EVAST9919	18a714df74	Move every class to it's own file	2017-09-20 22:33:07 +03:00
EVAST9919	581689a84d	CI fixes	2017-09-20 20:58:20 +03:00
EVAST9919	4699a44608	Add info container	2017-09-20 20:50:14 +03:00
EVAST9919	8d7db52200	Add remaining time counter	2017-09-20 19:45:38 +03:00
EVAST9919	eb93706c26	Remove useless usings	2017-09-20 16:03:31 +03:00
EVAST9919	0f04d8c6a7	Add remaining time container	2017-09-20 15:58:28 +03:00
EVAST9919	1d978d3617	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-20 15:36:54 +03:00
smoogipooo	e65a17ad96	Remove redundant usings	2017-09-20 18:40:41 +09:00
smoogipooo	7168e8fd99	Improve layout of bottom bar in the Editor	2017-09-20 18:16:03 +09:00
smoogipooo	58b09a161f	CI fixes	2017-09-20 17:16:12 +09:00
smoogipooo	7588f1b6ca	Add SummaryTimeline to Editor	2017-09-20 17:09:38 +09:00
smoogipooo	f9568619e7	Move SummaryTimeline into /Edit/Components/SummaryTimeline	2017-09-20 16:59:03 +09:00
smoogipooo	3da3ef1a50	CI fixes	2017-09-20 16:53:01 +09:00
smoogipooo	5978668d2b	Mini -> Summary	2017-09-20 16:48:30 +09:00
smoogipooo	967bfa404e	Generate a set beatmap instead of using the available beatmaps	2017-09-20 16:40:37 +09:00
smoogipooo	6a9572db6c	Merge branch 'master' into editor-timing-timeline ... # Conflicts: # osu-framework	2017-09-20 16:19:08 +09:00
smoogipooo	01d84893a0	Cleanup + commenting	2017-09-20 15:55:23 +09:00
smoogipooo	fd278256ad	EditorTimingTimeline -> EditorMiniTimeline	2017-09-20 15:50:32 +09:00
smoogipooo	252121968d	Actually load a beatmap for TestCaseEditorTimingTimeline	2017-09-20 15:40:42 +09:00
smoogipooo	01c3818ea0	Make EditorTimingTimeline support beatmap changes	2017-09-20 15:40:27 +09:00
Dean Herbert	120446e4a7	Ensure only one dialog is being displayed by the SongSelect footer at a time ... Fixes #1208	2017-09-20 14:32:15 +09:00
Dan Balasescu	278e51eebc	Merge pull request #1297 from peppy/deploy-multiple-targets ... Allow deploy script to deploy multiple project targets	2017-09-20 12:57:24 +09:00
Damnae	fcaabf7fdf	Merge branch 'master' into storyboard_integration	2017-09-19 17:36:29 +02:00
Dean Herbert	2923af1946	Allow deploy script to deploy multiple project targets	2017-09-19 23:44:46 +09:00
EVAST9919	4cf88c72bf	Move testcase to the correct project	2017-09-19 17:37:34 +03:00
EVAST9919	85b990c088	Remove useless file	2017-09-19 17:28:10 +03:00
EVAST9919	c59d398aa5	Fix includes	2017-09-19 17:26:17 +03:00
EVAST9919	1b0ab414fa	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-19 17:23:10 +03:00
smoogipooo	67d3861226	Initial implementation of the EditorTimingTimeline in TestCaseEditorTimingTimeline ... Will probably rename this to MiniTimeline or something... But the basic structure is there plus most of functionality minus keyboard input.	2017-09-19 23:09:08 +09:00
EVAST9919	1de8bca7f6	Merge remote-tracking branch 'refs/remotes/ppy/master' into icons_jumping_fix	2017-09-19 17:08:32 +03:00
Dan Balasescu	183f192dd5	Merge pull request #1296 from peppy/fix-release-paths ... Fix ruleset target path for release builds	2017-09-19 22:57:28 +09:00
Dean Herbert	e0911f014e	Fix ruleset target path for release builds	2017-09-19 22:50:36 +09:00
Dan Balasescu	2e799aaf67	Merge pull request #1277 from peppy/ctb-improvements ... osu!catch improvements	2017-09-19 21:50:18 +09:00
Dean Herbert	611f4df484	Add licence header	2017-09-19 21:41:51 +09:00
Dean Herbert	3000323727	Give WorkingBeatmap's Metadata a non-null default	2017-09-19 21:41:18 +09:00
Dean Herbert	f96875a470	Add a catch specific player test	2017-09-19 21:40:57 +09:00
Dean Herbert	0aa152974a	Add interfaces to CatchBaseHit	2017-09-19 21:40:38 +09:00
Dean Herbert	4b68950428	Fix incorrect coordinate mapping on fruit explosion	2017-09-19 21:39:53 +09:00
Dean Herbert	c88b0784da	Use MaxValue instead of PositiveInfinity	2017-09-19 21:39:17 +09:00
Dean Herbert	d192c2d83b	Merge remote-tracking branch 'upstream/master' into ctb-improvements	2017-09-19 20:54:39 +09:00
Dan Balasescu	13a364c2f6	Merge pull request #1293 from peppy/merge-projects ... Merge desktop projects and optimise build	2017-09-19 20:51:13 +09:00
Dean Herbert	05303d37d3	Update framework	2017-09-19 20:43:29 +09:00
Dean Herbert	4b0eee2bcc	Merge remote-tracking branch 'upstream/master' into merge-projects	2017-09-19 20:43:20 +09:00
Dean Herbert	ef210018d9	Run headless tests with a unique name based on the executing assembly	2017-09-19 20:04:37 +09:00