RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,616 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

1143 Commits

Author SHA1 Message Date
Dean Herbert d1fd09ed47 Rename variables 2018-06-06 15:49:27 +09:00
Dean Herbert 86be1bef6b Use UserTriggered in Player 2018-06-06 15:10:15 +09:00
Aergwyn 707af02097 apply feedback 
-don't directly set AllowOverlay Bindable
this should be done specifically where needed
-remove AllowOverlay Bindable from ButtonSystem
-remove unnecessary xmldoc
 2018-06-03 11:31:04 +02:00
Aergwyn 2b3a630270 add OverlayActivation enum 
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
 2018-05-28 13:43:47 +02: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 79442ad238
Merge branch 'master' into CursorOverrideContainer-rename 2018-05-26 12:19:47 +09:00
HoutarouOreki 63fb9ddec4 Forgot file name 2018-05-25 21:20:42 +02:00
HoutarouOreki e2d840c2de Rename CursorOverrideContainer to MenuCursorContainer 2018-05-25 21:13:40 +02:00
HoutarouOreki 39224931f8 Try satisfying AppVeyor 2018-05-25 14:25:12 +02:00
HoutarouOreki 71c04f4605 Add license header to the new file 2018-05-25 14:10:54 +02:00
HoutarouOreki 29fbdf4d92 Remove horizontal white space 2018-05-25 14:05:50 +02:00
HoutarouOreki e3ebc849c5 Remove not removed comment 2018-05-25 14:04:12 +02:00
HoutarouOreki 3efb51e464 Create Format(), override TooltipText.. 2018-05-25 14:00:32 +02:00
HoutarouOreki a446b627da Make TooltipText virtual 2018-05-25 13:31:12 +02:00
HoutarouOreki 05b0564381 Create DrawableJoinDate somehow and remove dateFormat argument 2018-05-25 13:30:29 +02:00
HoutarouOreki 961702aadf Apply the format fix to the tooltip text across the board 2018-05-25 13:05:41 +02:00
Dean Herbert 1cb7d50407 Add and use default size (smaller than before) 2018-05-25 18:51:57 +09:00
HoutarouOreki 29de8e5e2d Document parameters more properly 2018-05-23 12:07:28 +02:00
HoutarouOreki 10bc3917b5 Apply suggested changes 2018-05-23 11:17:13 +02:00
smoogipoo 8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
HoutarouOreki 6cf227a7af Allow formatting for DrawableDate class 2018-05-23 03:24:18 +02: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
Jacob caad47b569
Merge branch 'master' into ParallaxContainerImprovement 2018-05-22 12:10:50 +02:00
Dean Herbert 5f8eb6d823 Fix class name 2018-05-22 16:04:36 +09:00
Jacob e878e65e83
Merge branch 'master' into ParallaxContainerImprovement 2018-05-21 20:31:44 +02:00
Dean Herbert ebda287e81 Share code with HoldToConfirm implementations elsewhere 2018-05-22 01:44:06 +09:00
Dean Herbert 9820666bcf
Merge branch 'master' into respect-showoverlay-bindable 2018-05-21 23:26:34 +09:00
Aergwyn b7e3ea348b expose two Bindables with split logic instead of one with mixed logic 2018-05-21 15:53:55 +02:00
Jacob 30ff1c4b8b
Merge branch 'master' into ParallaxContainerImprovement 2018-05-21 15:19:24 +02:00
Aergwyn 1482bca147 Rename for better understanding 
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
 2018-05-21 09:42:29 +02:00
Dean Herbert 92668f07e0
Merge branch 'master' into drawable-room-improvements 2018-05-21 11:09:12 +09:00
Aergwyn 4d528c4e67 fix VisualTests and Samples still playing 2018-05-20 10:57:15 +02:00
Aergwyn 67db539172 prevent Overlays from showing in intro/outro sequences 2018-05-18 08:00:05 +02:00
Jacob 1b64f86011
Merge branch 'master' into ParallaxContainerImprovement 2018-05-17 06:53:16 +02:00
KoziLord 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
KoziLord 1e88f216f2 Revert the ParallaxContainer changes I made by accident back. 2018-05-16 01:27:18 +02:00
DrabWeb b9d99b5f40 Fix nullref when exiting the last screen. 2018-05-15 19:42:50 -03:00
KoziLord 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
Dean Herbert c0c449e453
Remove unused using 2018-05-15 22:53:33 +09:00
Dean Herbert 28df77e838 Simplify code and remove generic 2018-05-15 21:10:26 +09:00
Dean Herbert 0325b1bd7a Remove unused class 2018-05-15 19:42:30 +09:00
Dean Herbert 0def847f60
Merge branch 'master' into screen-breadcrumbs 2018-05-15 19:39:03 +09:00
Dean Herbert 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
DrabWeb 518dec0c68 Merge https://github.com/ppy/osu into drawable-room-improvements 2018-05-11 13:41:50 -03:00
DrabWeb fa403e4e2a Add test step to test pushing after a previous screen is made current. 2018-05-11 04:49:40 -03:00
DrabWeb ec53927d8e Add selection to DrawableRoom. 2018-05-10 22:48:07 -03:00
DrabWeb b9adeeb063 Add ScreenBreadcrumbControl. 2018-05-10 21:35:26 -03:00
DrabWeb ecb8de29a2 Adjust BreadcrumbControl to better match the designs. 2018-05-10 20:30:03 -03:00
Dean Herbert 27437cfbaf
Merge branch 'master' into show-beatmap-id 2018-04-20 18:05:24 +09:00
Dean Herbert 8649ddc68b Make forum posts a web link 2018-04-20 13:01:23 +09:00
Dean Herbert f62677222c Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 13:08:53 +09:00
Dean Herbert 96ef564f44 Remove unused field 2018-04-16 00:25:09 +09:00
Dean Herbert c9615f837a Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot 2018-04-16 00:20:06 +09:00
Dean Herbert ae77c010e2 Merge remote-tracking branch 'upstream/master' into wave-container 2018-04-15 21:03:18 +09:00
smoogipoo cf65833572 Reword xmldoc 2018-04-13 21:15:08 +09:00
smoogipoo 733f70cbd5 Merge remote-tracking branch 'origin/master' into instant-hide-screenshot 2018-04-13 21:13:09 +09:00
smoogipoo 34adb2527c A lot more protection from outsiders 2018-04-13 21:12:33 +09:00
Dean Herbert 32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo 0235eba9de Make TakeScreenshotAsync await on the internal task 2018-04-13 17:51:09 +09:00
smoogipoo 2e5bbe7074 Don't expose CursorOverrideContainer via DI + internalise access 2018-04-13 17:36:38 +09:00
smoogipoo ebe36f0612 Instantly hide cursor for required frames while taking screenshot 2018-04-13 17:27:10 +09:00
Joehu 61d6f52a53 Lowercase back button 2018-04-12 08:26:25 -07:00
DrabWeb 0bede52381 Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places. 2018-04-11 16:22:27 -03:00
TocoToucan d7812ab12e CursorOverrideContainer.ShowMenuCursor 2018-04-11 21:22:52 +03:00
Dean Herbert c33cb9c02e
Merge branch 'master' into show-beatmap-id 2018-04-10 16:05:32 +09:00
UselessToucan 9225c06872
Merge branch 'master' into hide_menu_cursor 2018-04-09 21:41:54 +03:00
naoey ca4299c6fe
Remove unused using and fix possible nullref. 2018-04-04 22:07:24 +05:30
naoey c304c1eecf
Make LinkFlowContainer handle beatmap id lookup in game. 2018-04-04 21:23:51 +05:30
DrabWeb 65f0e91734 Use Interpolation function directly for resizing tab strips. 2018-04-04 03:04:26 -03:00
DrabWeb e3218250d5 Fix tab strip in BreadcrumbControl, allow strip height to be overriden. 2018-03-29 15:41:27 -03:00
DrabWeb f43b009b96 Add optional strip to OsuTabControl. 2018-03-29 15:29:45 -03:00
TocoToucan 458594d24d Qualifier 'this.' is redundant 2018-03-27 18:03:57 +03:00
TocoToucan e91d24f31a Use ScreenshotCaptureMenuCursor in ScreenshotManager 2018-03-24 12:53:01 +03:00
Dean Herbert 0e669c9a3f Fix many warnings 2018-03-24 18:23:22 +09:00
smoogipoo c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
TocoToucan dd5cc59250 Introduce 'Capture menu cursor' setting 2018-03-23 22:53:06 +03:00
Joseph Madamba f77dad2809
Add perfect mod icon 2018-03-22 22:49:14 -07:00
Dean Herbert 74191e1b73 Merge remote-tracking branch 'upstream/master' into take_screenshot 2018-03-22 20:49:17 +09:00
Dean Herbert e41993ac44 Don't bother with an exception that will never happen 
Wasn't being caught anyways
 2018-03-22 20:45:26 +09:00
Dean Herbert 94847e4a23 Allow clicking notification to open screenshot folder 2018-03-22 20:44:00 +09:00
Dean Herbert 9e080028ff Add shutter sound 2018-03-22 20:42:55 +09:00
smoogipoo 9f220b3b9b Add explanatory comment 2018-03-22 18:51:03 +09:00
Dean Herbert 6e379f0646 Fix FocusedTextBox in line with framework changes 2018-03-22 15:54:16 +09:00
smoogipoo 3f3f57e51e Use cached vertexbatch add delegate 2018-03-22 15:13:38 +09:00
TocoToucan 4991f2ad2e Change filename format 2018-03-21 18:27:08 +03:00
Dean Herbert ccdd11d7b2 Add missing licence header 2018-03-21 12:29:44 +09:00
TocoToucan ee73bd4568 Update ScreenshotManager inline with framework changes 2018-03-19 22:39:00 +03:00
TocoToucan 245200d3ee Add simple screenshot notification 2018-03-16 21:25:00 +03:00
TocoToucan 8429408974 Change screenshot file name 2018-03-16 21:05:25 +03:00
TocoToucan 34dc8e7375 Resolve merge conflict 2018-03-14 23:22:19 +03:00
TocoToucan 5a1af062d3 Handle GlobalAction.TakeScreenshot in ScreenshotManager 2018-03-14 22:55:24 +03:00
TocoToucan 25f738c4ae Do not support bmp screenshots 2018-03-14 12:57:55 +03:00
TocoToucan 0e69ab1615 Introduce ScreenshotManager class 2018-03-14 00:17:12 +03:00
Dan Balasescu fce61943bd
Merge branch 'master' into smoother-parallax-scale 2018-03-12 12:12:01 +09:00
smoogipoo 86d93ffe3c Fix tooltip not working due to not handling input 2018-03-12 10:49:50 +09:00
Dean Herbert 6ad962fc8b Interpolate ParallaxContainer's scale 
Things were a bit jumpy when a screen was adjusting `ParallaxAmount`. This smoothes the applied scale changes to look great again.

Most noticeable when hitting the retry hotkey (`~`) from gameplay.
 2018-03-09 14:35:53 +09:00
Dean Herbert 3b56999118 Add drawable to display (and update) relative dates 2018-03-08 12:58:16 +09:00
Dean Herbert f78538fea8
Merge branch 'master' into user-profile-recent 2018-03-07 19:41:52 +09:00