2508 Commits

Author	SHA1	Message	Date
DrabWeb	1a78ac3d10	Add Multiplayer screen.	2018-05-15 21:14:10 -03:00
DrabWeb	1450bf64f5	Add multiplayer screen header.	2018-05-15 20:34:14 -03:00
Dean Herbert	28edf3bce7	Merge branch 'master' into hud-above-letterbox	2018-05-14 19:31:39 +09:00
Dean Herbert	0234bbc37f	Move definition inline	2018-05-14 19:14:17 +09:00
Dean Herbert	f14948c022	Merge branch 'master' into exit-hold-confirmation	2018-05-14 18:13:40 +09:00
smoogipoo	115c2dc239	Move hud below the skip button	2018-05-14 18:02:18 +09:00
smoogipoo	64fba5f6d1	Proxy the ruleset cursor above the break overlay	2018-05-14 15:36:56 +09:00
smoogipoo	43409127b7	Place break overlay underneath the hud	2018-05-14 15:36:42 +09:00
Dan Balasescu	d7cba000ab	Merge branch 'master' into fix-wedge-nullref	2018-05-14 13:36:07 +09:00
Dean Herbert	db0470243a	Fix nullref when changing ruleset at main menu	2018-05-13 12:55:54 +09:00
Dean Herbert	cfa18bdf1f	Fix song progress time counters wrapping after an hour ... Resolves #2466. Supersedes and closes #2487.	2018-05-11 22:10:26 +09:00
Dean Herbert	c19432dc6d	Merge branch 'master' into ruleset-beatmap-statistics	2018-05-11 17:37:50 +09:00
smoogipoo	fd9796d08c	Remove some unnecessary changes	2018-05-11 14:13:52 +09:00
smoogipoo	816ad5c426	Pass down ruleset to the buffered wedge	2018-05-11 14:10:53 +09:00
smoogipoo	73465c35fa	Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics ... # Conflicts: # osu.Game/Beatmaps/Beatmap.cs	2018-05-11 14:05:40 +09:00
DrabWeb	a86843ccc9	Remove unused usings caused by multiplayer folder restructuring.	2018-05-10 20:49:42 -03:00
DrabWeb	bc9ac8f72a	Move multiplayer screens to osu.Game/Screens/Multi/Screens	2018-05-10 20:47:25 -03:00
DrabWeb	2d206d258a	Move multiplayer screen components to osu.Game/Screens/Multi/Components	2018-05-10 20:44:24 -03:00
DrabWeb	c35760fdef	Rename osu.Game/Screens/Multiplayer to Multi.	2018-05-10 20:39:05 -03:00
Dean Herbert	8a6ef0dabb	Merge branch 'master' into beatmap-conversion-rework	2018-05-10 19:10:07 +08:00
Dean Herbert	9e26bcd571	Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap	2018-05-10 19:51:52 +09:00
Dean Herbert	5df9f126d1	Implement a hold-to-confirm screen when exiting game using escape key	2018-05-10 17:07:19 +09:00
smoogipoo	674e45d49b	Fix beatmap/ruleset being changeable while in the editor	2018-05-07 16:32:15 +09:00
smoogipoo	fbd7ccc03f	Make BeatmapInfoWedge display properly for converts	2018-05-07 15:51:08 +09:00
smoogipoo	5489976c20	Implement ruleset-specific beatmap statistics	2018-05-07 15:51:08 +09:00
smoogipoo	9128e64c9a	Rename OriginalBeatmap back to Beatmap	2018-05-07 10:29:38 +09:00
smoogipoo	4ecdea8b2e	Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer	2018-05-07 10:17:54 +09:00
smoogipoo	77e661489d	Merge branch 'i-beatmap' into beatmap-conversion-rework	2018-05-07 10:00:24 +09:00
smoogipoo	1aefd71b65	Merge remote-tracking branch 'origin/master' into i-beatmap	2018-05-07 09:58:53 +09:00
Dean Herbert	4f53185d43	Invert logic to match existing toggles	2018-04-25 16:18:55 +09:00
Dean Herbert	c517b73375	Merge branch 'master' into ignore_beatmap_skin	2018-04-25 15:57:39 +09:00
Dean Herbert	45810e6220	Merge branch 'master' into ignore_beatmap_skin	2018-04-24 17:15:39 +09:00
Dean Herbert	3886e75959	Fix potentially missing group headers in beatmap carousel	2018-04-24 01:52:25 +09:00
Dean Herbert	93b77d9cfe	Remove annotation	2018-04-23 22:22:31 +09:00
UselessToucan	254e9929be	Merge branch 'master' into ignore_beatmap_skin	2018-04-23 13:06:24 +03:00
Dean Herbert	2d1cef79d6	Fix instability in carousel item sorting	2018-04-23 19:01:01 +09:00
Dean Herbert	ff3d3379f0	Merge remote-tracking branch 'upstream/master' into async-screens	2018-04-23 18:29:37 +09:00
Dean Herbert	194992936d	Use exceptions	2018-04-23 17:57:47 +09:00
Dean Herbert	0709a0926b	Merge branch 'master' into misc-fixes	2018-04-23 17:46:58 +09:00
Dean Herbert	2d82c0b5cd	Fix logical regression	2018-04-23 16:41:15 +09:00
Dean Herbert	6e16f2a3c3	Add assert to appease rider/r#	2018-04-23 15:03:41 +09:00
Dean Herbert	36a671e306	Fix new detections in rider 2018.1	2018-04-23 14:56:45 +09:00
Dean Herbert	2c9b2aa0e7	Fix intro setting beatmap in background thread causing race conditions	2018-04-22 02:46:20 +09:00
TocoToucan	1ce38c7fc6	Visual settings: Ignore beatmap hitsounds	2018-04-20 18:30:41 +03:00
TocoToucan	606e088713	Visual settings: Ignore beatmap skin	2018-04-20 18:17:57 +03:00
Dean Herbert	e9e97f31d6	Merge remote-tracking branch 'upstream/master' into peppy-async-screens	2018-04-20 19:06:47 +09:00
Dean Herbert	a5b0005976	Merge branch 'master' into remove-approachcircle-hax	2018-04-20 18:36:49 +09:00
smoogipoo	0dce7a5b61	Update framework + fix CI errors	2018-04-20 18:19:17 +09:00
Dean Herbert	8bf25542cb	Add PlayerLoader TestCase and fix dummy beatmap load procedure	2018-04-20 17:30:27 +09:00
Dean Herbert	de85436534	Merge remote-tracking branch 'upstream/master' into peppy-async-screens	2018-04-20 16:52:58 +09:00