15261 Commits

Author	SHA1	Message	Date
Dean Herbert	dcc8f6e827	Better group cancel conditional	2019-11-01 14:43:52 +09:00
Dean Herbert	d089e47a56	Merge branch 'master' into master	2019-11-01 14:15:57 +09:00
Dean Herbert	ac02bb005d	Fix GameplayClockContainer operating on beatmap's track after scren exited	2019-11-01 14:11:18 +09:00
Dan Balasescu	9b9366e2d7	Merge branch 'master' into fix-multi-logout-crash	2019-11-01 13:55:28 +09:00
Dean Herbert	7c3dd36add	Fix scrolling hitobjects expiring too soon (#6687) ... Fix scrolling hitobjects expiring too soon	2019-11-01 13:03:51 +09:00
Dan Balasescu	770726cc95	Merge branch 'master' into fix-multi-logout-crash	2019-11-01 12:46:26 +09:00
smoogipoo	0171b2ae7c	Fix scrolling hitobjects expiring too soon	2019-11-01 12:10:03 +09:00
Dean Herbert	f038c579f0	Protect against requests to show overlays before the target overlay is ready	2019-11-01 11:41:00 +09:00
Dean Herbert	898520935e	Move link handling code to OsuGame ... This allows for future calls from arguments / associations	2019-11-01 11:40:51 +09:00
Dan Balasescu	54681a6206	Merge branch 'master' into catch-api-request-exceptions	2019-11-01 11:33:23 +09:00
smoogipoo	41ae66d517	Update slider when control points change	2019-10-31 18:24:38 +09:00
smoogipoo	9f28b1905b	Expose composer method to update hitobject	2019-10-31 18:15:19 +09:00
Dean Herbert	ce19b2ed36	Avoid using CreateChildDependencies with a *child* bindable ... Don't do this.	2019-10-31 17:16:26 +09:00
Dean Herbert	3e3ff81229	Reorder methods	2019-10-31 17:13:00 +09:00
Dean Herbert	4f04abf282	Fix tabs to match design (should not show pinhair line)	2019-10-31 16:54:28 +09:00
smoogipoo	cfdf710676	Add test	2019-10-31 16:51:58 +09:00
Dean Herbert	5d47a2e557	Merge branch 'master' into add-beatmap-ruleset-selector	2019-10-31 16:42:32 +09:00
Dean Herbert	bf45fa6309	Use lambda function expression	2019-10-31 16:24:03 +09:00
Dean Herbert	f8187fa301	Don't rely on masking for bar display	2019-10-31 16:23:10 +09:00
Dean Herbert	923041c3f9	Merge branch 'master' into beatmap-overlay-ruleset-selector	2019-10-31 15:15:52 +09:00
Dean Herbert	0cd912fcd3	Cover all non-APIAccess APIRequest calls with exception handling	2019-10-31 15:04:13 +09:00
Dean Herbert	5b405abc52	Schedule forcefullyExit call for safety ... Screen state may have changed at an inopportune moment. Run on local scheduler, not API scheduler to avoid any weirdness.	2019-10-31 13:43:25 +09:00
Dean Herbert	32dabf80a6	Ensure forceful exit completely exits from mutliplayer ... Previously it may have gotten blocked by being in a sub screen.	2019-10-31 13:42:28 +09:00
Dean Herbert	5b5703544b	Fix crash when quickly exiting multiplayer after joining a room (#6666) ... Fix crash when quickly exiting multiplayer after joining a room	2019-10-31 13:15:46 +09:00
Andrei Zavatski	4730453083	Apply suggestions	2019-10-31 02:10:00 +03:00
Andrei Zavatski	d90545227c	Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix	2019-10-30 23:49:56 +03:00
Huo Yaoyuan	9d4f80c2a2	Add icon and use licence expression for NuGet. ... Unlike framework, if other components are packed, they are likely to use different icons.	2019-10-30 23:37:58 +08:00
Huo Yaoyuan	3ad0369d7b	Resolve new diagnostics in C# 7.3	2019-10-30 23:13:11 +08:00
Huo Yaoyuan	bcf8e3a9d4	Remove redundant properties from desktop projects. ... While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.	2019-10-30 22:56:33 +08:00
Huo Yaoyuan	31595159be	Normalize .props	2019-10-30 21:54:14 +08:00
Huo Yaoyuan	93fae7ad4d	Remove meanless properties.	2019-10-30 21:46:30 +08:00
Dean Herbert	35be8f9dfb	Share framework file-exclusion function	2019-10-30 19:34:17 +09:00
Dean Herbert	7b67701e57	Merge branch 'master' into editor-timing-screen	2019-10-30 19:27:24 +09:00
Dean Herbert	7f2916454d	Simplify EditorClock.Seek method	2019-10-30 19:09:46 +09:00
Dean Herbert	5899bbd8a6	Fix merge regressions	2019-10-30 18:45:50 +09:00
Dean Herbert	93076ad6a1	Merge branch 'master' into editor-timing-screen	2019-10-30 18:42:20 +09:00
smoogipoo	cf2d885099	Fix control points being flushed too late	2019-10-30 18:02:18 +09:00
smoogipoo	45af796943	Remove usages of EF internals	2019-10-30 17:05:15 +09:00
Dan Balasescu	514c9f1eef	Merge branch 'master' into bindable-control-points	2019-10-30 16:20:54 +09:00
Dan Balasescu	3045ba4bf4	Merge branch 'master' into bindable-control-point-properties	2019-10-30 16:02:39 +09:00
Dan Balasescu	ced6042b3e	Use internal type name	2019-10-30 15:51:09 +09:00
smoogipoo	f56d9fe50c	Forcefully part room when multiplayer exits	2019-10-30 14:42:14 +09:00
smoogipoo	b6457f0ce9	Cancel room joins on part	2019-10-30 14:41:54 +09:00
smoogipoo	95ff48c123	Don't log cancelled join requests	2019-10-30 14:38:06 +09:00
Dean Herbert	dbee63c1a6	Make OsuButton correctly block hover events (#6636) ... Make OsuButton correctly block hover events	2019-10-30 12:38:16 +09:00
Dan Balasescu	4322933470	Merge branch 'master' into signin-ux-improvement	2019-10-30 12:10:52 +09:00
Andrei Zavatski	8ad5ccda68	Test steps rearrangement and condition fix	2019-10-30 04:16:14 +03:00
Andrei Zavatski	2c31492bbe	Fix comment can be voted if user is null	2019-10-30 03:27:06 +03:00
Andrei Zavatski	1502a6c631	Cleanups	2019-10-30 03:09:14 +03:00
Andrei Zavatski	092d16bb64	Dont use binding to set disabled value	2019-10-29 23:43:16 +03:00