1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 18:12:59 +08:00
Commit Graph

1485 Commits

Author SHA1 Message Date
DrabWeb
239472c451 Lowercase hex colours 2017-05-27 18:35:46 -03:00
DrabWeb
b88c07f1a0 Make channel readonly 2017-05-27 17:49:57 -03:00
DrabWeb
754fe956f9 Make ChannelSection headers uppercase in the setter 2017-05-27 17:40:20 -03:00
DrabWeb
b632e7f1ad Accept Channel in ctor and remove Channel property 2017-05-27 17:35:42 -03:00
Jorolf
e86ccf61b3 use recursion 2017-05-27 10:11:59 +02:00
EVAST9919
bedcf04043 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-27 02:25:03 +03:00
Jorolf
db1dde72de change constant names 2017-05-26 16:29:15 +02:00
Jorolf
64612ef34b add multimod animation 2017-05-26 16:10:28 +02:00
jorolf
f6f1ea42ee Merge branch 'master' into channel-selector-tab-item 2017-05-26 13:18:50 +02:00
Jorolf
1e4bca90f0 remove duplicate code 2017-05-26 12:10:16 +02:00
DrabWeb
c0999c7fc1 Unused using directives 2017-05-26 06:12:22 -03:00
DrabWeb
12f6276e05 Move DisplayStyleControl to all FilterControls 2017-05-26 06:05:05 -03:00
DrabWeb
38d0138978 CI fixes 2017-05-26 04:11:45 -03:00
DrabWeb
ae96ef08f7 Tab character 2017-05-26 04:02:04 -03:00
DrabWeb
4c551270e9 Add OnRequestLeave 2017-05-26 03:56:10 -03:00
DrabWeb
d632435a34 Make ChannelListItems scale better 2017-05-26 03:51:09 -03:00
DrabWeb
21e900df73 Transition code cleanup 2017-05-26 03:46:50 -03:00
DrabWeb
d29ebb139f Cleanup 2017-05-26 03:38:52 -03:00
DrabWeb
64016f9466 Merge https://github.com/ppy/osu into channel-selection 2017-05-26 03:24:41 -03:00
DrabWeb
5785715ad5 CI fixes 2017-05-26 03:10:36 -03:00
DrabWeb
28ee00109d Wave colours 2017-05-26 02:55:25 -03:00
DrabWeb
8359f6ced0 Incorrect colour 2017-05-26 02:49:04 -03:00
DrabWeb
68377494f7 Browser - SearchableList 2017-05-26 02:44:09 -03:00
DrabWeb
5831da6978 Autohide social when entering a screen that doesn't allow overlays, fix potential nullrefs in DirectOverlay, CreateControls -> CreateSupplementaryControls 2017-05-26 02:32:01 -03:00
DrabWeb
fc67582c3f Cleanup 2017-05-26 02:16:56 -03:00
DrabWeb
e19a4f5e6f Add displaying users 2017-05-26 02:00:38 -03:00
DrabWeb
5c0d0cb7e7 Alpha on wrong object 2017-05-26 01:34:30 -03:00
DrabWeb
2d3995b85c Fix filter controls having margin when no controls given, add DisplayStyleControl to social, misc cleanups 2017-05-26 01:32:20 -03:00
DrabWeb
8fca0fddb3 Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser 2017-05-26 00:54:03 -03:00
Dean Herbert
8ae7e84563 Merge branch 'master' into musiccontroller-init-fix 2017-05-26 10:48:32 +09:00
Jorolf
a9658ec66f update colour, width, icon and text 2017-05-25 20:25:59 +02:00
MrTheMake
9de7e7bc40 Fixes 2017-05-25 17:49:47 +02:00
Dean Herbert
9eec2edd30 Fix initial login state not being reflected in user panel 2017-05-25 22:43:33 +09:00
MrTheMake
c32d816f9c Removed new line 2017-05-25 14:19:04 +02:00
MrTheMake
9ea70b849b Fix initialize beatmap change animation of the music controller 2017-05-25 14:16:51 +02:00
Dean Herbert
1a255fdf48 Fix display order regression 2017-05-25 19:47:18 +09:00
Dean Herbert
be81346573 Attempt to fix inner scope warning 2017-05-25 14:47:25 +09:00
DrabWeb
e22eb1f205 CI fixes 2017-05-24 22:39:07 -03:00
DrabWeb
ec3c92fc3c Trim whitespace 2017-05-24 22:26:48 -03:00
DrabWeb
9cad344401 Revert back header for login form, fix incorrect spacing on header 2017-05-24 22:02:32 -03:00
DrabWeb
8e09b738b0 Remove magic numbers 2017-05-24 21:51:00 -03:00
DrabWeb
9b863f60ab Adjust dropdown layout 2017-05-24 21:32:46 -03:00
DrabWeb
efd4c57431 Dropdown actions, +User.Status, +UserStatusDoNotDisturb, properly align UserDropdownMenuItem 2017-05-24 21:09:18 -03:00
DrabWeb
b57a3f2056 Initial layout of user panel and user dropdown 2017-05-24 19:44:48 -03:00
Dean Herbert
3134f92051 Merge branch 'master' into user-panel 2017-05-24 16:32:09 +09:00
DrabWeb
a25c504965 CI fixes 2017-05-24 03:08:48 -03:00
DrabWeb
72c9959215 resultCounts -> ResultAmounts 2017-05-24 02:40:34 -03:00
DrabWeb
ba2627d4e2 Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct 2017-05-24 02:40:00 -03:00
DrabWeb
e59c1879a2 Remove tabs 2017-05-24 02:38:55 -03:00
DrabWeb
4490596f5f Keep one object per file 2017-05-24 02:37:27 -03:00
DrabWeb
b08668b6d9 Remove @ from to-be-localized strings 2017-05-24 02:19:45 -03:00
Dean Herbert
5e01940770 Compare with private field 2017-05-24 13:43:10 +09:00
DrabWeb
2be1b00a76 Hide status bar when Status is null 2017-05-24 00:45:56 -03:00
DrabWeb
247d8e9b21 Replace "Connected as _" in login form with a UserPanel 2017-05-24 00:23:48 -03:00
Dean Herbert
4ee11764b8 Merge branch 'master' into osu-direct 2017-05-24 12:16:34 +09:00
DrabWeb
be1ae2bd8e Remove ??, value can never be null 2017-05-23 15:08:02 -03:00
DrabWeb
7a4b476121 Tab character 2017-05-23 14:46:23 -03:00
DrabWeb
aa9a636c3c Indentation 2017-05-23 14:42:57 -03:00
DrabWeb
7b9eacc213 CI fixes 2017-05-23 14:41:30 -03:00
DrabWeb
fbbcc80a3e Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct 2017-05-23 14:34:58 -03:00
DrabWeb
4f17a4fe91 Make result counts scroll with the panels 2017-05-23 14:34:34 -03:00
Jorolf
af9b02746a make fields readonly 2017-05-23 18:19:01 +02:00
Jorolf
7ad10009e6 Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item 2017-05-23 17:32:48 +02:00
EVAST9919
2ca0794b37 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-23 14:45:38 +03:00
EVAST9919
564abc1a5b using autosize instead of constant height 2017-05-23 14:32:45 +03:00
EVAST9919
165d6ef1bb Make transition a bit smoother 2017-05-23 12:30:39 +03:00
EVAST9919
c7a241246e Better letterbox settings transition 2017-05-23 12:09:32 +03:00
Dean Herbert
0634a3a5c5 Merge branch 'master' into osu-direct 2017-05-23 17:33:20 +09:00
DrabWeb
62897d302e Remove SettingsButton(old and outdated design), fix channel list scrolling under the header 2017-05-22 22:37:25 -03:00
Dean Herbert
5c5a18833a Merge branch 'master' into channel-selector-tab-item 2017-05-22 20:22:57 +09:00
Huo Yaoyuan
63259a3457 Fix depth of header background.
Thanks to the order of adding to parent container, the depth value is actually not needed.
2017-05-22 16:00:03 +08:00
DrabWeb
bdab545ca4 Use BeatmapBackgroundSprite 2017-05-22 03:15:22 -03:00
DrabWeb
77affc1eb7 Split onto multiple lines 2017-05-22 03:13:55 -03:00
EVAST9919
50e3feb761 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-22 09:12:40 +03:00
DrabWeb
3c35badf06 Unused using 2017-05-22 02:03:53 -03:00
DrabWeb
6bf0ca59fe Make FilterControl not scroll with the panels 2017-05-22 02:03:26 -03:00
Huo Yaoyuan
d0ff9e6576 Merge branch 'master' into sections 2017-05-22 12:52:27 +08:00
Dean Herbert
93182e5da3 Merge branch 'master' into generic-interface 2017-05-22 09:52:40 +09:00
DrabWeb
4e2126dca8 Fix nullref when changing display mode without any BeatmapSets added 2017-05-21 18:54:35 -03:00
DrabWeb
eb77c94150 Fix search field losing focus 2017-05-21 15:30:10 -03:00
EVAST9919
8c1437c51a Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-21 13:44:52 +03:00
DrabWeb
51bc3dfe72 Padding below channel list, remove text shadows, fix search box focusing 2017-05-20 21:38:36 -03:00
DrabWeb
a60d1efc21 Basic channel joining (ignore layout in ChatOverlay, temporary) 2017-05-20 21:26:39 -03:00
DrabWeb
4a166c1949 Make ChannelSelectionOverlay a FocusedOverlayContainer 2017-05-20 20:48:36 -03:00
DrabWeb
2e1d01a268 Added searching 2017-05-20 20:22:55 -03:00
DrabWeb
47dfc0d7bc Added transition 2017-05-20 20:05:28 -03:00
DrabWeb
7eba619f80 Move Joined to Channel 2017-05-20 19:37:11 -03:00
DrabWeb
3cc51006cc Add settings button, background triangles, proper displaying of Channels 2017-05-20 19:30:40 -03:00
DrabWeb
6a8d745db1 Use Channels in ChannelListItems, ChannelSection, fix ChannelListItem being misaligned 2017-05-20 18:29:57 -03:00
DrabWeb
31890a1e01 Initial layout, channels items 2017-05-20 18:06:25 -03:00
Huo Yaoyuan
4a55666e03 Merge branch 'master' into sections 2017-05-21 04:43:39 +08:00
Huo Yaoyuan
f06f8b4dcd Make sidebar buttons working. 2017-05-21 04:33:05 +08:00
Huo Yaoyuan
aa409ac1a9 Move SearchTextBox out of SettingsHeader. 2017-05-21 04:12:16 +08:00
Huo Yaoyuan
35712514a4 Update settings UI using SectionsContainer basically. 2017-05-21 03:50:04 +08:00
DrabWeb
87ace2d7ec @"" -> string.Empty 2017-05-20 13:52:51 -03:00
DrabWeb
49eb096b03 Fix visual test mode toggle buttons activation state 2017-05-20 13:19:50 -03:00
Dean Herbert
0b987be600 Merge branch 'master' into osu-direct 2017-05-20 16:17:59 +09:00
Dean Herbert
fb72693c96 Merge branch 'master' into playlist-item-paragraph 2017-05-20 15:47:54 +09:00
DrabWeb
995a573b9c @"" -> string.Empty 2017-05-20 03:22:37 -03:00
DrabWeb
7485a78128 Update framework 2017-05-20 03:14:22 -03:00
DrabWeb
139b03a1ce Only recreate text once per unicode option change 2017-05-20 02:05:13 -03:00
DrabWeb
43bd0f686b Fix artist being the opposite value 2017-05-20 01:25:42 -03:00
DrabWeb
48417beb81 Unused using directive 2017-05-20 01:22:33 -03:00
DrabWeb
615082d757 Remove whitespace 2017-05-20 01:17:04 -03:00
DrabWeb
dcc3dbf5e2 Make PlaylistItem use Paragraphs 2017-05-20 01:11:20 -03:00
DrabWeb
bfedd42ca4 Add mod tooltips 2017-05-19 23:56:48 -03:00
DrabWeb
e030573436 Add ReverseDepthFillFlowContainer to remove code duplication 2017-05-19 23:44:36 -03:00
DrabWeb
68cb23786a Fade in background when loaded 2017-05-19 20:53:51 -03:00
DrabWeb
6e7a09fedb Line endings, use ToString for statistic value 2017-05-19 20:37:13 -03:00
DrabWeb
ffb3450dc2 Remove <U+FEFF> character 2017-05-19 20:34:51 -03:00
DrabWeb
503ee97a15 Fix license header 2017-05-19 20:28:37 -03:00
DrabWeb
cdd2b54dc7 Move SlimEnumDropdown into it's own file 2017-05-19 20:25:08 -03:00
DrabWeb
e7a64126a3 Formatting and remove magic number 2017-05-19 20:13:59 -03:00
DrabWeb
83c81c0626 Cleanup (again) 2017-05-19 20:03:07 -03:00
DrabWeb
c981a4a511 Formatting 2017-05-19 19:50:45 -03:00
DrabWeb
0a96aaf575 Whitespace 2017-05-19 19:27:51 -03:00
DrabWeb
0a90965a5b CI formatting 2017-05-19 19:22:42 -03:00
DrabWeb
c2ea2bb5b0 Proper search tab changing logic 2017-05-19 19:13:07 -03:00
DrabWeb
57115f453e Remove todo comment 2017-05-19 19:03:45 -03:00
DrabWeb
6cc7602db1 Added download button animations 2017-05-19 19:02:53 -03:00
DrabWeb
649fc8362b Fix ranked status dropdown expanding below the panels 2017-05-19 18:54:47 -03:00
DrabWeb
2f10b72cb2 Proper dropdown expansion, DisplayModeToggleButton -> DisplayStyleToggleButton 2017-05-19 18:32:04 -03:00
DrabWeb
05b8fc5126 Added switching between grid/list and little transitions for the panels 2017-05-19 17:52:34 -03:00
DrabWeb
1d61fc84c7 Remove duplicate code in SettingsEnumDropdown 2017-05-19 17:04:59 -03:00
DrabWeb
1bd13a8361 Indentation 2017-05-19 16:22:54 -03:00
DrabWeb
74ed4cf0e3 More cleanup 2017-05-19 16:19:23 -03:00
DrabWeb
6eac19e76b Move constructor above methods in DirectPanel 2017-05-19 16:12:47 -03:00
DrabWeb
c3d753a585 DifficultyIcons -> GetDifficultyIcons() 2017-05-19 16:11:45 -03:00
DrabWeb
a86d07cac7 Remove enclosing background container 2017-05-19 16:07:05 -03:00
DrabWeb
e1c4c36122 +BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds 2017-05-19 15:43:18 -03:00
EVAST9919
9f803de9d5 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-19 19:49:48 +03:00
Dean Herbert
a34d9d8b09 Oops 2017-05-20 01:14:51 +09:00
DrabWeb
3b8cadd4df Clean up DirectPanel and it's subclasses 2017-05-19 12:52:23 -03:00
Dean Herbert
9c9c0a64fd Merge branch 'master' into debug-config-rename 2017-05-20 00:45:16 +09:00
Dan Balasescu
7e8ffe8f34 Merge branch 'master' into osd-fixes 2017-05-20 00:12:10 +09:00
Dean Herbert
528d79be51 FrameworkDebugConfig -> DebugSetting 2017-05-19 22:53:26 +09:00
Dean Herbert
0332348b24 Correctly display default audio device on OSD 2017-05-19 22:51:09 +09:00
Dean Herbert
5bcef91b89 Add padding to setting value on on screen display
Long audio device names were destroying all padding.
2017-05-19 22:49:47 +09:00
Dean Herbert
04f7acb68a Add setting checkbox to toggle debug logs 2017-05-19 22:47:15 +09:00
Jorolf
94484974f9 use AddTabItem instead + Bindable for ChannelSelectorTabItem 2017-05-19 11:59:23 +02:00
DrabWeb
a5fa7e1a7d Result counts displaying 2017-05-18 17:43:39 -03:00
DrabWeb
1d1375c4d4 Remove commented line 2017-05-18 17:13:53 -03:00
DrabWeb
ca6826f3ba Fix incorrect height between sort tabs and ruleset toggle buttons 2017-05-18 17:12:57 -03:00
DrabWeb
c8102db780 Fix visual test crash 2017-05-18 16:54:50 -03:00
DrabWeb
065f4faa70 Fix ruleset toggle buttons not updating when changing from the toolbar 2017-05-18 16:34:34 -03:00
DrabWeb
0b480fe327 ModeToggleButton -> RulesetToggleButton 2017-05-18 16:17:16 -03:00
DrabWeb
c2880676db Added displaying sets 2017-05-18 16:15:49 -03:00
DrabWeb
c3fb1ab7c6 Mapper -> Author, use BeatmapSetInfo for metadata 2017-05-18 15:01:01 -03:00
DrabWeb
ab1401054d Added result counts (visually) 2017-05-18 14:08:14 -03:00
DrabWeb
9f36a39c59 More cleanup 2017-05-18 13:57:19 -03:00
Jorolf
0e3fb55d5e usage of constant and formatting 2017-05-18 17:02:11 +02:00
DrabWeb
b26c8dd1c7 Added temporary difficulties on the panels 2017-05-17 18:42:40 -03:00
DrabWeb
b3ef8b8fd4 Design updates 2017-05-17 18:10:29 -03:00
DrabWeb
cabfe72c92 Changed DirectPanel to a base class for DirectGridPanel and DirectListPanel 2017-05-17 18:02:33 -03:00
Huo Yaoyuan
ffbab6bfeb Tidy up DrawableChannel. 2017-05-18 04:08:47 +08:00
DrabWeb
5fb445e3fe Basic direct panel, minor cleanups 2017-05-17 16:37:34 -03:00
Jorolf
67806c4247 add tab item 2017-05-17 21:16:53 +02:00
Huo Yaoyuan
23e2d3ef07 Use GroupBy in ChatOverlay. 2017-05-18 02:40:36 +08:00
Huo Yaoyuan
b5d7211cd6 Expire placeholder text. 2017-05-18 02:40:29 +08:00
EVAST9919
a21343da23 CI fixes 2017-05-17 17:14:09 +03:00
EVAST9919
eec813ad65 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-17 17:14:00 +03:00
Dean Herbert
d606b5b3a7 Fix CI warning 2017-05-17 22:13:56 +09:00
EVAST9919
e785f1ddf1 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-17 16:12:38 +03:00
EVAST9919
fd2150aa49 Moved collectionsDropdown to it's own class 2017-05-17 15:32:16 +03:00
DrabWeb
9ba356f2c6 Added osu!direct header and filter control 2017-05-17 05:58:34 -03:00
EVAST9919
5fb8830e3a Moved music controller buttons to it's own class 2017-05-17 10:36:24 +03:00
Dean Herbert
231f7939a6 Fix channels being unnecessarily recycled on disconnect
Resolves #768
2017-05-17 12:42:02 +09:00
Huo Yaoyuan
f1d5a92950 Use generic IEqutable to avoid typeless Equals. 2017-05-16 21:49:38 +08:00
Huo Yaoyuan
b9a40a841b Use IsAssignableFrom. 2017-05-16 21:04:54 +08:00
Dan Balasescu
be3953aeb2 Merge branch 'master' into general-fixes 2017-05-16 20:52:38 +09:00
Dean Herbert
fdf0137fc2 Remove incorrect padding 2017-05-16 19:58:34 +09:00
Dean Herbert
23807aa3b9 Better handling of logged in state 2017-05-16 19:55:45 +09:00
Dean Herbert
0c7ceea4fd Merge branch 'master' into on-screen-display 2017-05-16 18:54:54 +09:00
Dean Herbert
71b14bb8af Merge branch 'master' into fix-duplicate-channels 2017-05-16 18:50:21 +09:00
Dean Herbert
712bd21e25 Fix duplicate channels being created on connection loss
Resolves #763
2017-05-16 18:28:42 +09:00
Dean Herbert
3673e4af1f
Fade bold state of chat tabs better 2017-05-16 18:00:29 +09:00
Dean Herbert
0feaa407f2 Merge branch 'margin-padding-namespace' into on-screen-display 2017-05-16 16:40:06 +09:00
Dean Herbert
89e2a39d14 Merge remote-tracking branch 'upstream/master' into margin-padding-namespace 2017-05-16 16:36:34 +09:00
Dan Balasescu
91de72e161 Merge branch 'master' into on-screen-display 2017-05-16 16:27:19 +09:00
Dean Herbert
f0ea445e46 Fix initial requests of channel mesages not being performed
fetchReq was being set even for initial lookups, which caused only one to run, and subsequent requests to be excessive to try and catch up.
2017-05-16 15:59:01 +09:00
Dan Balasescu
2ad9aa2ae5 Merge branch 'master' into chat-error-messages 2017-05-16 15:12:59 +09:00
Dean Herbert
5e5ad9a899 Add basic on-screen display 2017-05-16 15:03:03 +09:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Dean Herbert
3b1d5ce7df CI fix 2017-05-15 13:31:51 +09:00
Dean Herbert
dcd4b4450d Add error message in chat when attempting to use commands 2017-05-15 13:26:35 +09:00
Dean Herbert
1f3039926f Reword settings text slightly 2017-05-15 12:57:55 +09:00
Dean Herbert
3b87a938db Merge branch 'master' into cursor_size. 2017-05-15 12:23:49 +09:00
Dean Herbert
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
Dean Herbert
eaaba11586 Change all instances of options to settings where applicable 2017-05-15 10:55:29 +09:00
EVAST9919
ca6df533bd Automatic gameplay cursor size 2017-05-13 03:46:37 +03:00
Dean Herbert
fd9218b6d5 Use FirstOrDefault 2017-05-12 20:48:25 +09:00
Dean Herbert
24db423c4f Merge remote-tracking branch 'upstream/master' into playlist-commit 2017-05-12 20:39:50 +09:00
Dan Balasescu
815379646c Merge branch 'master' into new-option-search 2017-05-12 20:22:11 +09:00
Dean Herbert
6c117f15af Remove unnecessary usings 2017-05-12 20:06:38 +09:00
Dean Herbert
d2e066ca35 Move SearchTextBox to better namespace
Is being used in multiple places now.
2017-05-12 19:57:06 +09:00
Dean Herbert
bc5bcfa66a Make tab background opaque when chat is fullscreen 2017-05-12 19:15:04 +09:00
Dean Herbert
dbf60d24bf Second design update pass. 2017-05-12 15:39:00 +09:00
Dean Herbert
6ea65009c4 Initial design update pass 2017-05-12 15:38:55 +09:00
Dean Herbert
c4a93cbc85 Move drawable chat related classes to better namespace 2017-05-12 15:38:51 +09:00
Dean Herbert
9cf4998701 Make chat resizable via drag, save user set size 2017-05-12 15:36:37 +09:00
Dean Herbert
f248efb01f CI Fixes 2017-05-12 13:25:50 +09:00
Dean Herbert
ffa59c6cb3 Support read-only channels, post to correct channel.
Also cache drawable channels better.
2017-05-11 23:51:26 +09:00
Dean Herbert
a77049213d Add basic hard-coded inefficient multi-channel support. 2017-05-11 23:10:48 +09:00
Dean Herbert
ca32caf9e4 Merge branch 'master' into new-option-search 2017-05-11 21:04:37 +09:00
Dean Herbert
b258109a9e Fix chat input box not always keeping focus as expected 2017-05-11 19:38:36 +09:00
Dean Herbert
ec67b617ae Add OptionsHeader class
Makes search textbox anchor correctly. Also improves visual styling.
2017-05-11 16:06:18 +09:00
Dean Herbert
df48204403 Fix OptionsOverlay stealing focus itself. 2017-05-11 13:56:21 +09:00
Dean Herbert
7d8af5f1da Use SearchTextBox
Correctly handle focus.
2017-05-11 13:23:31 +09:00
Dean Herbert
6c5490e31c Merge remote-tracking branch 'upstream/master' into new-option-search 2017-05-11 12:59:19 +09:00
Dean Herbert
70ef503403 Merge branch 'master' into metadata 2017-05-11 12:23:00 +09:00
Dean Herbert
262b42efe3 Merge branch 'master' into new-option-search 2017-05-11 12:20:58 +09:00
Dean Herbert
ab1768ef80 Merge branch 'master' into tidy-up 2017-05-09 10:27:29 +09:00
Jorolf
9aaac4ab0c Merge branch 'new-option-search' of github.com:Jorolf/osu into new-option-search 2017-05-08 18:30:33 +02:00
Jorolf
86f0173c6b fix license header 2017-05-08 18:30:00 +02:00
jorolf
3abf1b2a0b Merge branch 'master' into new-option-search 2017-05-08 17:25:47 +02:00
Huo Yaoyuan
ced2332d20 Handle overlay in ToolbarOverlayToggleButton. 2017-05-08 19:37:41 +08:00
Huo Yaoyuan
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
Dean Herbert
2f4fad9d41 Refactor colour selection. 2017-05-08 11:33:22 +09:00
Dean Herbert
df4a737c9b Merge remote-tracking branch 'ppy/master' into hud-mod-display 2017-05-08 10:56:34 +09:00
Dean Herbert
5131371c93 Merge branch 'master' into new-option-search 2017-05-08 10:49:49 +09:00
DrabWeb
de8428c95b Make requested changes 2017-05-07 22:23:33 -03:00
Dan Balasescu
fbf05f12fc Use controlWithCurrent as per comment. 2017-05-08 10:11:45 +09:00
Jorolf
3c4faae554 add search box and the ability to search 2017-05-07 20:35:57 +02:00
Huo Yaoyuan
146d57953d Use metadata field of WorkingBeatmap. 2017-05-06 14:57:11 +08:00
DrabWeb
81d67cbe06 Play first visible set in playlist when commiting in the search field. 2017-05-05 01:59:24 -03:00
Dean Herbert
6298b3effd Refactor ModSection and ModIcon to avoid null mods. 2017-05-05 12:16:41 +09:00
Dean Herbert
98b3b82c07 Apply CI fixes. 2017-05-04 23:32:27 +09:00
Dean Herbert
153951d3dd Add OptionItem class
Allow for centalised logic for all option UI controls.
2017-05-04 23:07:48 +09:00
EVAST9919
26985dbc62 Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-03 16:22:40 +03:00
Dean Herbert
19f6d58723 Merge remote-tracking branch 'upstream/master' into options-implementation 2017-05-03 21:54:27 +09:00
Dean Herbert
330dd458bd Trim whitespace. 2017-05-03 20:49:52 +09:00
Dean Herbert
489f586887 Add FPS display toggling.
Kinda temporary but better than nothing.
2017-05-03 20:34:53 +09:00
EVAST9919
5f2f1d2763 CI fixes 2017-05-03 14:01:43 +03:00
EVAST9919
e7a8619f01 ModIcon refactor 2017-05-03 09:48:10 +03:00
Dean Herbert
691742b828 Remove most options which have not yet been implemented. 2017-05-02 19:40:30 +09:00
Dean Herbert
f9de733128 Formatting. 2017-05-02 18:53:33 +09:00
Dean Herbert
d4045ee2c0 We only have one release stream, so let's unlock it. 2017-05-02 18:40:30 +09:00
Dean Herbert
57c2dd1f49 Fix options dropdown labels never being displayed. 2017-05-02 18:35:23 +09:00
Dean Herbert
1b0f353af3 Add support for framework-level mouse confining. 2017-05-02 17:45:42 +09:00
Dean Herbert
bef15fe637 Improve organisation of some options and config code. 2017-05-02 17:45:22 +09:00
Dean Herbert
116e92a542 Remove silly platform specific logic. 2017-05-02 17:00:30 +09:00
Dean Herbert
46ae8bc86b Use value because we need to. 2017-05-02 16:49:27 +09:00
Dean Herbert
f1d0b77d10 Base the music controller transform direction on relative indices in playlist. 2017-05-02 16:40:29 +09:00
Dean Herbert
beb98c14b6 Fix layout not being invalidated when re-filtering playlist display. 2017-05-02 16:26:11 +09:00
Dean Herbert
6074cb5979 Make playlist filtering work.
Also standardises searchable terms in beatmap metadata.
2017-05-02 10:45:55 +09:00
Dean Herbert
737ad78056 Set a sane default transform direction. 2017-05-01 20:10:19 +09:00
Dean Herbert
2437c416b1 Use less usings. 2017-05-01 19:56:01 +09:00
Dean Herbert
3943e4ae95 Fix comma. 2017-05-01 19:32:31 +09:00
Dean Herbert
c59589eba7 Only retrieve colour once. 2017-05-01 19:32:00 +09:00
Dean Herbert
0f4ef16910 Remove custom word splitting logic, add localisation support. 2017-05-01 17:14:59 +09:00
Dean Herbert
2cfb83436d Add placeholder logic for filtering. 2017-05-01 15:27:41 +09:00
Dean Herbert
a1f341a64f Fix textbox focus issues (and inability to use escape). 2017-05-01 15:23:01 +09:00
Dean Herbert
c1d0aea217 Refactoring part 5. 2017-05-01 15:09:14 +09:00
Dean Herbert
580cf93147 Refactoring part 4. 2017-05-01 15:03:11 +09:00
Dean Herbert
97a7f16ab7 Refactoring part 3. 2017-05-01 13:41:22 +09:00
Dean Herbert
7c2e193db1 Refactoring part 2. 2017-05-01 13:25:32 +09:00
Dean Herbert
37944bb04e Initial refactoring. 2017-05-01 13:01:08 +09:00
DrabWeb
9bdf462dd1 Possible null reference exception 2017-04-29 06:36:06 -03:00
DrabWeb
067b572245 Formatting 2017-04-29 06:28:57 -03:00
DrabWeb
ef811f3cf3 More formatting 2017-04-29 06:17:50 -03:00
DrabWeb
3f73799975 Formatting 2017-04-29 06:10:12 -03:00
DrabWeb
c193a90a16 Merge https://github.com/ppy/osu into playlist 2017-04-29 05:39:52 -03:00
Huo Yaoyuan
061c3cacbd CI fixes. 2017-04-26 20:04:32 +08:00
Huo Yaoyuan
4cb18361c1 Use localisation engine for unicode text. 2017-04-26 19:50:38 +08:00
Huo Yaoyuan
cf3e83ca62 Save ShowUnicode in framework config. 2017-04-26 19:48:46 +08:00
Dean Herbert
30e2e7bfe4 Merge branch 'master' into slider-stuff 2017-04-25 19:42:46 +09:00
Jorolf
a6ea6738e5 add some spaces after commas 2017-04-24 17:10:00 +02:00
Jorolf
7ef90e6597 Merge branch 'master' of git://github.com/ppy/osu into slider-stuff 2017-04-24 17:05:32 +02:00
Dean Herbert
3c98170330 Use method group for MusicController fault. 2017-04-24 20:22:21 +09:00
ColdVolcano
6a05440e6c Only schedule when faulted 2017-04-23 00:53:21 -05:00
ColdVolcano
1d254f4a56 Take MusicController back to life 2017-04-23 00:13:58 -05:00
Jorolf
60bb45358c remove more casts and usings 2017-04-22 18:36:37 +02:00
Jorolf
b151c71c0e remove casts 2017-04-22 18:36:36 +02:00
Jorolf
e53c4be356 I guess this works... 2017-04-22 18:36:36 +02:00
Jorolf
02249dcd67 add a function to OsuSliderBar to manually set the tooltip text 2017-04-22 18:34:57 +02:00
Jorolf
1d2f19b5a2 change background dim from integer to double 2017-04-22 18:34:03 +02:00
smoogipooo
2d91400239 Fix nullref due to framework change. 2017-04-22 16:56:17 +09:00
Dean Herbert
d94035e9da Merge branch 'master' into general-fixes 2017-04-21 20:42:46 +09:00
Dean Herbert
5fdc9819cf
Add basic UO support (now called Audio Offset). 2017-04-21 16:20:05 +09:00
Dean Herbert
25a7d99a8e
Remove unused reference. 2017-04-21 16:11:24 +09:00
Dean Herbert
5aa90df819
Allow OsuScreens to decide whether ruleset switching should be allowed.
Tidies up ToolbarModeSelector a lot by using DI.
2017-04-21 16:03:59 +09:00
Dean Herbert
ef7bc0f92e
Update UI controls to understand DisabledChanged. 2017-04-21 14:02:04 +09:00
Dean Herbert
093abd6872
Add chat toggle button. 2017-04-19 19:54:03 +09:00
Dean Herbert
c7246fd2ac
Reorganise ChatOverlay to not suck. 2017-04-19 19:15:21 +09:00
Dean Herbert
dda3fb85ee
Add user colour support. 2017-04-19 19:07:38 +09:00
Dean Herbert
3129708ccb
Add chat sending support. 2017-04-19 18:46:52 +09:00
Dean Herbert
87f6dc9e5a
Change default channel to #lazer. 2017-04-19 18:46:50 +09:00
Dean Herbert
325af333b9
Update API responses for chat. 2017-04-19 18:46:48 +09:00
Dean Herbert
64a8992153 Merge branch 'master' into general-fixes 2017-04-18 16:19:52 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Dean Herbert
727086c0b2
Updates in-line with framework. 2017-04-18 15:34:53 +09:00
Dean Herbert
af13f97435
Fix regressions and test cases. 2017-04-17 19:44:03 +09:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
smoogipooo
4a149c4ab8 Better default values + don't set Mode from outside. 2017-04-15 06:14:31 +09:00
smoogipooo
0333e1a050 Remove unused usings. 2017-04-15 05:57:18 +09:00
smoogipooo
0a1376c2db Remove PlayMode game-wide. 2017-04-15 05:22:41 +09:00
smoogipooo
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
Dean Herbert
98544a8077
Fix unsynchronised tweening. 2017-04-14 19:20:07 +09:00
Dean Herbert
8c41707ac7
Fix incorrect default state. Handle input better. 2017-04-14 14:40:52 +09:00
Dean Herbert
09195a03a2
Merge remote-tracking branch 'upstream/master' into song-progress-graph
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-04-14 11:25:00 +09:00
Poliwrath
dffdb100ab Small fix to the chat overlay to prevent crashing on the test 2017-04-11 21:35:49 -04:00
Dean Herbert
9732110bd9
Update TransformTo methods in line with framework changes. 2017-04-11 17:25:56 +09:00
Dean Herbert
5af4259ab4
Add back explicit binds. 2017-04-10 17:10:15 +09:00
Dean Herbert
f12b5a8954
Unify disable logic. 2017-04-10 16:22:36 +09:00
Dean Herbert
b7cfdff8d1
Update SliderBar to use IHasCurrentValue. 2017-04-10 15:30:17 +09:00
Dean Herbert
bb4a909de5
Update UI control access in line with framework changes. 2017-04-10 14:54:23 +09:00
DrabWeb
fc7eef091f current_colour -> currentColour, fix masked away playlist items not fading colours 2017-04-09 09:08:11 -03:00
DrabWeb
70756a069e Unused usings 2017-04-09 07:52:26 -03:00
DrabWeb
241895c85b Proper playlist item text wrapping 2017-04-09 07:36:41 -03:00
DrabWeb
67f1167172 Comments, play first song if current is nil and user presses play 2017-04-09 07:04:41 -03:00
DrabWeb
7f2feab9e7 Proper search field focusing and exit on escape 2017-04-09 06:26:17 -03:00
DrabWeb
a88c82705b Use playlist queue 2017-04-09 06:11:53 -03:00
DrabWeb
fe17cb924d Cleanup 2017-04-09 04:50:35 -03:00
DrabWeb
7b5f8800bd Reimplement with MusicController 2017-04-09 04:26:21 -03:00
DrabWeb
2d6a2f41aa Reset MusicController 2017-04-09 04:12:30 -03:00
DrabWeb
963cd09bd0 Merge https://github.com/ppy/osu into playlist 2017-04-09 04:04:13 -03:00
DrabWeb
f65eaa6566 Show scroll dragger, change behaviour when selecting playing song 2017-04-09 03:52:48 -03:00
Dean Herbert
e1e9772d46 Flash buttons on click. 2017-04-08 19:28:29 +09:00
Dean Herbert
e40ad69a3b Adjust icon scale of play button. 2017-04-08 19:25:40 +09:00
Thomas Müller
b99cbe6962 Add back nice scaling of music controller buttons 2017-04-08 19:17:20 +09:00
Thomas Müller
166a78a15a Fix up comment in audio device options 2017-04-08 11:01:41 +02:00
Thomas Müller
ac073e22c9 Fix crash caused by multiple identical audio device names
The option dropdown for audio device selection lists all audio
device names. Dropdowns, however, may not have multiple identical
keys. This commit adds removal of duplicate audio device names from
the dropdown. BASS does not give us a simple mechanism to select
specific audio devices in such a case anyways. This functionality would
require OS-specific and involved code.
2017-04-07 17:00:34 +02:00
Dean Herbert
7e99fc47e2
wip 2017-04-07 16:54:54 +09:00
smoogipooo
a9d938e7ed Fix brace style. 2017-04-07 15:57:00 +09:00
Dean Herbert
06776443eb
Merge branch 'music-controller-improvements' into song-progress-graph
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-04-07 15:49:14 +09:00
Dean Herbert
2c2a4169c6
Better structure for button layout. 2017-04-07 15:28:18 +09:00
Dean Herbert
7d2af9310b
Expose DragBar's seeking property. 2017-04-07 15:23:03 +09:00
Dean Herbert
3dbf4879c7
Merge branch 'music-controller-improvements' into song-progress-graph
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-04-07 15:18:58 +09:00
Dean Herbert
361e187949
Temporarily disable button scaling. 2017-04-07 14:33:58 +09:00
Dean Herbert
fa28e7bdc3
Improve clickability and visuals of MusicController buttons. 2017-04-07 14:09:26 +09:00
Dean Herbert
7c9f30c288
MusicController regression fixes. 2017-04-07 13:15:57 +09:00
Dean Herbert
bc4e0bfa8b
Make DragBar animate seeks. 2017-04-07 13:14:41 +09:00
Dean Herbert
12d2102a88
Merge remote-tracking branch 'upstream/master' into song-progress-graph
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Modes/UI/HudOverlay.cs
#	osu.Game/Screens/Play/PauseOverlay.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/osu.Game.csproj
2017-04-07 09:22:18 +09:00
Huo Yaoyuan
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
Huo Yaoyuan
9b1e010dcc Fix filename mismatch. 2017-04-06 16:05:41 +08:00
Dean Herbert
efe82ef88c Merge branch 'master' into hud_visibility 2017-04-06 13:40:10 +09:00
Dean Herbert
863dc44c4d
Some minor improvements. 2017-04-06 09:57:34 +09:00
Andrey Zavadskiy
009909dd4b Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility 2017-04-04 17:39:53 +03:00
Dean Herbert
7c74951454
Update bindables.
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
Dean Herbert
83322dc5cb Merge branch 'master' into hud_visibility 2017-04-03 11:51:11 +09:00
Dean Herbert
bfa2e68bfb Container->Wrapper. 2017-04-02 16:17:13 +09:00
Dean Herbert
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Andrey Zavadskiy
d7c39a00b4 Hud Visibility 2017-03-31 16:43:31 +03:00
Dean Herbert
fa7fd6efe3
Fix mode selector not invoking a re-filter. 2017-03-29 19:48:13 +09:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert
4042b94e01
Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
Dean Herbert
768b3c4b4b
Add better focus handling in the login form. 2017-03-28 00:08:27 +09:00
Dean Herbert
13272e6995
Make Avatar accept a user.
Add UpdateableAvatar to handle the toolbar use-case.
2017-03-28 00:08:26 +09:00
DrabWeb
215b016f32 Initial implementation 2017-03-24 05:59:26 -03:00
Dean Herbert
4d61424abd Merge branch 'master' into song-progress-graph 2017-03-23 17:44:22 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
Huo Yaoyuan
0dbc232ebf Rename all DropDown -> Dropdown. 2017-03-22 22:32:32 +08:00
Huo Yaoyuan
6a4ca08578 Merge branch 'master' into controls 2017-03-22 22:28:19 +08:00
DrabWeb
29c54d4d8b Merge https://github.com/ppy/osu into song-progress-graph 2017-03-22 08:50:17 -03:00
Dean Herbert
fbe08436d2
Fix usages of CircularContainer in line with framework changes. 2017-03-22 19:35:03 +09:00
Huo Yaoyuan
e217c67bcf Merge branch 'master' into controls 2017-03-22 08:54:03 +08:00
Huo Yaoyuan
b46ded7794 Use Bindable for DropDown. 2017-03-22 07:49:21 +08:00
Dean Herbert
8983bbcaad Merge branch 'master' into leaderboards 2017-03-22 08:24:49 +09:00
Huo Yaoyuan
f0edf5d3d3 Update to DropDown and Menu. 2017-03-22 07:18:53 +08:00
Dean Herbert
b00f86d809 Merge branch 'master' into seperateCursorSize 2017-03-22 08:11:45 +09:00
Jorolf
82d6129063 renamed CursorSize to MenuCursorSize 2017-03-21 17:16:23 +01:00
Andrey Zavadskiy
943bd737c4 Hide letterbox position sliders 2017-03-21 18:24:19 +03:00
smoogipooo
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
Dean Herbert
5d0adc6454 Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards 2017-03-19 18:51:53 +09:00
Jorolf
80de15d935 fixed typo 2017-03-18 15:22:03 +01:00
Thomas Müller
9af0104e3e Fix NaN when dragging music controller
When dragging music controller we divide by the dragged distance.
When dragging to the origin of the drag this resulted in NaN.
Now, we check for this and use 0 in this case.
2017-03-18 12:46:12 +01:00
Seth
4aea06be22 Merge branch 'master' into leaderboards 2017-03-17 18:23:01 -03:00
Jorolf
8568e1536c Separated menu and gameplay cursor size 2017-03-17 18:40:03 +01:00
Dean Herbert
ab8a5afdb9
AlwaysReceiveInput and InternalContains. 2017-03-16 17:38:36 +09:00
Dean Herbert
1ae4c2dfbb
Remove a lot of customisation from Avatar (and add it in individual usages). 2017-03-15 15:22:28 +09:00
DrabWeb
650fc7563d ScoreRank, Avatar to own files, +DrawableRank 2017-03-14 10:58:28 -03:00
Seth
21a9996225 Merge branch 'master' into leaderboards 2017-03-14 10:07:33 -03:00
Dan Balasescu
879a78156d Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00
Huo Yaoyuan
3913a0a9ee Fix removal of the last one beatmap. 2017-03-14 05:35:58 +08:00
DrabWeb
74eddc768a Random diff 2017-03-13 13:02:56 -03:00
DrabWeb
8e90e05f23 Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static 2017-03-13 12:31:46 -03:00
DrabWeb
dbc8d513f9 Merge https://github.com/ppy/osu into leaderboards 2017-03-13 09:36:16 -03:00
smoogipooo
c0e29652a6 Initial attempt at making mods apply better. 2017-03-12 22:13:43 +09:00
Dean Herbert
e6f4fe9e61 Merge pull request #458 from Lahvuun/master
Options sidebar flickering fix.
2017-03-10 13:20:07 +09:00
Jorolf
9dd835e256 didn't see this was unnecessary after my changes 2017-03-09 21:43:11 +01:00
Jorolf
d9a4a677fd Added Descriptions to Rulesets + PlayModes list 2017-03-09 21:37:03 +01:00
Lahvuun
427a0dd0f5 Options sidebar flickering fix. 2017-03-09 22:29:39 +02:00
Huo Yaoyuan
9007409072 Follow appveyor's code style check. 2017-03-09 16:44:45 +08:00
Dean Herbert
115ebd4773 Merge branch 'master' into modselect 2017-03-09 17:31:25 +09:00
Huo Yaoyuan
1b182b1361 Fix typo. 2017-03-09 15:55:40 +08:00
Dean Herbert
dad6060149
Fix warnings not covered by resharper locally. 2017-03-09 16:07:34 +09:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert
a048e666d7
Fix autoproperty which doesn't work on mono. 2017-03-09 14:26:09 +09:00
Dean Herbert
da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert
3eece390cb
Abstract constructors -> protected. 2017-03-09 14:01:08 +09:00
Dean Herbert
0c4c1689b6 Merge branch 'master' into modselect 2017-03-09 12:51:40 +09:00
Dean Herbert
5a42035f88
Update license headers. 2017-03-08 15:50:52 +09:00
Huo Yaoyuan
b19405c987 Allow null in mod list to generate a placeholder ModButton. 2017-03-07 19:52:51 +08:00
Huo Yaoyuan
8979b28496 Remove usages of the 'new' keyword. 2017-03-07 16:17:51 +08:00
Huo Yaoyuan
b56d6c767b Merge branch 'master' into modselect 2017-03-07 16:10:53 +08:00
Dean Herbert
bff1179624
Merge branch 'master' into replay
# Conflicts:
#	osu.Game/Modes/Mod.cs
2017-03-07 14:32:14 +09:00
Dean Herbert
ecdbcb20cf
Fix error-level inspections. 2017-03-07 13:52:47 +09:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
Dean Herbert
3e4cd0dc7c
Merge remote-tracking branch 'upstream/master' into less-mods-enum
# Conflicts:
#	osu.Game.Modes.Mania/ManiaMod.cs
#	osu.Game.Modes.Osu/OsuMod.cs
#	osu.Game/Modes/Mod.cs
2017-03-07 13:42:50 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dan Balasescu
bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
Dean Herbert
9106c45858
Fix remaining errors. 2017-03-07 10:42:59 +09:00
Thomas Müller
9b92e99ce9 Merge branch 'master' into increase-ci-strictness 2017-03-06 21:44:39 +01:00
Thomas Müller
6e9c4a4251 Merge branch 'master' into options-footer 2017-03-06 20:01:51 +01:00
Huo Yaoyuan
27edc9971e Update deselect logic.
Change to DeselectTypes to avoid enumerating children for multi times.
2017-03-07 01:15:21 +08:00
Huo Yaoyuan
eda7e1b26f Fix and update mode changing handling. 2017-03-07 01:01:42 +08:00
Huo Yaoyuan
5cd859ecf1 Fix missed color during loading. 2017-03-07 00:46:36 +08:00
Huo Yaoyuan
836484ba51 Add abstract ModType for ModSection. 2017-03-07 00:32:22 +08:00
Huo Yaoyuan
318ab68af1 Use Bindable<IEnumerable<Mod>> to fit other changes. 2017-03-07 00:17:06 +08:00
Huo Yaoyuan
59d1fdb032 Simplify ModSection. 2017-03-07 00:12:06 +08:00
Dean Herbert
dcc7386609
Add option toggle for debug cached setting. 2017-03-06 22:07:46 +09:00
Huo Yaoyuan
564b3f0706 Refactor icon management of ModButton. 2017-03-06 19:03:26 +08:00
Huo Yaoyuan
a91d897282 Handle left and right mouse button only. 2017-03-06 18:02:51 +08:00
Huo Yaoyuan
f6f20cafd3 Merge remote-tracking branch 'peppy/less-mods-enum' into modselect 2017-03-06 17:35:15 +08:00
Dean Herbert
12a3b1414f
Add sane defaults for abstract Mod class and remove remaining use of enum. 2017-03-06 18:29:19 +09:00
Dean Herbert
45f500920c
Don't use Mods enum for handling incompatible mods. 2017-03-06 18:29:17 +09:00
Huo Yaoyuan
ad75ead665 selectedMod -> selectedIndex 2017-03-06 17:21:25 +08:00
Huo Yaoyuan
c2cf5242e1 Remove one-entry backing fields. 2017-03-06 17:14:41 +08:00
Dean Herbert
463c887879
Fix WaveOverlayContainer staying visible when hidden. 2017-03-06 17:32:13 +09:00
Dean Herbert
b5aff9df5f
Add options footer. 2017-03-06 17:30:46 +09:00
Dean Herbert
e356758a7d
Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
Huo Yaoyuan
a34e6453bf Simplify SelectedMods. 2017-03-06 15:39:27 +08:00
Dean Herbert
2de25c23b4
Make Mods IEnumerable. 2017-03-06 15:20:55 +09:00
Dean Herbert
4e4408cd20 Merge branch 'master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
DrabWeb
9cde20ffc7 Merge https://github.com/ppy/osu into leaderboards 2017-03-04 22:33:05 -04:00
Thomas Müller
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
Thomas Müller
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
Dean Herbert
e12d89529c
Merge remote-tracking branch 'upstream/master' into update-flow 2017-03-04 23:28:39 +09:00
Dean Herbert
00fdffe9c8
Update framework (and fix non-conforming anchors in FillFlowContainers). 2017-03-04 23:24:13 +09:00
Dean Herbert
a8deb4ff50
Fix WaveOverlayContainer always being visible. 2017-03-04 19:02:13 +09:00
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
DrabWeb
a112b354f0 Basic implementation of score UI 2017-03-04 03:37:34 -04:00
Thomas Müller
c44bf5291c Merge branch 'master' into mod-select-performance 2017-03-04 07:35:40 +01:00
DrabWeb
9141d244bf Focus trigger in WaveOverlayContainer 2017-03-03 18:05:43 -04:00
DrabWeb
5a83687a27 Small cleanups 2017-03-03 18:02:31 -04:00
Thomas Müller
aff9e3617d Massively improves fill-rate of mod select screen
This is done by masking away the parts of WaveOverlayContainer that
are behind the content.
2017-03-03 20:42:03 +01:00
Dean Herbert
6f3b59268a Merge pull request #385 from DrabWeb/mod-overlay
Mod select
2017-03-03 21:09:08 +09:00
Dean Herbert
dc6a728cce Merge branch 'master' into tournament_drawings 2017-03-03 20:48:07 +09:00
Dean Herbert
2ac248c7d0
Use OsuSpriteText. 2017-03-03 20:29:39 +09:00
Dean Herbert
71534b3e13
Fix incorrect triangle density on first display. 2017-03-03 18:09:16 +09:00
Seth
fde509ab1d Merge branch 'master' into mod-overlay 2017-03-03 04:12:42 -04:00
Seth
1891bdf51e Merge branch 'master' into mod-overlay 2017-03-03 01:11:15 -04:00
John Leuenhagen
417c7e341a
Password textbox now performs login on enter 2017-03-02 22:41:14 -05:00
Dean Herbert
3a8246f56d
Move PauseOverlay to correct namespace. 2017-03-03 10:17:39 +09:00
DrabWeb
536925c77a Comply to naming conventions 2017-03-02 09:15:53 -04:00
Dean Herbert
ef8a35f5cc
Fix Toolbar's mode changer not working correctly. 2017-03-02 22:01:24 +09:00
Dean Herbert
e399d6c6d1
Use bindable for PlayMode. 2017-03-02 21:16:58 +09:00
Dean Herbert
471b9daa93
Merge branch 'master' into mod-overlay
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/osu.Game.csproj
2017-03-02 20:27:04 +09:00
Dean Herbert
435e845067
Merge branch 'master' into DrabWeb/song-progress-graph
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Overlays/Pause/PauseProgressBar.cs
#	osu.Game/Overlays/Pause/PauseProgressGraph.cs
#	osu.Game/osu.Game.csproj
2017-03-02 20:20:27 +09:00
Dean Herbert
963117f07d
Fix incorrect event order. 2017-03-02 17:41:33 +09:00
Dean Herbert
68857b573d
More code tidying. 2017-03-02 17:14:05 +09:00
Dean Herbert
c4871bbbf3
Tidy up code.
The triggered bool is not even necessary because input is no longer handled after the OverlayContainer's state is set to hidden.
2017-03-02 17:08:00 +09:00
Dean Herbert
d1cd077e0d
Post-merge fixes. 2017-03-02 16:54:55 +09:00
Dean Herbert
ff5f0af2d3 Merge branch 'master' into popup-dialog 2017-03-02 16:42:20 +09:00
DrabWeb
37ed1b3d09 Moved key press select mods to ModSection 2017-03-02 01:24:32 -04:00
DrabWeb
1eee587c18 CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection 2017-03-02 01:07:28 -04:00
DrabWeb
6c680825ed ModSections in Ruleset, fixed toolbar play mode changed not firing 2017-03-01 22:05:52 -04:00
DrabWeb
bb12463ae4 Working on better way to handle mods 2017-03-01 20:57:33 -04:00
DrabWeb
befdf68abe Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once 2017-03-01 18:41:00 -04:00
Thomas Müller
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
Thomas Müller
d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
DrabWeb
c3a81127f2 Updated to work with latest framework 2017-02-28 02:25:38 -04:00
DrabWeb
570c95cb98 Merge https://github.com/ppy/osu into mod-overlay 2017-02-28 02:22:59 -04:00
DrabWeb
ce1798b8bc DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay 2017-02-28 02:09:36 -04:00
DrabWeb
50d172be39 Added DialogManager(not wired up for desktop project yet) 2017-02-28 00:59:36 -04:00
DrabWeb
bc7fd3bd39 Remove uneccesary cast, move enter OK button to one liner 2017-02-27 22:38:44 -04:00
DrabWeb
94f34b985b Forgot returns 2017-02-27 22:32:30 -04:00
DrabWeb
0ce8fff666 Enter key presses first OK button, 1-9 presses button at number 2017-02-27 22:31:23 -04:00
DrabWeb
e8cae3b45e Remove new override in DialogButton 2017-02-27 21:38:25 -04:00
DrabWeb
164f205ee5 Remove SpaceTextOnHover 2017-02-27 21:30:10 -04:00
DrabWeb
b3a231185b Conform to naming conventions 2017-02-27 20:55:10 -04:00
DrabWeb
34ba3129a3 Removed background triangles 2017-02-27 20:44:27 -04:00
DrabWeb
64d036fe81 Update to work with latest framework 2017-02-27 16:41:45 -04:00
DrabWeb
3094c01a40 Merge https://github.com/ppy/osu into popup-dialog 2017-02-27 16:40:04 -04:00
default0
03889e6ca6 Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
Andrey Zavadskiy
9444ffd849 Removed redundant qualifiers 2017-02-27 17:37:38 +03:00
Andrey Zavadskiy
3487dfe236 Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
DrabWeb
d78dca3d85 New design 2017-02-26 23:35:13 -04:00
default0
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Dean Herbert
686372a7f9
Update with framework structural changes. 2017-02-26 20:54:32 +09:00
Dean Herbert
9f5518312d
Add missing file. 2017-02-26 18:28:01 +09:00
Dean Herbert
79993a576f
Add basic GC options. 2017-02-26 18:06:59 +09:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
DrabWeb
a009268370 Merge https://github.com/ppy/osu into popup-dialog 2017-02-25 21:22:47 -04:00
DrabWeb
bd6ca99246 Even faster 2017-02-24 16:48:30 -04:00
DrabWeb
42b26a4c2f Speedup triangles 2017-02-24 16:41:10 -04:00
Dean Herbert
6c3bda18b6
Add beatmap deletion support.
Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.
2017-02-24 14:37:54 +09:00
DrabWeb
c94da4fcf0 Added popup dialog 2017-02-24 00:05:37 -04:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
Thomas Müller
37bc75a7b6 Remove unused variables 2017-02-23 22:32:49 +01:00
Thomas Müller
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Seth
b4b88712ad Merge branch 'master' into mod-overlay 2017-02-23 08:00:24 -04:00
DrabWeb
a67bfacb19 Made requested changes 2017-02-23 07:57:58 -04:00
DrabWeb
e1c4abd8c5 Cleaned ModSelectOverlay 2017-02-23 07:36:31 -04:00
Kelvin
fd622286fe Enable Tabbing in LoginOptions 2017-02-23 00:50:09 -08:00
Dean Herbert
f1538791c3
Correctly hook up window mode dropdown. 2017-02-23 17:35:14 +09:00
Dean Herbert
da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Dean Herbert
c683cdbb1d
Derive from FocusedOverlayContainer and remove custom focus logic. 2017-02-23 12:51:32 +09:00
Dean Herbert
cee1c14557
Clean-up code. 2017-02-23 12:48:24 +09:00
Dean Herbert
8d1498a8db
Fix initial state and shorten disappear animation. 2017-02-23 12:47:20 +09:00
Dean Herbert
b33627a750
Make transitions better. 2017-02-23 12:42:31 +09:00
Dean Herbert
8787b0dc90
Remove a lot of constants (use object initialisers instead). 2017-02-23 12:17:59 +09:00
Dean Herbert
521a9b7728
Remove need for waves array; use generic container. 2017-02-23 11:26:50 +09:00
Dean Herbert
d154cf7938
Abstract wave logic to class. 2017-02-23 11:22:01 +09:00
Dean Herbert
9f367bcc0e
Fix line endings. 2017-02-23 11:16:23 +09:00
DrabWeb
79ff96de0d Typo 2017-02-22 16:38:36 -04:00
DrabWeb
a58a0a4edf Fix transition stutter 2017-02-22 16:37:58 -04:00
DrabWeb
cf5258ceb0 Thanks refactoring 2017-02-22 13:17:06 -04:00
DrabWeb
bf1d13e734 Comply to formatting style 2017-02-22 13:12:39 -04:00
DrabWeb
8cd7ebcb43 readonly -> const 2017-02-22 13:03:19 -04:00
DrabWeb
416772e96f Update to work with latest framework 2017-02-22 12:46:38 -04:00
DrabWeb
99f1f88c75 Merge https://github.com/ppy/osu into mod-overlay 2017-02-22 12:35:55 -04:00
DrabWeb
bac0431102 Fixed build failing 2017-02-22 12:28:34 -04:00
DrabWeb
cc956bc8ec Newline 2017-02-22 12:23:46 -04:00
DrabWeb
584a514267 Cleanup part 2 2017-02-22 12:22:29 -04:00
DrabWeb
4821f323b8 Cleanup 2017-02-22 12:12:41 -04:00
DrabWeb
337a1004d3 Made mod disabling better 2017-02-22 11:34:22 -04:00
Thomas Müller
44bedb5407 Merge branch 'master' into chat-improvement 2017-02-22 07:36:42 +01:00
Dean Herbert
190bed8939
Add top padding. 2017-02-22 13:38:22 +09:00
Dean Herbert
b7a9fd85ea
Assert single channel support for now. 2017-02-22 13:38:10 +09:00
Dean Herbert
cbd061d573
Improve appearance of notifications. 2017-02-21 13:52:37 +09:00
Dean Herbert
6a83620589
Add better focus handling and padding/margin updates. 2017-02-20 21:11:09 +09:00
Dean Herbert
e3fa49dda7
Naively "send" messages that the user types (doesn't arrive yet). 2017-02-20 21:10:43 +09:00
Dean Herbert
7a2eedbd7e
Add message batching per-channel. 2017-02-20 21:09:34 +09:00
Dean Herbert
de87141e90 Remove unused using statements. 2017-02-19 18:39:54 +09:00
Dean Herbert
aac4ba2baa Add input box to ChatOverlay. 2017-02-19 18:02:25 +09:00
Dean Herbert
0da0ef5a1b Fix padding, fonts and alignment of chat display. 2017-02-19 17:06:41 +09:00
DrabWeb
3f5d155583 Added DeselectAll 2017-02-18 11:40:05 -04:00
DrabWeb
a024353574 Wave animation fine tuning 2017-02-18 11:21:41 -04:00
Dean Herbert
ebc38917dc
Fix options sidebar not displaying correclty. 2017-02-18 22:29:20 +09:00
DrabWeb
d1af050355 Fixed typo, made mod select take focus when visible 2017-02-18 07:50:22 -04:00
DrabWeb
006fb5502d ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select 2017-02-18 07:28:22 -04:00
Dean Herbert
32ce8cf723
Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
Thomas Müller
4b0d6cd26b Don't rely on default relative size of ScrollContainer. 2017-02-17 20:08:28 +01:00
DrabWeb
4ccfa380f5 Added high/low multiplier indication 2017-02-16 19:09:18 -04:00
DrabWeb
e0dab3490f Added toggling mods with keys 2017-02-16 19:00:18 -04:00
DrabWeb
9fc3726925 ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly 2017-02-16 18:32:27 -04:00
DrabWeb
0a58fc62db Added mod selection overlay 2017-02-16 16:05:03 -04:00
Dean Herbert
67105e6dfd
Replace all usage of SpriteText with OsuSpriteText. 2017-02-15 21:37:43 +09:00
Jorolf
d42c5481b0 Make mode selector selected line non-relative. (#352)
* mode selector line has the correct length now
* calculation is now a 'one-liner'
* Line length is absolute now
* Line length is calculated inline
2017-02-15 13:48:49 +09:00
Dean Herbert
13ed7db361 Merge branch 'master' into general-fixes 2017-02-15 01:14:25 +09:00
Dean Herbert
f207da6041
Add/update license headers. 2017-02-14 18:17:35 +09:00
Dean Herbert
4f9d1a6c39 Visually disable options which aren't yet wired up. 2017-02-14 00:36:50 +09:00
Thomas Müller
aaaf7163e0
Update framework. 2017-02-13 17:46:50 +09:00
Dean Herbert
e32ccb6153 Move scene graph init to ctors. 2017-02-12 19:39:54 +09:00
Dean Herbert
ac548dc9ec Rework notifications to be more flexible. 2017-02-12 14:50:42 +09:00
Dean Herbert
a14b7eb598 NotificationManager should become visible when receiving a notification (until we implement toasts). 2017-02-12 14:50:02 +09:00
Thomas Müller
d3380631e8 Handle preferred audio device correctly when it is unavailable
This commit allows loading, storing, and displaying a preferred audio
device from config even when it is unavailable.
2017-02-11 16:33:54 +01:00
Thomas Müller
d79c8b9695 Update AudioDevicesOptions when devices are found or lost
This commit hooks up AudioDevicesOptions to the new events exposed by
the AudioManager of osu-framework. The device list is now updated when
new devices become available or are lost.
2017-02-11 16:29:33 +01:00
Thomas Müller
8394e2ff38 Update OptionDropDown value when items change
Items of OptionDropDown could previously already be changes on-the-fly,
but the selected value was not correctly updated (it kept the same index).
This commit addresses this problem.
2017-02-11 16:27:15 +01:00
Thomas Müller
2c4ecb990d Remove line break in MusicController 2017-02-11 16:23:15 +01:00
Dean Herbert
398ac6f459
Add assert to ensure complete is only called once. 2017-02-10 16:58:40 +09:00
Dean Herbert
dd8ec70bd5
Remove excess newline. 2017-02-10 16:57:49 +09:00
Dean Herbert
2da5628184
Merge remote-tracking branch 'upstream/master' into notifications-manager 2017-02-10 16:54:56 +09:00
Dean Herbert
8ec927899f
Implement notifications. 2017-02-10 16:30:23 +09:00
DrabWeb
7fea233181 Removed gradient from test case, modified DragBar to allow access to what's needed in the progress bar, styled the progress bar 2017-02-09 16:28:40 -04:00
Andrey Zavadskiy
e06aa44c4c Warning Fixes 2017-02-09 16:18:08 +03:00
Dean Herbert
d73093867d Merge pull request #320 from default0/audio-device-selection
Audio device selection
2017-02-09 16:45:29 +09:00
Thomas Müller
b7fd65070e Merge pull request #335 from peppy/overlay-improvements
Overlay improvements
2017-02-09 08:43:58 +01:00
Dean Herbert
23bc84fa3c Fix borked header. 2017-02-09 16:38:39 +09:00
Dean Herbert
d05b544d0d
Merge branch 'master' into audio-device-selection
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
2017-02-09 16:21:28 +09:00
Dean Herbert
0937424e0c
Add base.PopOut calls to allow for passing away focus. 2017-02-09 13:57:52 +09:00
Dean Herbert
30bec0876d
Make MusicController a focused overlay. 2017-02-09 13:57:49 +09:00
Dean Herbert
581ec765fb
Improve transitions of MusicController. 2017-02-09 13:57:47 +09:00
Dean Herbert
18bb61897f
Update overlay containers in lines with framework changes.
Allows closing the MusicController using escape.
2017-02-09 13:57:44 +09:00
Dean Herbert
f6956fc51c
Fix MusicController doing work in the background when not visible. 2017-02-09 11:36:45 +09:00
Dean Herbert
b6398a1c77
Centralise toolbar size variables and adjust to design. 2017-02-08 20:30:45 +09:00
Dean Herbert
143cfae93a
Login overlay should disappear when toolbar is hidden. 2017-02-08 20:30:45 +09:00
Dean Herbert
a7dac15d05
Toolbar is now toggled by the main menu. 2017-02-08 20:30:45 +09:00
Dean Herbert
2e119cd74f
Handle toolbar offsets better. 2017-02-08 20:30:45 +09:00
Dean Herbert
5eb3ef3948
Make LoginOverlay and OptionsOverlay focused containers. 2017-02-08 15:13:32 +09:00
Dean Herbert
a6f02106a4
Use new placeholder logic. 2017-02-08 14:08:01 +09:00
Dean Herbert
446b277972
Don't allow clicks/hover events to pass through the options overlay. 2017-02-07 20:29:40 +09:00
Dean Herbert
6b011a50d2
Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
756fd78a88
Fix incorrect line endings. 2017-02-07 13:52:19 +09:00
DrabWeb
7c83dc8aed Merge https://github.com/ppy/osu into song-progress-graph 2017-02-06 20:40:49 -04:00
Danil Yarancev
c222ce4403 Fix name 2017-02-06 21:19:27 +03:00
Dean Herbert
9b9ed32245
Remove all @2x references, updates resource and framework. 2017-02-06 22:19:47 +09:00
default0
6add77c30b Rename Standard device option to Default
Changed the name of the option for using the default audio device
to "Default" for consistency with english windows. Also changed
the "" value to string.Empty for consistency with the Frameworks
treatment of this special value.
2017-02-06 12:26:32 +01:00
default0
ae03ef0787 Allow audio device selection in settings 2017-02-06 01:22:37 +01:00
default0
b4f30dd417 Rework OptionDropdowns to be more versatile
The existing OptionDropdown only supported enums and was thus renamed
to OptionEnumDropDown. A new OptionDropdown has been created in its
place to allow binding to arbitrary values, with a set of user-provided
items.
2017-02-06 01:21:26 +01:00
Thomas Müller
91f0951255 Handle OnMouseDown in PauseOverlay such that players can not click circles through the overlay while paused. 2017-02-05 20:17:29 +01:00
Thomas Müller
0f72ef7dc2 Make pause buttons OnClick and not OnMouseDown. 2017-02-05 20:17:02 +01:00
Thomas Müller
c56478e154 Add missing license header. 2017-02-05 20:16:40 +01:00
Thomas Müller
d291103d22 Avoid triangle bleeding by masking the triangle container without smoothness. 2017-02-05 16:34:47 +01:00
Thomas Müller
a69c306334 Merge branch 'master' of github.com:ppy/osu into fix-login-button 2017-02-05 15:28:44 +01:00
Thomas Müller
ba38a27274 Fix incorrect sizing of login button.
When logging in or out the size of the login button would not correctly update,
resulting in a messed-up flow of toolbar buttons. This branch fixes the problem
by avoiding an invalidation-chain-breaking override of Size. Instead, the loginOverlay
bypasses auto sizing by using a new framework feature.
2017-02-05 15:17:54 +01:00
Andrey Zavadskiy
43dcf0bbc1 PauseButton Triangles 2017-02-05 13:47:37 +03:00
Dean Herbert
714c94b7a8 Fix toolbar sizing hackiness. 2017-02-04 22:27:05 +09:00
Dean Herbert
57d97ba2e9 Make triangles look better in many cases. 2017-02-04 22:09:44 +09:00
Dean Herbert
0fefa50b54 Add padding beneath sliders in options. 2017-02-04 20:57:08 +09:00
Thomas Müller
1913ec659a Merge branch 'master' of github.com:ppy/osu into better-option-sliders 2017-02-04 12:07:21 +01:00
Thomas Müller
6db70f8850 Use MaskingSmoothness to make masked diagonal edges smoother. 2017-02-04 11:06:26 +01:00
Thomas Müller
0edc64a08c Re-use checkbox nub for option sliders and slightly re-structure. 2017-02-04 09:50:58 +01:00
DrabWeb
0d8815bd37 Added back current work 2017-02-03 15:22:02 -04:00
Dean Herbert
4504440f80 Fix much dropdown shit. 2017-02-03 19:13:10 +09:00
Dean Herbert
fc9badf20f Fix autosize issues. 2017-02-03 15:22:00 +09:00