11977 Commits

Author	SHA1	Message	Date
Dean Herbert	1f0a19deaa	Fix preview tracks muting themselves (#4944) ... Fix preview tracks muting themselves	2019-06-07 20:26:12 +09:00
Dean Herbert	8f30c9b0a3	Fix file layout of ModSelectOverlay	2019-06-07 15:58:24 +09:00
Dean Herbert	7ffc08b187	Merge branch 'master' into master	2019-06-07 15:34:14 +09:00
Dean Herbert	b914bb1e2e	Remove key hints for now ... A proper design for this will come in the future.	2019-06-07 15:32:48 +09:00
Dean Herbert	0ce5c7468f	Use switch and consume/block input	2019-06-07 15:31:23 +09:00
Dean Herbert	60b70c0f45	Use lambda for simple functions	2019-06-07 14:11:21 +09:00
Dean Herbert	64d5aa318f	Apply rebased changes	2019-06-07 11:45:58 +09:00
Dean Herbert	358a08cf9d	Merge branch 'master' into OsuHoverContainer	2019-06-07 11:40:33 +09:00
Dean Herbert	9f740f69bb	Fix preview tracks muting themselves ... Closes #4937	2019-06-07 11:21:10 +09:00
Dean Herbert	b93446688c	Fix sizing of OsuAnimatedButton and OsuClickableContainer (#4898) ... Fix sizing of OsuAnimatedButton and OsuClickableContainer	2019-06-07 00:17:39 +09:00
smoogipoo	6bf6e22149	Update framework	2019-06-06 20:33:03 +09:00
smoogipoo	90966b113b	Merge remote-tracking branch 'origin/master' into ftb-prepass	2019-06-06 20:32:38 +09:00
Dean Herbert	483049703e	Merge branch 'master' into beatmap-dateadded-sort	2019-06-06 18:26:55 +09:00
smoogipoo	4d035afcc6	Add setting to bypass front-to-back	2019-06-06 16:49:42 +09:00
smoogipoo	c7d0fcd42a	Update drawnodes	2019-06-06 16:49:35 +09:00
Dan Balasescu	032ed033d0	Merge branch 'master' into hold-to-confirm-dim-volume	2019-06-06 15:41:49 +09:00
Dean Herbert	02283380c4	Use manual migration	2019-06-06 13:33:30 +09:00
Welsar55	c04c6693c2	Change close action from PopOut to Hide and switched to TriangleButton.Click()	2019-06-05 13:01:21 -05:00
Dean Herbert	8607f3b765	Merge remote-tracking branch 'upstream/master' into databased-sin-setting	2019-06-05 19:03:57 +09:00
smoogipoo	a6dc5606bc	Allow beatmapsets to be sorted by date added	2019-06-05 18:17:43 +09:00
Dean Herbert	2538f32fae	Merge branch 'osu-clickable-container' into OsuHoverContainer	2019-06-05 10:34:20 +09:00
Arphox	900cd5c484	Restore original values in FadeColour method call	2019-06-04 21:37:10 +02:00
Arphox	5f4d7437bc	Fix the issue ... When Enabled's value has been changed to true, it will now check if it is currently howered, and if yes, it will fade in correctly.	2019-06-04 21:30:49 +02:00
Dean Herbert	2e3d392a9f	Mark OsuButton as abstract ... Not being used directly, so we probably shouldn't support it for now.	2019-06-04 22:12:55 +09:00
Dean Herbert	7d2a75b350	Dim music volume when holding to confirm	2019-06-04 18:37:26 +09:00
Dean Herbert	4e7f2b8f47	Merge branch 'master' into osu-clickable-container	2019-06-04 17:42:17 +09:00
Dean Herbert	b8fc535124	Fix blueprint tests crashing due to out-of-order operations	2019-06-04 12:08:23 +09:00
Dean Herbert	80a66b8b3a	Merge remote-tracking branch 'upstream/master' into audio-refactor-update	2019-06-04 12:08:21 +09:00
smoogipoo	4763a41c7e	Cleanups	2019-06-04 11:25:18 +09:00
smoogipoo	474191fcec	Update framework	2019-06-04 11:13:21 +09:00
Dan Balasescu	6e79e374e2	Merge branch 'master' into fix-endless-tests	2019-06-04 11:07:50 +09:00
smoogipoo	cea353975f	Update with further framework-side changes	2019-06-04 11:04:28 +09:00
smoogipoo	53a39e9142	Merge remote-tracking branch 'origin/master' into audio-refactor-update	2019-06-04 10:50:33 +09:00
Dean Herbert	e8315085c0	Better handle OnClick	2019-06-04 10:26:21 +09:00
EVAST9919	d5a2ebf79f	Fix endless loading state part 2	2019-06-04 04:04:33 +03:00
EVAST9919	2c71371282	Fix endless loading state	2019-06-04 02:06:15 +03:00
EVAST9919	fe6b4112c6	Adjust colors to match web design	2019-06-04 01:47:45 +03:00
EVAST9919	7e96ff7f14	Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update	2019-06-04 01:32:12 +03:00
Welsar55	194bb80354	Added close button and indictors of hotkeys to buttons	2019-06-03 11:09:21 -05:00
Dean Herbert	167213d3eb	Merge branch 'master' into fix-endless-tests	2019-06-04 00:50:18 +09:00
LeNitrous	516575a132	don't create "Start Chat" option when the sender is the local user	2019-06-03 18:54:29 +08:00
LeNitrous	4e6d7137aa	disallow current user from opening their own private channel	2019-06-03 17:25:19 +08:00
Dean Herbert	633c3b74ec	Don't handle clicks when in a loading state	2019-06-03 17:10:33 +09:00
Dean Herbert	c4f4f32db8	Shorten fade duration	2019-06-03 17:10:33 +09:00
Dean Herbert	491c9e96e0	Fix tests not ending execution after some exceptions	2019-06-03 16:42:27 +09:00
Dean Herbert	171fc14776	Fix editor regressions	2019-06-03 16:34:09 +09:00
Welsar55	fa331fbee1	Merge branch 'master' of https://github.com/ppy/osu	2019-06-03 01:23:25 -05:00
Dean Herbert	cf9bc831ab	Merge branch 'master' into osu-clickable-container	2019-06-03 13:55:08 +09:00
Dean Herbert	3ef17a54f6	Fix sizing of OsuAnimatedButton and OsuClickableContainer ... Was incorrect under some combinations of relative and autosize usage.	2019-06-03 13:53:24 +09:00
Dean Herbert	dff7053a07	Merge branch 'master' into more_button_update	2019-06-03 11:48:05 +09:00