689 Commits

Author	SHA1	Message	Date
Dean Herbert	aaa65c428f	Merge branch 'master' into diffcalc-modtypes	2018-06-09 23:35:17 +09:00
Dean Herbert	f3c9049660	Merge branch 'master' into disallow-beatmap-change	2018-06-07 15:34:19 +09:00
smoogipoo	3745f9000b	Merge remote-tracking branch 'origin/master' into remove-decoder-offset	2018-06-07 13:37:19 +09:00
Dan Balasescu	c30861186b	Merge branch 'master' into disallow-beatmap-change	2018-06-06 20:26:17 +09:00
smoogipoo	ebcfe97ccf	Expose Dependencies from base OsuTestCase	2018-06-06 20:25:40 +09:00
smoogipoo	f2ac5b8b2d	CreatePlayer shouldn't receive a beatmap	2018-06-06 20:21:47 +09:00
ekrctb	94a22fb43d	Merge branch 'fix-ImportBeatmapTest' of https://github.com/ekrctb/osu into fix-ImportBeatmapTest	2018-06-06 18:37:04 +09:00
ekrctb	aeeb03ff9c	simpler temporary path generation	2018-06-06 18:36:43 +09:00
smoogipoo	4086ff7313	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs # osu.Game/Screens/Menu/Intro.cs # osu.Game/Screens/Menu/MenuSideFlashes.cs	2018-06-06 18:26:51 +09:00
smoogipoo	83ff47ec80	Rewrite difficulty mod combinations	2018-06-06 16:20:17 +09:00
Dean Herbert	a133a8229b	Merge branch 'master' into fix-ImportBeatmapTest	2018-06-06 09:34:19 +09:00
ekrctb	b84441ab87	Fix TestImportOverIPC	2018-06-04 22:25:18 +09:00
Dan Balasescu	b2cc7b9a5c	Merge branch 'master' into fix-beatmap-info-wedge-async	2018-06-04 20:29:29 +09:00
Dan Balasescu	566470e852	Merge branch 'master' into better-loading-logo	2018-06-04 20:06:22 +09:00
Thomas Müller	88b23d4e66	Merge branch 'master' into netcoreapp2.1	2018-06-04 05:30:25 +02:00
Dean Herbert	4b604bf055	Merge branch 'master' into disallow-beatmap-change	2018-06-04 10:53:04 +09:00
ekrctb	ed1918cd43	Wait for loading beatmaps	2018-06-03 23:11:45 +09:00
Dean Herbert	d287e32faf	Update project build configurations to target netcoreapp2.1	2018-06-02 22:20:17 +09:00
Dean Herbert	5c2a2e394e	Fix incorrect async logic in BeatmapInfoWedge ... Closes #2653. Alternative to #2657.	2018-06-01 20:31:29 +09:00
Dean Herbert	a6f2561be8	Fix automated testing	2018-05-31 20:07:55 +09:00
Dean Herbert	dfbcf4d7b7	Add tests	2018-05-31 17:29:59 +09:00
Dan Balasescu	a9db479b27	Merge branch 'master' into import-fixes	2018-05-31 13:49:12 +09:00
Dean Herbert	319faf12f7	Fix incorrect naming of label	2018-05-31 12:39:56 +09:00
Dean Herbert	2f21b9c4ea	Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits	2018-05-31 12:36:37 +09:00
Dean Herbert	203691b1c7	Add import rollback test	2018-05-29 16:23:38 +09:00
Dean Herbert	cc081cad5a	Simplify test osz instantiation	2018-05-29 16:23:38 +09:00
Dean Herbert	015fd9d0e7	Fix loading test method returning oldest import rather than newest	2018-05-29 16:23:38 +09:00
smoogipoo	a3470f9ec3	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game/Overlays/Music/PlaylistOverlay.cs # osu.Game/Screens/OsuScreen.cs	2018-05-28 18:01:15 +09:00
Dean Herbert	02c37ebc1f	Move screen titles to OsuScreen	2018-05-28 13:30:24 +09:00
Dean Herbert	3c3412791c	Merge remote-tracking branch 'upstream/release' into multiplayer-lounge	2018-05-28 13:30:04 +09:00
smoogipoo	b267ec3178	Fix failing test	2018-05-28 03:48:09 +09:00
Dean Herbert	12b5ca1b0d	Merge branch 'master' into multiplayer-lounge	2018-05-27 11:15:03 +09:00
Dean Herbert	975ce82177	Ensure autoplay tests actually increase score above zero	2018-05-26 14:46:05 +09:00
Dean Herbert	79442ad238	Merge branch 'master' into CursorOverrideContainer-rename	2018-05-26 12:19:47 +09:00
HoutarouOreki	e2d840c2de	Rename CursorOverrideContainer to MenuCursorContainer	2018-05-25 21:13:40 +02:00
Dean Herbert	adeb23d54b	Merge branch 'master' into fix-failing-tests	2018-05-25 19:36:05 +09:00
Dean Herbert	8977670088	Update framework	2018-05-25 19:21:49 +09:00
Dean Herbert	7d06a08c3a	Fix quit button test occasionally failing	2018-05-25 17:44:56 +09:00
smoogipoo	f1ac84d95b	Fix base.CreateLocalDependencies sometimes not being called	2018-05-24 13:03:25 +09:00
smoogipoo	8004b8af4d	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
jorolf	8fbda5bc59	add license header	2018-05-22 15:41:10 +02:00
jorolf	b324337fa1	Add icon next to beatmap title/username to open in browser	2018-05-22 15:29:52 +02:00
DrabWeb	0b19b7d9e5	Fix test case.	2018-05-22 02:08:50 -03:00
DrabWeb	fba79a4de6	Test typo.	2018-05-22 01:31:01 -03:00
DrabWeb	662559d3c9	More test steps.	2018-05-22 01:22:23 -03:00
DrabWeb	f7a4a4eeef	Add Lounge FilterControl.	2018-05-22 00:24:39 -03:00
DrabWeb	cae09492c3	Basic Lounge functionality.	2018-05-22 00:07:04 -03:00
Dean Herbert	ebda287e81	Share code with HoldToConfirm implementations elsewhere	2018-05-22 01:44:06 +09:00
Dean Herbert	841336a181	Merge branch 'master' into exit_replay_button	2018-05-21 23:45:06 +09:00
Dean Herbert	92668f07e0	Merge branch 'master' into drawable-room-improvements	2018-05-21 11:09:12 +09:00