Commit Graph

2116 Commits

Author SHA1 Message Date
4d528c4e67 fix VisualTests and Samples still playing 2018-05-20 10:57:15 +02:00
67db539172 prevent Overlays from showing in intro/outro sequences 2018-05-18 08:00:05 +02:00
1b64f86011 Merge branch 'master' into ParallaxContainerImprovement 2018-05-17 06:53:16 +02:00
d2b2d3e2e0 Use the absolute value of ParallaxAmount to make sure we're not scaling things down when using a negative value for the Parallax (moving against the cursor instead of with it) 2018-05-16 01:38:46 +02:00
1e88f216f2 Revert the ParallaxContainer changes I made by accident back. 2018-05-16 01:27:18 +02:00
b9d99b5f40 Fix nullref when exiting the last screen. 2018-05-15 19:42:50 -03:00
be1159444d Use the absolute value of ParallaxAmount to make sure we're not scaling stuff down when using a negative ParallaxAmount 2018-05-15 15:56:49 +02:00
c0c449e453 Remove unused using 2018-05-15 22:53:33 +09:00
28df77e838 Simplify code and remove generic 2018-05-15 21:10:26 +09:00
0325b1bd7a Remove unused class 2018-05-15 19:42:30 +09:00
0def847f60 Merge branch 'master' into screen-breadcrumbs 2018-05-15 19:39:03 +09:00
fe1c1fec0d Stop overlays from handling DragStart
This was causing weird behaviour with the key configuration section and back button in settings.
2018-05-14 15:44:19 +09:00
518dec0c68 Merge https://github.com/ppy/osu into drawable-room-improvements 2018-05-11 13:41:50 -03:00
fa403e4e2a Add test step to test pushing after a previous screen is made current. 2018-05-11 04:49:40 -03:00
ec53927d8e Add selection to DrawableRoom. 2018-05-10 22:48:07 -03:00
b9adeeb063 Add ScreenBreadcrumbControl. 2018-05-10 21:35:26 -03:00
ecb8de29a2 Adjust BreadcrumbControl to better match the designs. 2018-05-10 20:30:03 -03:00
ba5861b527 Merge remote-tracking branch 'origin/master' into Private_Messages
# Conflicts:
#	osu.Game/Online/API/Requests/GetMessagesRequest.cs
#	osu.Game/Overlays/Chat/ChatTabControl.cs
2018-05-06 19:45:33 +02:00
27437cfbaf Merge branch 'master' into show-beatmap-id 2018-04-20 18:05:24 +09:00
8649ddc68b Make forum posts a web link 2018-04-20 13:01:23 +09:00
3b68dda23e Merge remote-tracking branch 'origin/master' into Private_Messages 2018-04-18 20:55:12 +02:00
f62677222c Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 13:08:53 +09:00
96ef564f44 Remove unused field 2018-04-16 00:25:09 +09:00
c9615f837a Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot 2018-04-16 00:20:06 +09:00
ae77c010e2 Merge remote-tracking branch 'upstream/master' into wave-container 2018-04-15 21:03:18 +09:00
5bfb386226 Merge remote-tracking branch 'origin/master' into Private_Messages 2018-04-14 13:31:03 +02:00
cf65833572 Reword xmldoc 2018-04-13 21:15:08 +09:00
733f70cbd5 Merge remote-tracking branch 'origin/master' into instant-hide-screenshot 2018-04-13 21:13:09 +09:00
34adb2527c A lot more protection from outsiders 2018-04-13 21:12:33 +09:00
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
0235eba9de Make TakeScreenshotAsync await on the internal task 2018-04-13 17:51:09 +09:00
2e5bbe7074 Don't expose CursorOverrideContainer via DI + internalise access 2018-04-13 17:36:38 +09:00
ebe36f0612 Instantly hide cursor for required frames while taking screenshot 2018-04-13 17:27:10 +09:00
e39f5a1adf Rename var chatmanager -> channelManager
Apply requested changes
2018-04-12 23:19:13 +02:00
61d6f52a53 Lowercase back button 2018-04-12 08:26:25 -07:00
0bede52381 Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places. 2018-04-11 16:22:27 -03:00
d7812ab12e CursorOverrideContainer.ShowMenuCursor 2018-04-11 21:22:52 +03:00
3860594f40 Rename everything into channel and remove everything chat 2018-04-11 20:01:57 +02:00
c33cb9c02e Merge branch 'master' into show-beatmap-id 2018-04-10 16:05:32 +09:00
9225c06872 Merge branch 'master' into hide_menu_cursor 2018-04-09 21:41:54 +03:00
a70b329155 Split drawing and business logic of ChatOverlay 2018-04-08 18:21:48 +02:00
ca4299c6fe Remove unused using and fix possible nullref. 2018-04-04 22:07:24 +05:30
c304c1eecf Make LinkFlowContainer handle beatmap id lookup in game. 2018-04-04 21:23:51 +05:30
65f0e91734 Use Interpolation function directly for resizing tab strips. 2018-04-04 03:04:26 -03:00
e3218250d5 Fix tab strip in BreadcrumbControl, allow strip height to be overriden. 2018-03-29 15:41:27 -03:00
f43b009b96 Add optional strip to OsuTabControl. 2018-03-29 15:29:45 -03:00
458594d24d Qualifier 'this.' is redundant 2018-03-27 18:03:57 +03:00
e91d24f31a Use ScreenshotCaptureMenuCursor in ScreenshotManager 2018-03-24 12:53:01 +03:00
0e669c9a3f Fix many warnings 2018-03-24 18:23:22 +09:00
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00