h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 16:52:57 +08:00
Code Issues Releases Wiki Activity
19,408 Commits 3 Branches 661 Tags 357 MiB
681a123560
Commit Graph

3313 Commits

Author SHA1 Message Date
Dean Herbert
4cb7063801 Add automated testing of mod preservation/removal 2018-08-07 16:45:18 +09:00
Dean Herbert
7b8bd7f21c Fix mod selection not restoring when re-entering song select 2018-08-07 14:49:44 +09:00
Dean Herbert
6d6fea47ab Reduce animations of osu!direct list mode 
The panels' content was flying around and felt really shocking. This fixes elements in place to provide a better experience.
 2018-08-05 14:36:09 +09:00
miterosan
cc640893c2
Merge branch 'master' into Private_Messages 2018-08-04 00:33:46 +02:00
Dean Herbert
fc8526d8ba
Merge branch 'master' into scroll-chat-on-message 2018-08-03 20:09:54 +09:00
Dean Herbert
b4ef3dd4dd Add LocalMessage 2018-08-03 20:03:43 +09:00
Dean Herbert
4c57e629ff Use private implementation 2018-08-03 19:32:34 +09:00
Dan Balasescu
3460fd6e71
Merge branch 'master' into split-mod-sections 2018-08-03 18:48:31 +09:00
Dean Herbert
4bd811bd2d
Merge branch 'master' into circular-button 2018-08-02 20:25:45 +09:00
Dean Herbert
70ee7e4afd Scroll chat to end of buffer when posting a new message 2018-08-02 08:00:14 +09:00
smoogipoo
b9814b64ed Move default button implementation from TriangleButton to OsuButton 2018-08-01 17:02:38 +09:00
Shane Woolcock
47533f83c3 Update TabControl subclasses to use AddInternal 2018-07-31 20:52:11 +09:30
Dean Herbert
582bc58715 Remove unused colour propagation 2018-07-31 18:05:14 +09:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
Dean Herbert
bcc23f10c5
Merge branch 'master' into disable-download-button 2018-07-31 17:03:41 +09:00
smoogipoo
ec31028f14 Add tooltip 2018-07-31 14:50:57 +09:00
smoogipoo
70338e087a Disable beatmap download button if not supporter 2018-07-31 14:41:31 +09:00
miterosan
b1e9a4fd24 Merge branch 'master' of https://github.com/ppy/osu into Private_Messages 2018-07-29 23:28:34 +02:00
miterosan
8c0bcb8e3c Fix drawable crash and lload the inital messages of newly joined channels 2018-07-29 21:40:43 +02:00
miterosan
95cb21299a Remove chatTabControl and transfer the logic into ChannelTabControl. 2018-07-29 21:18:37 +02:00
Dean Herbert
b7de922896
Merge branch 'master' into open-downloaded-beatmas 2018-07-28 12:44:34 +09:00
HoutarouOreki
fba817b4e1 Resign ChangelogChart and disable its references 2018-07-27 00:34:44 +02:00
HoutarouOreki
46134ed63d Add "ok" chart plotting; Add more keys to StreamColour .FromStreamName function 2018-07-26 23:53:12 +02:00
HoutarouOreki
516ba10dad Plotting the chart 2 2018-07-26 17:26:42 +02:00
HoutarouOreki
2d8277f413 Plotting the chart 1 2018-07-26 17:02:51 +02:00
HoutarouOreki
a8b0e23ed6 Merge remote-tracking branch 'upstream/master' into changelog-overlay 2018-07-26 15:41:33 +02:00
smoogipoo
464333cf0b Merge remote-tracking branch 'origin/master' 2018-07-26 21:28:31 +09:00
HoutarouOreki
0f263e2cca Delete ClickableText class, use OsuHoverContainer instead 2018-07-26 14:19:58 +02:00
HoutarouOreki
a2959e9171 Remove default value without use 2018-07-26 13:43:47 +02:00
HoutarouOreki
81786c4763 Move statement to a new line 2018-07-25 20:01:24 +02:00
HoutarouOreki
fb8ea770ae Make ChangelogChart's child buffered 2018-07-25 18:55:02 +02:00
HoutarouOreki
dcb5eb1767 Remove reduntant comment 2018-07-25 17:05:29 +02:00
HoutarouOreki
3e6968b57e Unify MarginPadding 2018-07-25 17:04:36 +02:00
HoutarouOreki
a7a6e52c16 Bring StreamBadge visual proportions closer to the upstream design 2018-07-25 14:58:18 +02:00
HoutarouOreki
2906f4b401 Change initial chart colour 2018-07-25 14:31:41 +02:00
Dean Herbert
95cca046fb Merge branch 'master' into open-downloaded-beatmas 2018-07-25 12:38:49 +02:00
HoutarouOreki
c8f36a0c66 Add links to GitHub; Remove reduntant using directive and variable 2018-07-25 03:58:08 +02:00
HoutarouOreki
05a59f3525 Add links to GitHub 2018-07-25 03:54:16 +02:00
HoutarouOreki
cd79c2cc45 Hide graph when it's unavailable; Scroll change 2018-07-25 00:59:21 +02:00
HoutarouOreki
a00f4e8178 Make Back action go to the top of listing before exiting the changelog screen 2018-07-25 00:12:05 +02:00
HoutarouOreki
d2b2c4c19b Make PR-link surrounding parenthesis white 2018-07-24 23:25:57 +02:00
HoutarouOreki
74540bba83 Non-breaking space for "by ..." 
Doesn't work for now(?)
 2018-07-24 21:59:09 +02:00
HoutarouOreki
43a7b3a825 Fetch listing only once; Reenable disabled links as they wont be regenerated 2018-07-24 21:42:25 +02:00
HoutarouOreki
08a291f0d4 Improve scroll handling 2018-07-24 21:19:29 +02:00
HoutarouOreki
8e412fe403 Add scrolling to the previous position when on "Back" 2018-07-24 20:57:09 +02:00
HoutarouOreki
dfe4153c95 Prevent duplicated fetching for listing and builds: 
- listing when already at it;
- builds by immediately disabling links to them (chevrons and links in listing)
 2018-07-24 19:34:40 +02:00
HoutarouOreki
16d3ca2073 Move breadcrumb to the right position 2018-07-24 19:01:24 +02:00
HoutarouOreki
255c252f6a Shorten MarginPaddings in ChangelogContentGroup 2018-07-24 18:47:05 +02:00
HoutarouOreki
175c20a104 Slight reorder 2018-07-24 18:41:47 +02:00
Dean Herbert
da730269a9 Formatting and ctor usage for required parameters 2018-07-24 15:25:47 +02:00
Dean Herbert
53f556de9a Trim whitespace 2018-07-24 15:10:55 +02:00
Dean Herbert
5364a6148a Use ToUpperInvariant 2018-07-24 14:42:06 +02:00
Dean Herbert
ab9340f4be Fix usage of culture local ToUpper causing incorrect display on Turkish machines 
Closes #3098.
 2018-07-24 11:37:43 +02:00
miterosan
42df0c974f Rename UserChannel to private channel. 2018-07-24 05:17:57 +02:00
miterosan
9bc225e14b rename user to private 2018-07-24 05:14:47 +02:00
miterosan
e769c15d28 Provide XML doc in Channel.cs and ChannelManager.cs and ChatTabControl.cs 2018-07-24 05:14:33 +02:00
miterosan
3df1842e1c Fix that in some timing specific cases the fetched channels are not getting an visual representation. 
Sadly there is not a nice way of fixing this.
 2018-07-24 04:58:40 +02:00
miterosan
55f0cbf63e Finding peace with the UI thread. 
There is the issue that in some cases that the ui thread blocked.
 2018-07-24 04:56:34 +02:00
HoutarouOreki
24bb44a152 Add TextBadgePair test case 2018-07-24 04:04:18 +02:00
HoutarouOreki
9e9d7a855d Remove reduntant .base and .this 2018-07-24 04:03:56 +02:00
HoutarouOreki
9a84747fe6 Fix reversed if/else statement causing inproper behavior for badges 2018-07-23 23:24:34 +02:00
HoutarouOreki
054f578bc8 Update few links not working; Reasses sample playing; Slight renames 2018-07-23 23:15:14 +02:00
HoutarouOreki
7c6be4a075 Handle around an APIChangelog instead of just Name and Version: 
Makes showing up the header immediately possible
 2018-07-23 21:38:14 +02:00
HoutarouOreki
6cd6ca432c Fix links not working due to rewrite regression 2018-07-23 20:36:24 +02:00
HoutarouOreki
f526d66969 Fix showing builds 2018-07-23 19:40:58 +02:00
HoutarouOreki
f685c5ba58 Fix typos; remove outdated comments; minor order changes 2018-07-23 18:38:20 +02:00
HoutarouOreki
554c56d51f Change order in TextBadgePair.cs 2018-07-23 18:17:50 +02:00
HoutarouOreki
e27292fef8 Rewrite LineBadge.cs 
+ update all its references
 2018-07-23 17:49:42 +02:00
miterosan
2726d91594 Remove unessary usings 2018-07-23 16:05:39 +02:00
miterosan
344ec40a27 Readd usings I removed with my merge 2018-07-23 15:48:48 +02:00
miterosan
9f43e0c900 Merge branch 'master' of https://github.com/ppy/osu into Private_Messages 
# Conflicts:
#	osu.Game/Overlays/Chat/ChatTabControl.cs
#	osu.Game/Overlays/ChatOverlay.cs
 2018-07-23 15:45:54 +02:00
HoutarouOreki
4cc5a657f3 Follow up framework changes 2018-07-23 10:05:19 +02:00
Jarosław Zgierski
f26c2f6123
Merge branch 'master' into changelog-overlay 2018-07-23 09:47:04 +02:00
HoutarouOreki
391da47881 Refactor the rewrite 2018-07-22 22:31:24 +02:00
HoutarouOreki
51eec0dca4 Further rewrite 2018-07-22 22:13:14 +02:00
HoutarouOreki
61a8b98d32 Rewrite improvements 2018-07-22 20:27:50 +02:00
HoutarouOreki
6683d4cabe Add event handling in content groups 2018-07-22 20:14:58 +02:00
HoutarouOreki
eca6265186 Rewrite ChangelogContent.cs 2018-07-22 20:14:28 +02:00
HoutarouOreki
a8bbcca0e0 Rewrite ChangelogBadges 2018-07-22 19:51:31 +02:00
HoutarouOreki
797abd558f Rewrite ChangelogHeader.cs 2018-07-22 18:44:45 +02:00
HoutarouOreki
b3f789e19a Rewrite ChangelogOverlay.cs 2018-07-22 18:35:29 +02:00
HoutarouOreki
2b7f657f2c Place HTML messages in a TextFlowContainer 
Add missing accessibility modifier in ClickableText test case and fix disposal
 2018-07-22 14:44:11 +02:00
HoutarouOreki
59cbc58edd Show changelog by default 2018-07-22 13:04:39 +02:00
HoutarouOreki
50b6f88a4e Merge branch 'changelog-overlay' of https://github.com/HoutarouOreki/osu into changelog-overlay 2018-07-22 10:58:47 +02:00
Jarosław Zgierski
44bdd0dbb6
Merge branch 'master' into changelog-overlay 2018-07-22 10:57:30 +02:00
HoutarouOreki
8de65066dd Use shorter expression 2018-07-22 10:28:53 +02:00
HoutarouOreki
c5bdfb8857 Use ClickableText for navigating to builds; Fix typo 2018-07-22 05:34:55 +02:00
HoutarouOreki
80808bddbf Add changelog listing 2018-07-22 05:28:43 +02:00
HoutarouOreki
8e7efafba3 Lower height of the cover image, Adjust height of the purple line 2018-07-21 23:10:42 +02:00
HoutarouOreki
8f43b883b1 Set the right colour for background 2018-07-21 23:00:05 +02:00
HoutarouOreki
b5207d65f7 Show listing graph; Slight refactor 2018-07-21 10:05:12 +02:00
HoutarouOreki
ba0430752c Check wether a chart is populated; Fixes to graph's colour setting 2018-07-21 09:45:14 +02:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
HoutarouOreki
78f0f37ee6 Change graph's colour on stream selection 2018-07-21 07:16:22 +02:00
HoutarouOreki
eca5fb6f05 Introduce better formatting to changelog entries; Sort by category 2018-07-21 06:38:02 +02:00
HoutarouOreki
50c4f6ff95 Prevent scrolling to top on build change; Add bottom margin 2018-07-21 06:37:42 +02:00
HoutarouOreki
ce0029eabf Make build's creation date not nullable 2018-07-21 03:19:30 +02:00
HoutarouOreki
1492d5cb29 Improve primitive changelog entry formatting 2018-07-21 02:58:53 +02:00
HoutarouOreki
8d4de68c39 Nullables in APIChangelog; Primitive changelog entries display 2018-07-20 23:57:46 +02:00
HoutarouOreki
3115464238 Remove unnecessary statement; Uncapitalize private member; 2018-07-20 22:16:16 +02:00
HoutarouOreki
c9f3e72b7a Unify build div's dimming mechanics with osu-web 2018-07-20 22:13:10 +02:00
HoutarouOreki
709872d688 Improve showing up builds 2018-07-20 22:11:51 +02:00
HoutarouOreki
835a813715 Improvements to TooltipIconButton 
Disable sounds when disabled; Remove default tooltip texts
 2018-07-20 19:35:38 +02:00
HoutarouOreki
b049ffa11d Improve fake-api 2018-07-20 18:23:25 +02:00
HoutarouOreki
c50c946b35 Make chevrons updateable 2018-07-20 17:24:21 +02:00
HoutarouOreki
02a8fb2154 Update comments; Improve neighboring builds handling; 
Apply fixes to things pointed out by AppVeyor
 2018-07-20 15:48:20 +02:00
HoutarouOreki
227394925a Add neighboring builds handling; 
+ provoke angry AppVeyor
 2018-07-20 13:51:31 +02:00
HoutarouOreki
c7669b2128 Add build-scoped requests; 
Add OnClick to TooltipIconButton; Actions on pressing previous/next in builds
 2018-07-20 12:22:31 +02:00
HoutarouOreki
a857999950 Refactor3 2018-07-20 00:52:50 +02:00
HoutarouOreki
a9299423cd Refactor2 2018-07-19 21:49:13 +02:00
HoutarouOreki
bcd132e87f API1 2018-07-19 19:07:24 +02:00
HoutarouOreki
11e0732a27 Refactor1, UX1 2018-07-18 19:32:15 +02:00
HoutarouOreki
837747e35f Streams3 2018-07-18 15:17:20 +02:00
Dean Herbert
5fe634a3b6 Click download button to load beatmap 2018-07-18 13:18:50 +09:00
HoutarouOreki
6baa761b9c Streams2 2018-07-18 03:26:08 +02:00
HoutarouOreki
523d47e815 Streams1 2018-07-18 01:35:06 +02:00
HoutarouOreki
3c1e445fdf Header3 2018-07-17 18:32:11 +02:00
HoutarouOreki
b4bb97fba8 Header2 2018-07-17 15:01:53 +02:00
Dean Herbert
aa2f2f3e94
Merge pull request #3034 from peppy/reduce-panel-width 
Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions
 2018-07-17 19:14:48 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if 2018-07-17 16:44:57 +09:00
Dean Herbert
97e71245e9
Merge branch 'master' into reduce-panel-width 2018-07-17 16:36:05 +09:00
Dean Herbert
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
Dan Balasescu
745d596343
Merge branch 'master' into fix-incorrect-mods 2018-07-17 13:41:02 +09:00
HoutarouOreki
be977e2541 Header1 2018-07-16 23:50:22 +02:00
Dean Herbert
4f1b7c8065
Merge branch 'master' into reduce-panel-width 2018-07-17 04:20:40 +09:00
Dean Herbert
84c13174d9
Merge branch 'master' into use-has-flags 2018-07-17 03:50:40 +09:00
Dean Herbert
dbc538abbe Use Enum.HasFlag 
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
 2018-07-16 16:18:46 +09:00
Dean Herbert
a117b323e2
Merge branch 'master' into make-notifications-quieter 2018-07-16 13:15:07 +09:00
Dean Herbert
a12c47536b Change default to being important 2018-07-16 13:00:21 +09:00
Dean Herbert
4829f4f09c
Merge branch 'master' into download-button-state 2018-07-16 03:17:26 +09:00
Dean Herbert
730eb2daa2 Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions 2018-07-14 03:47:56 +09:00
Dean Herbert
81e5a37d6d Enlist a few more important notifications 2018-07-14 03:31:19 +09:00
Dean Herbert
e0bcd6988a
Merge branch 'master' into lesserSideKeys 2018-07-13 23:32:44 +09:00
Dean Herbert
d63611a9b3
Merge branch 'master' into fix-incorrect-mods 2018-07-13 22:08:21 +09:00
Dean Herbert
6698f320fb
Merge branch 'master' into download-button-state 2018-07-13 22:05:26 +09:00
Dean Herbert
ac4f25c5bc Make notifications less noisy 2018-07-13 21:25:08 +09:00
Dean Herbert
fc3aff6689 Fix initial colour 2018-07-13 21:19:10 +09:00
Dan Balasescu
3d136ef0f9
Merge branch 'master' into fix-ugly-line 2018-07-13 18:08:55 +09:00
Dean Herbert
ee2c7c50ad Tidy up button hierarchy 2018-07-13 16:28:18 +09:00
Dean Herbert
0676919496 Fix incorrect corner radius 2018-07-13 14:56:44 +09:00
Dean Herbert
09be9c2ed2 Merge remote-tracking branch 'upstream/master' into naoey-download-button-state 2018-07-13 14:52:10 +09:00
Dean Herbert
ac078153ae Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods 2018-07-13 14:20:56 +09:00
Dean Herbert
20b805f9eb
Merge branch 'master' into fix-key-binding-row 2018-07-12 20:06:47 +09:00
Dean Herbert
24054246b8 Fix DI regression 2018-07-11 17:54:01 +09:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
ekrctb
55e0cd770d Use BypassAutoSizeAxes 2018-07-11 11:24:43 +09:00
Roman Kapustin
8f9bf4bd3e Remove redundant DesktopGameWindow cast 2018-07-10 22:07:32 +03:00
HoutarouOreki
dd20663192 Lesser keyboard steps 2018-07-10 17:28:56 +02:00
smoogipoo
bf1ce8cdd8 Fix linking still being broken 2018-07-10 16:02:13 +09:00
smoogipoo
0f649cd231 Merge remote-tracking branch 'origin/master' into fix-beatmap-links 2018-07-10 16:01:56 +09:00
Dean Herbert
7f315d79c2 Fix pixel gap in user profile when scrolling 2018-07-10 13:06:03 +09:00
miterosan
d03367ef9e Fix the start animations of username and the closeButton 2018-07-09 23:12:41 +02:00
miterosan
9f9444d65a Uppercase shear... wtf 2018-07-09 22:59:29 +02:00
miterosan
73a87914f2 Rename uppcase shear width to lowercase shearwidth 2018-07-09 22:52:14 +02:00
miterosan
ad96338af7 Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages 2018-07-09 22:47:34 +02:00
miterosan
ea597916ca Code cleanups 2018-07-09 22:41:53 +02:00
miterosan
ae093d2619
Merge branch 'master' into Private_Messages 2018-07-09 22:15:36 +02:00
miterosan
72ea3128fa Use the AT (@) symbol for the background 2018-07-09 22:14:47 +02:00
miterosan
290b6e5f1d Fix the crash in the visual testcase 2018-07-09 22:09:27 +02:00
Roman Kapustin
699702f8d0 Use DesktopGameWindow.GetCurrentDisplay method 2018-07-09 21:57:31 +03:00
miterosan
f681ef41ac Rename MAX_HISTORY to MaxHistory, added some logging on failures, use a lamda in ChatOverlay instead of a method pointer. 2018-07-09 20:39:16 +02:00
Roman Kapustin
3dbdfcc1e2 Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode 2018-07-09 21:31:46 +03:00
miterosan
d4f9bcdee1 Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages 2018-07-09 20:14:16 +02:00
miterosan
f22f62ef40 Rename the currentChatChanged to currentChannelContainer, move drawing specific part into from chatoverlay to ChannelSelectionOverlay 2018-07-09 20:13:34 +02:00
miterosan
0c62726fd7 Rename UserTabItem to UserChannelTabItem 2018-07-09 19:48:05 +02:00
miterosan
1589b65494 Move tab related stuff to /tabs, move selection related stuff to /selection, remove channeltabcontrol 2018-07-09 19:42:57 +02:00
miterosan
66378d5847 Remove the highlight from "Start Chat" 2018-07-09 18:58:10 +02:00
miterosan
5e95995429 Rename chat to channel 2018-07-09 18:30:41 +02:00
miterosan
709d134f49 Rename DrawableChat to DrawableChannel 2018-07-09 18:23:40 +02:00
Dean Herbert
974c4f5185 ToolbarMode* -> ToolbarRuleset* 2018-07-10 01:20:21 +09:00
Dean Herbert
1670f4fe31
Merge branch 'master' into fix-osd-fade-in 2018-07-09 19:10:57 +09:00
Dean Herbert
df67c0498d Fix OSD fade-in not correctly debouncing 
It could potentially never fade in on quick presses.
 2018-07-09 17:53:39 +09:00
HoutarouOreki
930667d0f9 Remove unused age display code 2018-07-09 10:12:10 +02:00
miterosan
c56a4ea893
Merge branch 'master' into Private_Messages 2018-07-08 19:29:33 +02:00
Dean Herbert
91777b04d8
Merge branch 'master' into download-button-state 2018-07-08 14:15:47 +09:00
Dan Balasescu
8f3f872182
Merge branch 'master' into go-forward 2018-07-06 14:29:26 +09:00
Dean Herbert
e5001b84bd Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter 2018-07-05 21:04:19 +09:00
Dean Herbert
625b9ead4c Fix links from profile top scores to beatmaps not working correctly 2018-07-05 21:00:23 +09:00
ekrctb
bbceac6cda Apply renaming of wheel -> scroll 2018-07-05 16:50:04 +09:00
Dean Herbert
e28a610757 Fix mods not correctly resetting when changing ruleset at song select 2018-07-05 13:22:52 +09:00
Jacob Odgård Tørring
2979cb96a6 attemptSeek accesses beatmap Disabled directly 2018-07-04 21:09:28 +02:00
Jacob Odgård Tørring
9248340df8
Merge branch 'master' into master 2018-07-04 20:51:05 +02:00
naoey
6ea6a10def Reduce size of download button in list view to fit hover effect 2018-07-03 20:26:49 +05:30
naoey
2a0b1f3615 Update direct panel download button for new design 
- Add a download failed event to BeatmapManager
- Make DownloadButton aware of all 3 possible download states
- Change button appearance based on each state
 2018-07-03 20:18:09 +05:30
Dean Herbert
5fc17bacf3 Add "Select" action 
Allows progressing forwards in the interface
 2018-07-03 18:39:15 +09:00
Dean Herbert
b33206c212 Fix selecting a button on a dialog causing both that button and exit to animate 2018-07-03 18:35:09 +09:00
miterosan
d791216505
Merge branch 'master' into Private_Messages 2018-07-03 07:58:15 +02:00
Dean Herbert
6c848f135c Add comment about last button invocation 2018-07-02 17:48:16 +09:00
Dan Balasescu
e99c05c85e
Merge branch 'master' into fix-dialog-popups 2018-07-02 17:41:16 +09:00
smoogipoo
9f405b0894 Don't hard-bail if config skin doesn't exist anymore 2018-07-02 16:49:07 +09:00
smoogipoo
b61fe10f62 Adapt to IBindables 2018-07-02 15:07:18 +09:00
smoogipoo
4070c1a888 Merge remote-tracking branch 'origin/master' into non-null-ruleset 
# Conflicts:
#	osu.Game/Screens/Select/FilterControl.cs
 2018-07-02 15:05:34 +09:00
Dean Herbert
596787c941 Standardise input handling of popup dialogs 2018-07-02 14:25:12 +09:00
Roman Kapustin
4af45b7518 Do not display resolutions lower than 800x600 2018-06-30 20:06:11 +03:00
miterosan
621f4218a3
Merge branch 'master' into Private_Messages 2018-06-30 16:17:56 +02:00
Roman Kapustin
101f18821a Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode 2018-06-30 17:05:25 +03:00
Dean Herbert
b9b1e77172
Merge branch 'master' into allow-back-in-player 2018-06-29 21:54:18 +09:00
Dean Herbert
6a80a21078 Tidy up escape handling 2018-06-29 21:06:38 +09:00
Dean Herbert
9fce4eaccf
Merge branch 'master' into di-backed-ruleset 2018-06-29 19:33:12 +09:00
Dan Balasescu
513129d4a8
Merge branch 'master' into fix-dialog-overlay-sounds 2018-06-29 18:45:37 +09:00
miterosan
884ac71874
Merge branch 'master' into Private_Messages 2018-06-28 21:04:02 +02:00
Dean Herbert
8ba2ac922f Move to local components namespace 2018-06-28 19:23:56 +09:00
Dean Herbert
98fec94693 Merge remote-tracking branch 'upstream/master' into HoutarouOreki-unifyDates 2018-06-28 19:14:47 +09:00
Joehu
8518fce4a9 Fix osu!supporter naming 2018-06-27 17:57:55 -07:00
ekrctb
1ed6a672f2 Update volme control 
Use IMouseWheelBindingHandler for volume VolumeControlReceptor.
VolumeMeter is no longer an IKeyBindingHandler because it is unused.
 2018-06-27 18:43:29 +09:00
smoogipoo
ede59f63f6 Merge remote-tracking branch 'origin/master' into make-loading-more-visible 2018-06-27 12:52:06 +09:00
Dean Herbert
bebf47d0d5
Merge branch 'master' into fix-dialog-overlay-sounds 2018-06-27 12:21:29 +09:00
smoogipoo
8a81fba1ea Other input states need to be considered for wheel bindings 2018-06-26 20:34:22 +09:00
Dean Herbert
4bcc05a7fc Remove null checks on ruleset 
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
 2018-06-26 18:24:34 +09:00
Dean Herbert
4dd12cedad Fix review issues 2018-06-26 17:01:40 +09:00
Dean Herbert
b0a1b25983 Privatise game ruleset and access via DI 
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
 2018-06-26 16:32:32 +09:00
Dean Herbert
563cb46b4a Update framework and other nuget dependencies 2018-06-26 12:10:56 +09:00
miterosan
6049303c40
Merge branch 'master' into Private_Messages 2018-06-23 20:44:43 +02:00
Roman Kapustin
5076fe4c20 LayoutSettings: inject OsuGameBase instead of OsuGame 2018-06-23 12:45:13 +03:00
Dean Herbert
51600dd0ae Improve PlayButton's loading 2018-06-22 14:27:36 +09:00
smoogipoo
8d3c2d54f3 Merge remote-tracking branch 'origin/master' into improve-volume-controls 2018-06-22 13:33:07 +09:00
smoogipoo
67a067ffa5 Fix overlay not disappearing when losing hover from the last pixel 
OnMouseMove isn't invoked when hover is lost.
 2018-06-22 13:32:32 +09:00
smoogipoo
72aee8344e Always call schedulePopOut 2018-06-22 13:32:00 +09:00
smoogipoo
206f913a4c Make mute button not handle hover 2018-06-22 13:31:32 +09:00
Dean Herbert
73e13e2d63 Rename Stop to StopAnyPlaying for clarity 2018-06-22 12:35:43 +09:00
Dean Herbert
4b2b1f51f9 Apply some code review 2018-06-22 12:33:30 +09:00
Dean Herbert
de10480e95
Merge branch 'master' into multiple_previews_different_overlays 2018-06-22 10:44:36 +09:00
Roman Kapustin
5d26d5d4ed Fix resolutionDropdown 2018-06-21 20:42:22 +03:00
Roman Kapustin
2ecf78e3d2 Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode 2018-06-21 19:44:29 +03:00
smoogipoo
40ed3fdd05 Fix possible incorrect order of events due to threaded load 2018-06-21 18:45:32 +09:00
smoogipoo
b2066c5d73 Rework preview tracks to reduce usage complexities 2018-06-21 18:40:27 +09:00
Dean Herbert
a2fa55c426 Fix dialog overlay playing double samples on show/hide 2018-06-21 16:47:05 +09:00
Dean Herbert
ed17a241f5 Decrease notification font size 2018-06-21 14:43:02 +09:00
smoogipoo
ab2889da1f Merge remote-tracking branch 'origin/master' into multiple_previews_different_overlays 2018-06-21 13:24:02 +09:00
Dean Herbert
65487d1610
Merge branch 'master' into improve-volume-controls 2018-06-21 11:56:56 +09:00
Dean Herbert
285062d93e
Merge branch 'master' into master 2018-06-21 11:40:37 +09:00
Dean Herbert
5157a069bc
Merge branch 'master' into Private_Messages 2018-06-21 11:37:19 +09:00
Dean Herbert
ee0950a845
Merge branch 'master' into select_resolution_in_fullscreen_mode 2018-06-20 13:19:39 +09:00
Dean Herbert
d7f65d62e0 Use vertical/horizontal pair instead 2018-06-20 10:45:35 +09:00
Michael Manis
a0f1143287 Add padding to 'show more' button 2018-06-18 19:14:44 -04:00
Dean Herbert
c74c059044
Merge branch 'master' into multiple_previews_different_overlays 2018-06-18 05:05:27 +09:00
miterosan
cd0fe6a09e Merge branch 'master' of https://github.com/ppy/osu into Private_Messages 
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseChatLink.cs
 2018-06-17 14:15:14 +02:00
HoutarouOreki
faff7feef1 Remove unnecessary white space change 2018-06-15 15:03:09 +02:00
HoutarouOreki
6938adc148 Unify join time text's visual format with the web 2018-06-15 15:00:41 +02:00
HoutarouOreki
d122547c1e DrawableJoinDate handles "Here since the beginning" text 2018-06-15 14:28:49 +02:00
Dean Herbert
db9141a6cf
Merge branch 'master' into fix-music-controller-drag 2018-06-15 17:08:01 +09:00
Dean Herbert
8b5a9c3236
Merge branch 'master' into fix-volume-pixellation 2018-06-15 16:45:15 +09:00
Dean Herbert
1c27ef644a Fix music controller drag activating from anywhere on the screen 2018-06-15 16:12:11 +09:00
Joehu
069d939e29 Remove "from" prefix from sources on direct panels 2018-06-14 21:53:01 -07:00
Dean Herbert
b318b770d4 Fix pixellation of volume meter progress bars 2018-06-13 19:22:39 +09:00
Dean Herbert
cee5be1d56 Improve precision wheel adjustment handling 2018-06-13 17:03:56 +09:00
Dean Herbert
e0b68e4e09 Fix hide re-schedule not triggering on noop state change 2018-06-13 16:47:10 +09:00
Dean Herbert
a55bf82fd9 Handle hover blocking in VolumeOverlay to ensure correct hide scheduling 2018-06-13 16:46:56 +09:00
Dean Herbert
2a18625b2c Correctly block scroll events when hovering controls 2018-06-13 16:46:27 +09:00
Dean Herbert
2cc7953421 Merge remote-tracking branch 'upstream/master' into peppy-improve-volume-controls 2018-06-13 16:14:20 +09:00
Roman Kapustin
71371dc4b8 ValueChanged parameters quickfix 2018-06-12 19:27:55 +03:00
UselessToucan
b6c0aa3f26
Merge branch 'master' into select_resolution_in_fullscreen_mode 2018-06-12 18:01:30 +03:00
Dan Balasescu
126678c226
Merge branch 'master' into multiple_previews_different_overlays 2018-06-12 19:26:51 +09:00
Dan Balasescu
80ec0b1839
Merge branch 'master' into populate-missing-online-ids 2018-06-12 14:03:23 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
Dan Balasescu
0a35a81c2d
Merge branch 'master' into populate-missing-online-ids 2018-06-12 13:11:21 +09:00
Dan Balasescu
41452a0754
Merge branch 'master' into multiple_previews_different_overlays 2018-06-11 18:56:50 +09:00
Dan Balasescu
7de8e1cfc4
Merge branch 'master' into refactor-api 2018-06-11 18:49:15 +09:00
Dan Balasescu
78daf1c7ad
Merge branch 'master' into exponential-scoring-toggle 2018-06-11 18:19:33 +09:00
smoogipoo
14b7530994 Use a global ruleset config cache 2018-06-11 15:07:42 +09:00
smoogipoo
f4fbf27d42 Give ruleset settings a ruleset-specific config manager 2018-06-11 13:28:50 +09:00
Roman Kapustin
de7e4328c5 Use bindable size 2018-06-10 16:17:57 +03:00
UselessToucan
4233211fb3
Merge branch 'master' into select_resolution_in_fullscreen_mode 2018-06-08 21:13:41 +03:00
Roman Kapustin
8702a70524 Resolve merge conflicts in DirectOverlay 2018-06-08 21:03:16 +03:00
Dean Herbert
a880e626d8 Use for loop and SetLayoutPosition 2018-06-08 21:20:15 +09:00
Dean Herbert
1e7bffe5e3
Merge branch 'master' into badge-ordering 2018-06-08 21:13:35 +09:00
Dean Herbert
803598c3d0 Merge remote-tracking branch 'upstream/master' into DrabWeb-beatmap-set-downloader 2018-06-08 20:54:14 +09:00
Dean Herbert
59e5a8556f Fix volume control adjustment being extreme when precision scrolling 2018-06-08 18:15:03 +09:00
Dean Herbert
66d28aa9fc
Merge branch 'master' into beatmap-set-downloader 2018-06-08 16:28:25 +09:00
Dean Herbert
955a78e76d Remove OnlineBeatmapSetID from BeatmapInfo 
It should now be retrieved via the linked BeatmapSetInfo
 2018-06-08 15:26:27 +09:00
Dean Herbert
8cc31aca54 Reorganise API requests and response classes 
They were previously breaking the two-class-per-file rule.
 2018-06-08 11:42:35 +09:00
DrabWeb
0fae49ee21 Don't add a 'with Video' subtitle. 2018-06-07 20:47:27 -03:00
Dean Herbert
0b4f5af52e Add setting to toggle standardised or exponential scoring display 
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
 2018-06-08 03:17:12 +09:00
Roman Kapustin
1fdbd20471 Nullref quickfix in PlayButton 2018-06-07 14:50:21 +03:00
Roman Kapustin
ab6699b1fb Stop DirectOverlay preview on search update 2018-06-07 14:40:41 +03:00
Roman Kapustin
3033294df1 Stop Preview on BeatmapSet change 2018-06-07 14:30:11 +03:00
Dean Herbert
475fb06559 Use new bind method 2018-06-07 16:46:54 +09:00
Dean Herbert
17ba129e61 Make volume controls stay open when hovered 
Closes #2743.
 2018-06-07 01:14:43 +09:00
Dean Herbert
dd75cd973b Show UI mouse cursor when hovering volume meters during gameplay 
Also adds a hover animation.
 2018-06-07 01:13:35 +09:00
Dean Herbert
621be3bbfc Merge branch 'master' into disallow-beatmap-change 2018-06-07 00:38:40 +09:00
Dean Herbert
ea1336d243 Merge remote-tracking branch 'upstream/master' into nuget-consumption 2018-06-06 21:09:51 +09:00
Dean Herbert
2e23da1dfa
Merge branch 'master' into beatmap-set-downloader 2018-06-06 20:32:58 +09:00
Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change 2018-06-06 20:26:17 +09:00
smoogipoo
ff60f69f47 Explicitly construct local beatmaps rather than using GetBoundCopy 2018-06-06 20:19:30 +09:00
smoogipoo
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
Dean Herbert
a645a109be
Merge branch 'master' into overlay-activation 2018-06-06 19:18:28 +09:00
Dean Herbert
0a97b8ae25 Implement DebugUtils locally 
Has been removed from framework
 2018-06-06 18:33:10 +09:00
smoogipoo
4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change 
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
 2018-06-06 18:26:51 +09:00
Aergwyn
aaaa8a3b7c match Bindable names 2018-06-06 09:55:16 +02:00
Dean Herbert
9e25e02696 Ensure notifications don't appear during UserTriggered mode 
Closes #2640.
 2018-06-06 15:50:24 +09:00
Dean Herbert
d1fd09ed47 Rename variables 2018-06-06 15:49:27 +09:00
DrabWeb
188272e15d Replace OnAlreadyDownloading with returning a bool from Download. 2018-06-06 03:18:42 -03:00
DrabWeb
df4c855aa2 Manage subtitle inside of DownloadButton. 2018-06-06 03:13:37 -03:00
Dean Herbert
86be1bef6b Use UserTriggered in Player 2018-06-06 15:10:15 +09:00
Dean Herbert
1dd5bdcf72 Move setting to new "mods" section 2018-06-06 12:32:59 +09:00
Dean Herbert
ee92986494
Merge branch 'master' into osu-hd-setting 2018-06-06 12:09:12 +09:00
Dean Herbert
6be382aab6 Merge branch 'master' into overlay-activation 2018-06-06 10:07:22 +09:00
Dean Herbert
00c8d2ff11
Merge branch 'master' into source-link-colour 2018-06-06 08:27:28 +09:00
DrabWeb
4cf7a64636 Remove unused parameter. 2018-06-04 22:26:52 -03:00
DrabWeb
61e1358410 Add OnAlreadyDownloading animations. 2018-06-04 21:07:17 -03:00
DrabWeb
c524289b24 Update DirectListPanel to properly handle hiding DownloadButton. 2018-06-04 21:01:15 -03:00
DrabWeb
01c5060bcf Move BeatmapSetDownloader to osu.Game.Beatmaps.Drawables 2018-06-04 20:30:54 -03:00
DrabWeb
9377ffb784 Update BeatmapSetOverlay to use BeatmapSetDownloader. 2018-06-04 20:27:34 -03:00
DrabWeb
698a42f145 BeatmapSetDownloadButton -> BeatmapSetDownloader 
Allows it to integrate better with existing buttons, like HeaderButton.
 2018-06-04 20:12:43 -03:00
DrabWeb
416384956d Use a protected Downloaded bindable instead of abstract methods. 2018-06-04 06:47:39 -03:00
DrabWeb
b332c22fe5 Update DirectPanel to use BeatmapSetDownloadButton. 2018-06-04 06:29:35 -03:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
Joehu
7101533926 Remove 'description' field 2018-06-03 08:02:57 -07:00
Joehu
5c713ac2ab Use default colour in MetadataSection 2018-06-03 07:51:57 -07:00
Aergwyn
f0095193b3 Merge branch 'master' into overlay-activation 2018-06-03 11:52:33 +02: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
Roman Kapustin
9b69e1825d Make PreviewTrack.owner private 2018-06-02 22:06:45 +03:00
Joehu
dc2a004c87 Remove link colours for all unlinked text 2018-06-02 12:04:58 -07:00
Dean Herbert
64eda27547 Update framework 2018-06-03 03:05:53 +09:00
Roman Kapustin
e98f9f1323 Add dropdown for selecting fullscreen resolution 2018-06-02 21:02:45 +03:00
Roman Kapustin
5bb6757cbd Remove unused previewTrackManager parameter 2018-06-02 13:03:17 +03:00
Roman Kapustin
70120aa14c Remove unused previewTrackManager variable 2018-06-02 12:28:16 +03:00
Roman Kapustin
330ce19041 Make PreviewTrack a component and use LoadComponentAsync 2018-06-01 23:36:25 +03:00
Roman Kapustin
88ac427ba6 PreviewTrack.Owner 2018-06-01 21:06:37 +03:00
Dean Herbert
9b7741b353 Avoid using update for fading logic 2018-06-01 22:19:11 +09:00
Dean Herbert
ae6f603d16
Merge branch 'master' into match-panel-with-web 2018-06-01 21:31:18 +09:00
Dean Herbert
8bde1fd327
Merge branch 'master' into updateable-beatmap-set-cover 2018-06-01 15:20:59 +09:00
Joehu
729f2ec725 Match authorinfo with web 2018-05-31 14:34:47 -07:00
Joehu
b4d621a2cb Add link colour to beatmap source 2018-05-31 10:21:22 -07:00
Joehu
1095669a55 Match panel with web 2018-05-31 08:09:19 -07:00
DrabWeb
6781b81336 Cleanup. 2018-05-31 05:48:42 -03:00
Dean Herbert
42bc6b6b2e
Merge branch 'master' into updateable-beatmap-set-cover 2018-05-31 17:33:31 +09:00
Dean Herbert
49a683e386 Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages 2018-05-31 14:50:20 +09:00
Dean Herbert
0f6c623ebb Tidy up some unnecessary lines 2018-05-31 12:44:59 +09:00
Dean Herbert
205aa1a3cd Fetch colour from OsuColour palette 2018-05-31 12:44:11 +09:00
Dean Herbert
319faf12f7 Fix incorrect naming of label 2018-05-31 12:39:56 +09:00
Dean Herbert
2f21b9c4ea Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits 2018-05-31 12:36:37 +09:00
DrabWeb
bdfb5752cd Update existing drawables to use UpdateableBeatmapSetCover. 2018-05-28 19:31:20 -03: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
bcdbd97da9
Merge branch 'master' into fix-playlist-pause 2018-05-27 11:00:50 +09:00
Roman Kapustin
572c3f5189 Stop preview playback when an overlay is popping out 2018-05-25 23:51:05 +03:00
Roman Kapustin
a24589f583 Cleanup external PlayButton.Playing usage 2018-05-25 22:35:15 +03:00
HoutarouOreki
3efb51e464 Create Format(), override TooltipText.. 2018-05-25 14:00:32 +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
Dean Herbert
1b5bb79fe9 Merge remote-tracking branch 'upstream/master' into jorolf-open-external 2018-05-25 18:50:30 +09:00
Dean Herbert
568d4882c6
Remove unnecessary null coalesce 2018-05-25 11:00:56 +09:00
Roman Kapustin
498244a308 Introduce PreviewTrack class 2018-05-25 00:37:53 +03:00
UselessToucan
d6076eb591
Merge branch 'master' into multiple_previews_different_overlays 2018-05-24 20:51:54 +03:00
smoogipoo
fb78854485 Fix audio playback getting paused if playlist changes beatmap 2018-05-23 19:41:13 +09: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
smoogipoo
f894d73501 Fix possible MusicController nullref 2018-05-23 14:36:09 +09:00
HoutarouOreki
8e9dde97ce Better match join and last seen texts and tooltips with osu-web 2018-05-23 03:24:37 +02:00
jorolf
b324337fa1 Add icon next to beatmap title/username to open in browser 2018-05-22 15:29:52 +02:00
jorolf
a7bdaf75b0 Ensure badges are ordered correctly 2018-05-22 13:05:15 +02:00
Dean Herbert
5f8eb6d823 Fix class name 2018-05-22 16:04:36 +09:00
Dean Herbert
ebda287e81 Share code with HoldToConfirm implementations elsewhere 2018-05-22 01:44:06 +09:00
Dean Herbert
9e17eb2342 Reword settings text to be ruleset agnostic 2018-05-21 16:03:08 +09:00
Dean Herbert
cea935ea40
Merge branch 'master' into osu-hd-setting 2018-05-21 15:21:09 +09:00
Dean Herbert
c75ef7704a Merge remote-tracking branch 'Joehuu/master' into ocboogie-ruleset-keybindings 2018-05-21 14:49:34 +09:00
Dean Herbert
42519e3723 Rewrite code for clarity 
This also uses the AvailableRulesets list rather than private IDs
 2018-05-21 14:49:26 +09:00
Jacob Odgård Tørring
5e0bbe7d0a
Merge branch 'master' into master 2018-05-18 10:19:16 +02:00
Dean Herbert
d75fe4009a Add back action support to settings back button 2018-05-18 13:40:35 +09:00
Vidalee
6a1abf4084
Merge branch 'master' into osu-hd-setting 2018-05-17 19:39:17 +02:00
Dean Herbert
fc192c8998 Merge remote-tracking branch 'upstream/master' into smoogipoo-disable-mouse-buttons 2018-05-15 19:23:51 +09:00
Dean Herbert
5fee471307
Merge branch 'master' into beatmap-delete-fix 2018-05-15 14:49:09 +09:00
ocboogie
4055a6fc0c
Merge branch 'master' into ruleset-keybindings 2018-05-14 15:39:10 -07:00
Dean Herbert
7507d18a93
Merge branch 'master' into mapping-del 2018-05-14 20:56:12 +09:00
Dean Herbert
addb864d10 Allow help text to wrap 2018-05-14 19:56:03 +09:00
smoogipoo
17861c2a16 Display "no key bound" when no shortcut 2018-05-14 19:20:53 +09:00
Dean Herbert
f14948c022
Merge branch 'master' into exit-hold-confirmation 2018-05-14 18:13:40 +09:00
smoogipoo
027f6c3fa4 Fix instant movement not doing anything 2018-05-14 17:47:38 +09:00
smoogipoo
4ceae6ba1f Inline method 2018-05-14 17:45:11 +09:00
smoogipoo
6eb7590ab0 Make MusicController handle all movement to previous/next tracks 2018-05-14 17:42:01 +09:00
ocboogie
bfcfeec9b9
Merge branch 'master' into ruleset-keybindings 2018-05-14 01:28:57 -07:00
Dean Herbert
5c41e7c39c
Merge pull request #2527 from peppy/fix-mousewheel-startup-crash 
Fix crash on startup when adjusting volume before volume control loaded
 2018-05-14 14:23:08 +09:00
ocboogie
ebd9d1a037 Resolve linting issues in ToolbarModeSelector.cs 2018-05-13 19:43:26 -07:00
ocboogie
327c7432be Use OnKeyDown instead of a IKeyBindingHandler 2018-05-13 19:33:52 -07:00
Dean Herbert
ede4d6dd11
Merge branch 'master' into mapping-del 2018-05-14 10:58:58 +09:00
ocboogie
26f06a9ae1 Resolve linting issues in ToolbarModeSelector.cs 2018-05-12 17:25:15 -07:00
ocboogie
76800421c4
Merge branch 'master' into ruleset-keybindings 2018-05-12 16:40:27 -07:00
ocboogie
8a5bd27c20 Add global key bindings for changing current ruleset 2018-05-12 16:30:29 -07:00
Jacob Odgård Tørring
861a8cf9a7 Fixes capitalization of enableSeek 2018-05-12 23:10:03 +02:00
Dean Herbert
a162453e9b Merge remote-tracking branch 'upstream/master' into joystick 
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
 2018-05-13 00:11:17 +09:00
Jacob Odgård Tørring
a7e7c3a74a Enables/Disables seek and Play/Resume on call to beatmapDisabledChanged 2018-05-12 11:55:52 +02:00
Dean Herbert
a14531b9a4 Fix crash on startup when adjusting volume before volume control loaded 2018-05-11 22:57:36 +09:00
Dean Herbert
aa5d5ab2a8 Fix readonly field 2018-05-11 21:48:35 +09:00
Dean Herbert
f1fd2ae7be
Merge branch 'master' into modmouseup 2018-05-11 21:41:14 +09:00
Dean Herbert
4fc887b25f Add a pressing effect to make mouse up response feel good 2018-05-11 21:40:36 +09:00
Jacob Odgård Tørring
c55d47ff10 Converts OnSeek assignment to method group 2018-05-11 09:56:36 +02:00
Jacob Odgård Tørring
a877855fc6 Changes conditionSeek return type to void 2018-05-11 09:39:55 +02:00
Jacob Odgård Tørring
d54a7295f6 Adds DisableSeek property to MusicController 2018-05-10 13:20:04 +02:00
Dean Herbert
4b3c2466a4 Merge remote-tracking branch 'upstream/master' into disable-mouse-buttons 2018-05-10 19:16:52 +09:00
smoogipoo
df604c40cc Keep shortcut padding even when there is no shortut 2018-05-10 18:49:33 +09:00
smoogipoo
c03ab9014f Improve TestCaseOnScreenDisplay 
Now doesn't rely on framesync.
 2018-05-10 18:48:48 +09:00
Jacob Odgård Tørring
5b99d8df62 Fixes private method name capitalization 2018-05-10 11:29:19 +02:00
Dean Herbert
fadb1a5e0b Add tests and expand functionality to ensure single fire 2018-05-10 17:31:16 +09:00
Jacob Odgård Tørring
bb6478cdc3 Adds a check to disable music controller's seek 2018-05-10 10:15:47 +02:00
Dean Herbert
5df9f126d1 Implement a hold-to-confirm screen when exiting game using escape key 2018-05-10 17:07:19 +09:00
smoogipoo
853680ca51 Merge remote-tracking branch 'origin/master' into disable-mouse-buttons 2018-05-10 14:31:52 +09:00
Dean Herbert
2e9c91c32f
Merge branch 'master' into use-bindable-transforms 2018-05-10 11:45:29 +08:00
Roman Kapustin
95dd2125ee Load PlayButton.Preview asynchronously 2018-05-09 16:22:52 +03:00
Roman Kapustin
c492f62eda Use PreviewTrackManager in the PlayButton 2018-05-09 14:52:46 +03:00
miterosan
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
Roman Kapustin
33e2b91ccc Decouple FilterControl.Ruleset from the game-wide ruleset bindable 2018-05-03 22:59:49 +03:00
Santeri Nogelainen
89db7f81cb Selecting a mod now triggers on mouseup 2018-05-02 17:11:55 +03:00
smoogipoo
d4ada3000c Add keybind to disable mouse buttons 2018-05-02 19:37:47 +09:00
smoogipoo
2d6b2d10f7 Use bindable transforms 2018-05-02 18:26:23 +09:00
Dan Balasescu
9f9447d441 Revert "Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed" 
This reverts commit 67793845b0.
 2018-05-02 16:39:00 +09:00
TocoToucan
ca574f2345 Disable RulesetToggleButton whenever the ruleset can't be changed 2018-04-29 18:36:19 +03:00
TocoToucan
8de05450c4 Cleanup UserProfileOverlay during PopOut 2018-04-29 17:53:38 +03:00
TocoToucan
56c1c2beca Remove redundant multiple previews handling from PaginatedBeatmapContainer 2018-04-29 15:50:02 +03:00
TocoToucan
eda9f83836 Add activeBeatmapPreview variable for tracking beatmap preview playback 2018-04-29 15:32:22 +03:00
Dean Herbert
3de3bb31f8 Merge remote-tracking branch 'upstream/master' into aQaTL-mapping-del 2018-04-25 18:10:28 +09:00
Dean Herbert
76e58a51b9 Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting 2018-04-25 17:28:21 +09:00
Shane Woolcock
84bda7d23f Update framework and ensure the add channel button is not switchable 2018-04-24 20:46:44 +09:30
Dean Herbert
eb7fe0b9e2
Merge branch 'master' into fix-badge-container 2018-04-23 19:13:34 +09:00
Dean Herbert
27437cfbaf
Merge branch 'master' into show-beatmap-id 2018-04-20 18:05:24 +09:00
Dean Herbert
0b993561d8 Fix BadgeContainer being unsable to handle null badges 
This fixes a failing test (hidden becaues the test wasn't being run).

- [ ] Merge osu-framework#1530 first.
 2018-04-20 16:05:34 +09:00
Dean Herbert
a64ed142f0 Use a more suiting icon for discord for now 2018-04-20 13:51:30 +09:00
Dean Herbert
8649ddc68b Make forum posts a web link 2018-04-20 13:01:23 +09:00
Dean Herbert
fe644c6909
Merge branch 'master' into profile_web_changes 2018-04-20 12:51:30 +09:00
Dean Herbert
8eefd04fcb Don't return overlay to null until it has been completely hidden 2018-04-20 12:47:23 +09:00
Dean Herbert
c77f339444 Merge remote-tracking branch 'upstream/master' into show-beatmap-id 2018-04-20 12:41:38 +09:00
tgi74000
64709da546 Update profile header to osu-web changes 2018-04-19 14:46:42 +02:00
Dean Herbert
0356e5e6bf Remove unused property 2018-04-19 21:00:22 +09:00
Dean Herbert
f7ca6267b1 Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability 2018-04-19 20:53:06 +09:00
miterosan
3b68dda23e Merge remote-tracking branch 'origin/master' into Private_Messages 2018-04-18 20:55:12 +02:00
miterosan
29e8c70ed7 Only use one tabControl (channeltabcontrol). Fix that the Channel messages did not refresh. 2018-04-18 20:46:42 +02:00
aQaTL
1dc8986c22
Switched back to switch 2018-04-18 15:06:03 +02:00
Dean Herbert
e395a47112 Changes to naming and text 2018-04-18 19:47:13 +09:00
Dean Herbert
bd834dd487 Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling 2018-04-18 19:46:59 +09:00
Dean Herbert
1728dd6502 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:42:09 +09:00
Dean Herbert
7e5d5a197b Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 16:41:01 +09:00
Dean Herbert
1be2571d33 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:08:45 +09:00
smoogipoo
ffbe6f2e37 Merge remote-tracking branch 'origin/master' into fix-rank-status 
# Conflicts:
#	osu.Game/Beatmaps/RankStatus.cs
#	osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
#	osu.Game/Overlays/Direct/FilterControl.cs
#	osu.Game/Overlays/DirectOverlay.cs
 2018-04-18 14:16:58 +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
a827fb51bc Simplify child definition 2018-04-18 11:42:55 +09:00
jorolf
ddd59382e2 Merge branch 'profile-badges' of github.com:Jorolf/osu into profile-badges 2018-04-16 19:37:52 +02:00
jorolf
de9f15f620 add new test case and fix rotation not working 2018-04-16 19:22:11 +02:00
jorolf
046412f962 make hover lost transition instant (similar to hover transition) 2018-04-16 18:52:09 +02:00
jorolf
2a18b4c3f8 add a DRAWABLE_BADGE_SIZE const and center badges 2018-04-16 18:51:35 +02:00
jorolf
af0c49cca8 badge_size is the actual badge size now 
also fixes rotateBadges bug when hover is lost
 2018-04-16 18:27:18 +02:00
jorolf
af755b4a90
Merge branch 'master' into profile-badges 2018-04-15 23:50:52 +02:00
jorolf
6ca714d93b add badges to ProfileHeader 2018-04-15 23:49:45 +02: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
Dean Herbert
fd54ae3c87 Simplify logic 2018-04-15 16:12:42 +09:00
Dean Herbert
069d48ac14 Remove unused variable 2018-04-15 15:29:00 +09:00
TocoToucan
671de4f6c2 Resolve merge conflicts 2018-04-14 15:11:28 +03:00
miterosan
142e1b8587 update the line endings 2018-04-14 13:32:48 +02:00
miterosan
5bfb386226 Merge remote-tracking branch 'origin/master' into Private_Messages 2018-04-14 13:31:03 +02:00
Dean Herbert
a0f9f8d512 Update frramework again 2018-04-13 21:47:50 +09:00
smoogipoo
733f70cbd5 Merge remote-tracking branch 'origin/master' into instant-hide-screenshot 2018-04-13 21:13:09 +09:00
Dean Herbert
9f5a52b641 Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler 2018-04-13 19:54:15 +09:00
Dean Herbert
81f0649e44 Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling 2018-04-13 19:50:44 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
tgi74000
e3cd0ef200 Add right click scrolling in song select (and its option) 2018-04-13 11:09:49 +02:00
Dean Herbert
a1a7e63646
Merge branch 'master' into ignored_input_handler 2018-04-13 18:05:12 +09:00
smoogipoo
826a8552e5 Reword options item to include "screenshot" 2018-04-13 17:30:02 +09:00
miterosan
a9f3885d28 Remove not needed using 2018-04-12 23:29:23 +02:00
miterosan
e39f5a1adf Rename var chatmanager -> channelManager 
Apply requested changes
 2018-04-12 23:19:13 +02:00
TocoToucan
9acea6eab0 Order beatmap difficulty icons correctly 2018-04-12 19:33:30 +03:00
Joehu
463b189d2f Remove unused using directives 2018-04-12 08:13:24 -07:00
Joehu
f18594887b Move enum to SearchBeatmapSetsRequest 2018-04-12 07:49:23 -07:00
TocoToucan
7c3441e2d0 ActiveInputHandlers -> IgnoredInputHandler 2018-04-12 17:06:35 +03:00
Joehu
461e063f19 Rename RankStatus to BeatmapSearchCategory 2018-04-11 22:50:39 -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
miterosan
6e81fda40e
Merge branch 'master' into Private_Messages 2018-04-11 20:48:06 +02:00
miterosan
499ecd3843 Fix the warnings 2018-04-11 20:44:35 +02:00
miterosan
2056258def Fix code sanity 2018-04-11 20:31:16 +02:00
miterosan
697b551f3e Fix Selected tab beeing choosen multiple times 2018-04-11 20:27:33 +02:00
miterosan
3860594f40 Rename everything into channel and remove everything chat 2018-04-11 20:01:57 +02:00
miterosan
39ecc3d31d Add Test Case, improve displaying the avatar, use a chatTabControl instead of putting both in ChatOverlay, readd shadow. 
Requires osu-framework for a fix
 2018-04-11 18:23:09 +02:00
TocoToucan
6a8f568f66 BeatmapContainer -> beatmapContainer 2018-04-11 16:32:58 +03:00
TocoToucan
6cdfaffcf7 PaginatedBeatmapContainer.BeganPlayingPreview 2018-04-11 16:19:21 +03:00
Dean Herbert
903dd7a015 Fix regression causing hard crash 
Regressed in #2373. My bad.
 2018-04-11 19:24:19 +09:00
aQaTL
90beff83f6
Updated KeyBindingRow sprite text, adjusted KeyBindingOverlay width 2018-04-11 08:07:26 +02:00
aQaTL
38277bff35
Changed mapping of deleting key binding to shift+delete 2018-04-10 18:00:22 +02:00
naoey
d851446aca
Remove redundant anchor and use Show/Hide instead of FadeIn/Out. 2018-04-10 19:15:37 +05:30
Dean Herbert
c33cb9c02e
Merge branch 'master' into show-beatmap-id 2018-04-10 16:05:32 +09:00
miterosan
85f736ae89 Allow opening a new chat with right click on User 
Allow faster viewing of the usertab using lasy loading
 2018-04-09 23:14:39 +02:00
miterosan
762b4412e5 Convert if to switch 2018-04-09 22:29:48 +02:00
UselessToucan
9225c06872
Merge branch 'master' into hide_menu_cursor 2018-04-09 21:41:54 +03:00
aQaTL
dbee936748
Allow mapping delete key via alt+delete key combination 2018-04-09 18:48:47 +02:00
smoogipoo
b97c4e8b44 Fix all possible cases of crossthread import data races 2018-04-09 12:45:44 +09:00
miterosan
aa26ea483d remove using, remove empty agrument list 2018-04-08 22:43:01 +02:00
miterosan
2a314f052a Trim more whitespace 2018-04-08 22:28:50 +02:00
miterosan
0a207e00d5 Trim whilespace 2018-04-08 22:24:55 +02:00
miterosan
4b7ffd09d9 Trim whitespace 2018-04-08 22:18:29 +02:00
miterosan
a48ccb5603 Implement Private chat 2018-04-08 22:12:57 +02:00
miterosan
a70b329155 Split drawing and business logic of ChatOverlay 2018-04-08 18:21:48 +02:00
miterosan
525e50e8dd Merge remote-tracking branch 'origin/master' into Private_Messages 2018-04-08 15:23:09 +02:00
TocoToucan
640be621ac Handle multiple song previews playing in different beatmap categories on profile 2018-04-07 13:29:46 +03:00
naoey
ca4299c6fe
Remove unused using and fix possible nullref. 2018-04-04 22:07:24 +05:30
naoey
7482d5986a
Add a loading state to BeatmapSetOverlay. 
- Handle null value in header and info sections
- Add item to context menu for carousel beatmaps to show details
 2018-04-04 21:46:31 +05:30
naoey
c304c1eecf
Make LinkFlowContainer handle beatmap id lookup in game. 2018-04-04 21:23:51 +05:30
Dan Balasescu
6dfca4b2fa
Merge branch 'master' into osu-tab-strip 2018-04-04 14:20:06 +09:00
smoogipoo
c39fb9a200 Update with framework changes 2018-04-03 20:10:26 +09:00
smoogipoo
e9ec544bf6 Implement joystick keybindings 2018-04-03 02:04:40 +09:00
Huo Yaoyuan
b842f682eb Use Linq.Append and Prepend. 2018-04-02 12:06:34 +08:00
Joseph Madamba
ee14ca7cc5
Merge branch 'master' into score-multiplier-edits 2018-03-31 10:43:58 -07:00
DrabWeb
3d05798d80 Change SearchableListOverlay to use OsuTabControl strip. 2018-03-29 15:34:53 -03:00
Joseph Madamba
af9e3a849f
Merge branch 'master' into score-multiplier-edits 2018-03-28 20:42:35 -07:00
Joseph Madamba
5457f17e79 Clean up code from reviews 2018-03-28 19:53:15 -07:00
miterosan
c937789684 Rename GetMessagesRequest to GetChannelMessagesRequest 2018-03-28 21:33:50 +02:00
miterosan
56de6c1067 Rename Channel to ChannelChat 2018-03-28 21:11:06 +02:00
DrabWeb
19bc6b9168 Merge https://github.com/ppy/osu into beatmap-set-status 2018-03-27 18:13:58 -03:00
Joseph Madamba
ac9527147f Fix transitioning of unranked label 2018-03-27 03:05:05 -07:00
DrabWeb
eb374c5774 Add beatmap set online status and display it in direct panels and the beatmap set overlay. 2018-03-26 21:04:45 -03:00
Joseph Madamba
90d763fda5 Apply review changes and suggestions 2018-03-25 10:00:30 -07:00
Joseph Madamba
78a7564acd Score multiplier edits 2018-03-24 16:00:18 -07:00
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
Dean Herbert
b593c47809 Add setting to toggle performance logging 2018-03-24 05:07:48 +09:00
TocoToucan
dd5cc59250 Introduce 'Capture menu cursor' setting 2018-03-23 22:53:06 +03:00
Dan Balasescu
676feb3658
Merge branch 'master' into fix-mod-button-sounds 2018-03-23 21:03:42 +09:00
smoogipoo
52fa837447 Fix volume glow being cut off 
Fixes #2285.
 2018-03-23 18:17:23 +09:00
Dean Herbert
fd124d2ee6
Merge branch 'master' into fix-mod-button-sounds 2018-03-22 21:55:15 +09:00
Dean Herbert
e7cb579ec4
Merge branch 'master' into take_screenshot 2018-03-22 21:34:53 +09:00
Dean Herbert
14a653aa28 Restore old auto-popout notification overlay behaviour 2018-03-22 20:55:00 +09:00
Dean Herbert
74191e1b73 Merge remote-tracking branch 'upstream/master' into take_screenshot 2018-03-22 20:49:17 +09:00
Dean Herbert
65b6a2faad Fix mod button sounds playing when mod overlay is not visible 
Resolves #2240.
 2018-03-21 18:41:21 +09:00
Dean Herbert
f944c29505 Merge remote-tracking branch 'upstream/master' into take_screenshot 2018-03-21 12:32:27 +09:00
Dean Herbert
ec851648da Add better ToString output from SkinInfo 2018-03-19 20:06:44 +09:00
TocoToucan
604e725f3f Remove redundant code 2018-03-16 20:42:05 +03:00
Dean Herbert
4411758ff7
Merge branch 'master' into fix-autoplay-button-deselect 2018-03-16 17:31:14 +09:00
Dean Herbert
46f5c0fc19
Merge branch 'master' into mod-fixes 2018-03-16 15:38:41 +09:00
TocoToucan
34dc8e7375 Resolve merge conflict 2018-03-14 23:22:19 +03:00
Dean Herbert
551b67ac16
Merge branch 'master' into fix-autoplay-button-deselect 2018-03-14 21:46:19 +09:00
FreezyLemon
070decf890 small code cleanups 2018-03-14 12:38:22 +01:00
FreezyLemon
a438e45434 make SelectTypes set mods instead of only adding new ones 
also made the method actually take types as parameter to make it consistent
 2018-03-14 12:33:08 +01:00
Joseph Madamba
1eeacb7bf7
Change descriptions and special section 2018-03-14 01:05:19 -07:00
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code 2018-03-13 20:07:03 -07:00
Dean Herbert
07642546bb Make APIAccess a component 2018-03-14 11:29:54 +09:00
Dean Herbert
afc3646450 Move API configuration hooks out of OsuGameBase 
Also makes username more private, and password completely private.
 2018-03-14 10:15:05 +09:00
vperus
ba44813c00 Fixed exit from game save username instead of email. Resolve #2156 2018-03-13 12:10:47 +02:00
Dean Herbert
1d0a44a0bb
Merge branch 'master' into fix-login-failure 2018-03-12 12:41:45 +09:00
Vidalee
6d9e78a3a3 Review changes 2018-03-11 22:40:49 +01:00
Vidalee
eed0f3a1de Added setting to not hide the first object in Hidden mod 2018-03-11 21:02:14 +01:00
TocoToucan
e6c22e2287 Taking screenshot support initial commit 2018-03-10 21:59:20 +03:00
Dean Herbert
9233266fe1 Fix login failure for users with no country rank 
Closes #2148.
 2018-03-11 00:44:16 +09:00
Dean Herbert
3b56999118 Add drawable to display (and update) relative dates 2018-03-08 12:58:16 +09:00
naoey
983cefbe40
Add VisualTest. 2018-03-07 19:08:26 +05:30
Dean Herbert
f78538fea8
Merge branch 'master' into user-profile-recent 2018-03-07 19:41:52 +09:00
Dean Herbert
a71e5ce19c Tidy up 2018-03-07 14:54:54 +09:00
Dean Herbert
4094ffbddd Remove unnecessary comment 2018-03-07 14:54:15 +09:00
Dean Herbert
96ea42d3ba Ensure initial value is set even if that value is zero 2018-03-07 14:51:34 +09:00
Dean Herbert
05a13d4d39 Improve the way bindings are done 2018-03-07 14:50:50 +09:00
Dean Herbert
51a9dd038e Add default bindable values 2018-03-07 14:38:41 +09:00
Dean Herbert
e2f9e237e8 Use GradientHorizontal helper function 2018-03-07 14:07:04 +09:00
Dean Herbert
c176e309e1
Merge branch 'master' into volume-control 2018-03-07 14:03:09 +09:00
smoogipoo
78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
naoey
9669c5aee3
Make locally used things local and rename method. 2018-03-06 09:33:15 +05:30
jorolf
ec013dbee8 remove blank line and try to get test case working 2018-03-03 21:55:19 +01:00
jorolf
1cda58fe29 another blank line 2018-03-03 19:51:11 +01:00
jorolf
9293ec635a add license headers and remove blank line 2018-03-03 19:49:38 +01:00
jorolf
8e0a524c4d change colours 2018-03-03 19:31:29 +01:00
jorolf
ef63366d91 simplify VolumeMeter 2018-03-03 19:25:34 +01:00
jorolf
3a420ba826 add the volume overlay 2018-03-03 19:08:35 +01:00
jorolf
bd75422d88 Merge branch 'master' of git://github.com/ppy/osu into volume-control 2018-03-03 14:10:50 +01:00
jorolf
46dfb761c5 basic volume meter and testcase 2018-02-28 16:14:52 +01:00
Dean Herbert
eacb9ba743
Merge branch 'master' into user-profile-recent 2018-02-28 23:49:33 +09:00
naoey
2e535afb84
Remove redundant subsection title. 
- Also handle opening UserProfile in LinkFlowContainer similar to how
beatmaps and channels are handled
 2018-02-28 15:25:29 +05:30
naoey
62913163e0
Fix long recent activity text overlapping timestamp. 
- Also remove unnecessary fallback from absolute URL helper
 2018-02-27 21:21:53 +05:30
Dean Herbert
034875be47 Fix bindings not being unbound on ModSelect 
Resolves #2018.
Closes #2079.
 2018-02-27 20:45:32 +09:00
naoey
a77d1eedae
Fix achievements parsing and add badges to recent activity. 2018-02-26 13:08:12 +05:30
naoey
a20e4bc2c3
Fix typos and missing fields in JSON mappings. 2018-02-26 11:46:16 +05:30
naoey
5724618b2a
Add license headers and sanitise open profile argument. 2018-02-26 09:58:11 +05:30
naoey
1ad45b0941
R# fixes. 2018-02-26 01:21:31 +05:30
naoey
75fdca928e
Handle links correctly and don't re-open profile if the user is same. 2018-02-26 01:21:29 +05:30
naoey
bb40919f9c
Add link handling to recent activities. 
- Add a show user action to link handling
 2018-02-26 01:21:27 +05:30
naoey
7e4bd36391
Create drawable and add response to profile. 
- Add missing JSON fields to response model
- Add missing enum value
 2018-02-26 01:21:24 +05:30
naoey
e3a1b07172
Create API request and reponse model. 2018-02-26 01:21:16 +05:30
Dean Herbert
402d71a8d9 Add user skin setting storage 2018-02-22 16:29:05 +09:00
Dean Herbert
659cf629b6 Add skin seleciton dropdown to settings 2018-02-22 15:46:11 +09:00
Dean Herbert
c070c69522 Update framework 2018-02-22 15:01:53 +09:00
Dean Herbert
f2b3d9a0e8 Change some missed instances 2018-02-22 14:17:35 +09:00
Joseph Madamba
3d4bed462b
Reword sign in text 2018-02-21 20:54:47 -08:00
Dean Herbert
d07ab1fbea Fix undelete all 2018-02-15 15:14:55 +09:00
Dean Herbert
d3dd31dadb Make deletion and purging logic even more global 2018-02-15 14:22:39 +09:00
Dean Herbert
d340509b1d Move ArchiveReaders to a more global namespace 
Also moves delete and action logic to a shared implementation
 2018-02-15 14:22:39 +09:00
Dean Herbert
f4ddc0717b Fix incorrect PlaylistItem drag handling 2018-02-13 20:08:59 +09:00
Dean Herbert
e2d11af4ef Fix incorrect MusicController drag handling 2018-02-13 20:08:59 +09:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Dean Herbert
67bd375bfa Merge remote-tracking branch 'upstream/master' into raw-input-fixes 2018-02-07 22:05:44 +09:00
Dean Herbert
6b6d4f9527
Merge branch 'master' into country_rank 2018-02-07 18:49:40 +09:00
Dean Herbert
4c3606f8fb Handle non-present country rank 2018-02-07 18:34:38 +09:00
Dean Herbert
647cc4bdad Remove in-between properties 2018-02-07 18:04:32 +09:00
Shane Woolcock
e0c52c69cf Prevent revert-to-default OnHover from hiding visual settings at beatmap load 2018-02-06 22:31:30 +10:30
Dean Herbert
30b9439263 Fix default mouse sensitivity not reverting correctly 2018-02-05 20:00:36 +09:00
Dean Herbert
7e56519d6a Add setting for absolute input mapping 2018-02-05 16:13:39 +09:00
Imnooby
c4f3223e34 Stops non-url text from being hyperlinks 
Fixed crash when you attempted to click one
 2018-02-03 18:24:49 -06:00
Dean Herbert
39160d895c Update design of "revert to default" button 
Also fixes some inconsistencies in padding
 2018-02-02 15:18:39 +09:00
tgi74000
e08a9350a0 Store and show SSPlus and SPlus statistics 2018-02-01 15:19:49 +01:00
Dan Balasescu
0589708da5
Merge branch 'master' into inactive-volume-duck 2018-02-01 16:21:33 +09:00
Dean Herbert
335f0d577c Add the ability to duck volume when the game is inactive 2018-01-31 18:16:55 +09:00
Dean Herbert
28b67e3d77
Merge branch 'master' into url-parsing-support 2018-01-30 17:47:55 +09:00
Dean Herbert
e5188fd151 Add better channel test cases (testing non-existent channels) 2018-01-30 17:43:19 +09:00
smoogipoo
b4cd8ea716 GlobalKeyBindingContainer -> GlobalActionContainer 
Consitent with "FrameworkActionContainer".
 2018-01-30 14:54:30 +09:00
smoogipoo
ef3fb8c05a InputManager -> Container where KeyBindings are involved 2018-01-30 14:49:12 +09:00
Dean Herbert
a5b0d51205 Merge remote-tracking branch 'upstream/master' into url-parsing-support 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2018-01-27 14:06:58 +09:00
Dean Herbert
7852015db3 Remember mod selection when re-entering song select 
Removes mod application when exiting back to main menu.

Alternative to #1968.
Closes #1961.
 2018-01-26 19:32:57 +09:00
smoogipoo
5742e61e68 Merge remote-tracking branch 'origin/master' into ruleset-configs 2018-01-26 15:39:09 +09:00
Dean Herbert
fd7d7c3953
Merge branch 'master' into MakeMusicControllerDraggableAgain 2018-01-25 09:01:54 +09:00
TocoToucan
51e188401f Make MusicController draggable again 2018-01-25 00:38:22 +03:00
Aergwyn
205d3ed896 fix settings not getting injected 2018-01-23 19:42:21 +01:00
Dean Herbert
c01f67b0d8 Merge remote-tracking branch 'upstream/master' into ruleset-configs 2018-01-23 16:23:25 +09:00
Dean Herbert
95f941163b
Merge branch 'master' into direct-show-deleted-sets 2018-01-22 17:08:10 +09:00
Dan Balasescu
73799832ef
Merge branch 'master' into direct-show-deleted-sets 2018-01-22 16:54:32 +09:00
Dean Herbert
a931d6e381
Merge branch 'master' into fix-user-download-cancel 2018-01-22 16:27:26 +09:00
Aergwyn
82c8822888 we need to go back 
reverted change and instead check `DeletePending` when retrieving existing online IDs
 2018-01-22 08:04:14 +01:00
Dan Balasescu
20be4bbbcd
Merge branch 'master' into better-direct-progress-bar 2018-01-22 14:25:23 +09:00
Dean Herbert
3d4e2d400c Remove unused using 2018-01-22 13:52:10 +09:00
Dean Herbert
53e40a77dc Don't show error messages when a download is user-cancelled 
Resolves #1941.
 2018-01-22 13:25:49 +09:00
smoogipoo
9ac035f3d5 Merge branch 'bdl-cache-changes' into ruleset-configs 2018-01-22 13:11:45 +09:00
Dean Herbert
060d80efbe Continue showing progress bar on direct panels when importing 
Previously the progrress bar would fade out once downloads completed, which felt unintuitive.
 2018-01-22 13:05:07 +09:00
Aergwyn
596044e19d show beatmapsets with pending deletion in osu!direct 2018-01-19 17:25:32 +01:00
Dean Herbert
652f273961 Ensure previews stop playing when they are removed from the draw hierarchy 2018-01-19 15:46:42 +09:00
Dan Balasescu
250e936099
Merge branch 'master' into preview-fixes 2018-01-19 00:03:47 +09:00
Aergwyn
56619ae926 use ternary expression 2018-01-18 15:53:53 +01:00
smoogipoo
a94ea7025e Register/Unregister -> BeginTracking/StopTracking and add exceptions 2018-01-18 18:45:48 +09:00
smoogipoo
dee298c395 No more statics + better unregistration 2018-01-18 17:40:05 +09:00
Dean Herbert
7ceed8b5eb Stop any playing preview when closing the direct overlay 
Resolves #1925
 2018-01-18 17:28:56 +09:00
smoogipoo
c2c478750d Remove generics from OSD registration methods 2018-01-18 16:57:32 +09:00
smoogipoo
09dfea7e29 Use tracked settings from ConfigManager changes 2018-01-18 15:26:03 +09:00
Aergwyn
65bac6d31a return preview instead of nothing if it exists already 
allows listening to it again after reaching the end
 2018-01-17 20:36:47 +01:00
Aergwyn
f86cb30e47 prevent negative width on progress bar 2018-01-17 20:35:28 +01:00
Dean Herbert
e7524445ee Use Restart() 2018-01-17 21:33:19 +09:00
Dean Herbert
54ed608ddb Mute global track volume when a beatmap preview is playing 2018-01-17 21:26:12 +09:00
Dean Herbert
783ca40c64 Update with upstream changes 2018-01-17 16:51:47 +09:00
Dean Herbert
54b0f4b912 Merge branch 'master' into url-parsing-support 2018-01-17 16:16:55 +09:00
Dean Herbert
5e1cd8ddc4 Apply conditionals directly rather than using an in-between property 2018-01-16 20:34:40 +09:00
Dean Herbert
9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
TocoToucan
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
Aergwyn
ae1adfd2f2 remove unnecessary empty lines 
codefactor.io \(o.o)/
also one unnecessary semicolon
 2018-01-12 19:30:34 +01:00
Aergwyn
1c5b3d009c remove volume reduction on preview 
it doubles with global reduction
 2018-01-12 17:09:57 +01:00
Dean Herbert
45301d07fd
Merge branch 'master' into url-parsing-support 2018-01-12 19:34:44 +09:00
Dean Herbert
73aa56a8a7
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-12 18:58:30 +09:00
Dean Herbert
188b26472c Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision 2018-01-12 18:54:36 +09:00
Dean Herbert
ff725f0e32 Fix incorrect online conditional check in social browser logic 2018-01-12 18:20:46 +09:00
Dean Herbert
29c8400ec7
Merge branch 'master' into scrolling-hitobjects-rewrite 2018-01-12 17:35:24 +09:00
Dean Herbert
0a06f8069f Remove panel fade out for now 
Should be implemented at one level above using a dedicated container.
 2018-01-12 17:22:51 +09:00
smoogipoo
441e8aced5 Better namings for the speed change "algorithms" 2018-01-12 17:18:34 +09:00
Dean Herbert
8f7c048c4e
Merge branch 'master' into expand-social-tab 2018-01-12 15:54:42 +09:00
smoogipoo
712d586d41 Revert "Add OSD + config value for scroll speed" 
This reverts commit a6d8b28221.
 2018-01-12 12:28:43 +09:00
FreezyLemon
174fdf5037 Nicer code to remove non-existent channels from links 2018-01-11 18:51:20 +01:00
smoogipoo
a6d8b28221 Add OSD + config value for scroll speed 2018-01-11 13:40:46 +09:00
smoogipoo
6a5a3b01b2 Fix license headers 2018-01-11 12:39:06 +09:00
Aergwyn
312f52072b enable query 
change Avatar animation too
add forgotten usings
 2018-01-10 16:46:55 +01:00
smoogipoo
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09:00
smoogipoo
c010b48b29 Remove number format specified from OsuSliderBar, override ToolTipText 
Better/cleaner solution.
 2018-01-10 17:29:16 +09:00
smoogipoo
17e7f75aca More osu!-side bindable fixes 2018-01-10 15:41:13 +09:00
Aergwyn
4ce125478a remove unnecessary Schedules 
one was bugging out when rapidly switching display styles and the other was... unnecessary
 2018-01-09 19:03:23 +01:00
Aergwyn
44d821172a tidying up 2018-01-09 16:29:12 +01:00
FreezyLemon
3bf9901dd2 Fixed bugs and added tests 2018-01-09 16:11:45 +01:00
Dean Herbert
c2fadcfc1f
Merge branch 'master' into background-blur 2018-01-09 21:20:05 +09:00
Dean Herbert
1c9e9cb8af
Merge branch 'master' into expand-social-tab 2018-01-09 21:08:26 +09:00
Dean Herbert
72624aea18 Use a better method of link compilation 
Adds word wrap back, simplifies a lot.
 2018-01-09 20:33:20 +09:00
Dean Herbert
b035a92bda
Merge branch 'master' into url-parsing-support 2018-01-09 14:28:20 +09:00
Aergwyn
f6c168be27 add skip cutscene as "in game" keybinding 2018-01-08 18:22:43 +01:00
smoogipoo
c4d1922c8b Add scrolling algorithm to global settings 2018-01-08 11:34:37 +09:00
TocoToucan
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
Aergwyn
d9866a2052 fix hover effects on social panels 2018-01-06 11:27:17 +01:00
Aergwyn
a61666d2a7 update licence headers 2018-01-06 10:54:53 +01:00
Aergwyn
e6b581e259 Merge branch 'master' into expand-social-tab 2018-01-06 10:48:27 +01:00
Aergwyn
57b44b8c29 fix new panels appearing too soon 2018-01-06 10:40:18 +01:00
Dean Herbert
a1d94d7adf
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-05 20:48:30 +09:00
Dean Herbert
d1f03ebf0c Update in line with framework 2018-01-05 20:29:14 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
1571c10c42 Fix up replay settings sliderbar formatting 2018-01-05 14:37:32 +09:00
smoogipoo
b84da31174 Change in-line with framework 2018-01-05 14:26:46 +09:00
smoogipoo
af86220dcc Merge remote-tracking branch 'origin/master' into update-branch 2018-01-05 12:08:50 +09:00
smoogipoo
5eb2dc3d64 Cleanup some possible CI errors 
Not sure why these aren't being detected on master right now - they should be...
 2018-01-05 01:20:24 +09:00
smoogipoo
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
Aergwyn
038fa682f7 Merge branch 'master' into expand-social-tab 2018-01-04 11:49:35 +01:00
Aergwyn
bf64b8fc69 added hover effects to panels in social 
at least partially QQ
 2018-01-04 11:42:50 +01:00
Aergwyn
9b70578af6 enabled Location as filter tab 
forgot it QQ
 2018-01-03 19:01:10 +01:00
Aergwyn
9d29adce27 bring social tab+filter behaviour closer to direct 2018-01-03 17:54:20 +01:00
Aergwyn
988f6ac901 fix SortDirection default to descending when retrieved data is ascending 2018-01-03 17:53:50 +01:00
Aergwyn
0e361aefeb added new tabs and sort criteria 2018-01-03 17:52:11 +01:00
Dean Herbert
532c455f92
Merge branch 'master' into change-audio-settings-icon 2018-01-03 14:34:21 +09:00
Dan Balasescu
fa6db30d30
Fix broken xmldoc param 2018-01-03 13:12:49 +09:00
Aergwyn
699902234b remove unused code 2018-01-02 17:58:11 +01:00
Aergwyn
52c2ba49cf make loading indicator more visible by deleting panels preemptively 2018-01-02 17:42:44 +01:00
Aergwyn
313dfd4d46 remove unnecessary task + rename method 2018-01-02 17:22:12 +01:00
Aergwyn
a00f92dcb4 change unnecessary cast 2018-01-02 17:18:49 +01:00
Dean Herbert
faf1181fc3
Merge branch 'master' into url-parsing-support 2018-01-02 17:51:50 +09:00
Dean Herbert
0e1b033008 Improve mod cycling logic further 2018-01-02 16:55:03 +09:00
Dean Herbert
f72239ef7a Centralise deselect logic and add animation to deselection 2018-01-02 16:09:22 +09:00
Dean Herbert
71bcebe7e1 Fix selections occurring even though buttons aren't selected 2018-01-02 16:08:48 +09:00
Dean Herbert
c0dd812a4c Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods 2018-01-02 15:33:08 +09:00
Dan Balasescu
5f3dbfef47
Merge branch 'master' into hide-unavailable-functions 2018-01-02 12:59:12 +09:00
Dan Balasescu
91c49913c9
Merge branch 'master' into focused-overlay-improvements 2018-01-02 12:44:09 +09:00
Dean Herbert
2354163900 Change icon for audio settings 2018-01-02 12:30:55 +09:00
Aergwyn
cc4ef5d0aa Merge branch 'master' into expand-social-tab 2018-01-01 12:00:50 +01:00
FreezyLemon
e7721d71f3 Changed chat link implementation according to review 2017-12-31 00:51:47 +01:00
Aergwyn
ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
Dean Herbert
1c80f3e918 Disallow selection of non-implemented mods 2017-12-31 04:28:51 +09:00
Dean Herbert
33dbd1b1a7 Remove search button on toolbar 2017-12-31 03:47:50 +09:00
Aergwyn
138d78309f add HitCount enum and replace string usage with enum 2017-12-30 18:07:30 +01:00
Aergwyn
f7fe083018 add tooltip to country flags 2017-12-30 14:59:35 +01:00
Dean Herbert
f56e8121da Fix settings overlay pass-through logic 2017-12-30 22:13:05 +09:00
Dean Herbert
8733f809a5 Remove chat overlay local override 2017-12-30 21:10:57 +09:00
Dean Herbert
e332683d18 Fix music controller draggability 2017-12-30 21:10:40 +09:00
Aergwyn
f03e064c43 remove unnecessary update 2017-12-30 12:57:32 +01:00
Aergwyn
760d2aff4b readd IOnlineComponent to be able to react to APIState changes 2017-12-30 12:56:18 +01:00
Dean Herbert
442a649c63 Make all FocusedOverlays hide on clicks outside of themselves 
Also allows wheel events to pass through around them.
 2017-12-30 20:45:41 +09:00
Aergwyn
d37ba2c9a4 disable searching/filtering with textbox 
it doesn't do anything except from creating unnecessary requests for now
 2017-12-30 11:54:03 +01:00
Aergwyn
72af5bf672 simplify socialoverlay user request structure 2017-12-30 11:51:49 +01:00
Aergwyn
8a02900c01 changed titles from social tabs 2017-12-30 11:33:06 +01:00
smoogipoo
616ad5b723 Cleanups 2017-12-30 16:55:01 +09:00
smoogipoo
714d93dd92 Merge remote-tracking branch 'origin/master' 2017-12-30 16:17:14 +09:00
jai_
9660e0885b
correctly name tooltip interface 2017-12-29 19:20:37 +00:00
jai_
6de41ba172
Trim whitespace 2017-12-29 19:16:43 +00:00
jai_
b1dd64983d
Add tooltip text to supporter icon 2017-12-29 19:05:50 +00:00
FreezyLemon
d66d741af2 fixed constant naming 2017-12-28 22:11:10 +01:00
FreezyLemon
ae79be7b51 small style fixes plus new assert in test 2017-12-28 21:45:58 +01:00
FreezyLemon
7454633f63 Refactor and general tidying up 2017-12-28 20:11:21 +01:00
Aergwyn
b029f019b2 Merge branch 'master' into expand-social-tab 2017-12-28 19:36:22 +01:00
Aergwyn
66f076815f query friends endpoint to fetch friendlist 2017-12-28 19:32:06 +01:00
FreezyLemon
128603a99f Added more and fixed the old automated tests 2017-12-28 01:12:13 +01:00
FreezyLemon
54a11e24b7 Fixed links being removed too early 2017-12-27 21:13:32 +01:00
FreezyLemon
4681a0c47b handle chat == null gracefully and remove link from message if channel not found 2017-12-27 21:06:48 +01:00
Dan Balasescu
dcd994e65b
Merge branch 'master' into better-notification-delays 2017-12-27 23:58:04 +09:00
Dan Balasescu
996e156fd0
Merge branch 'master' into fix-notification-scheduled-events 2017-12-27 23:27:23 +09:00
Dan Balasescu
3bfa6bd9fd
Merge branch 'master' into better-notification-delays 2017-12-27 23:26:57 +09:00
Dan Balasescu
3de07ddba8
Merge branch 'master' into fix-progress-notifications-close 2017-12-27 21:43:58 +09:00
Dean Herbert
9a4b2f0d1d Apply workaround at two levels 2017-12-27 21:19:06 +09:00
smoogipoo
7a793eaded Merge master into netstandard 2017-12-27 20:48:53 +09:00
Dean Herbert
7d0c94fd01 Fix notification overlay layout and scheduled tasks being delayed 
Closes #1295
 2017-12-27 19:42:44 +09:00
Dean Herbert
2a7147240f Fix progress notifications not creating their completion notification early enough 
FIxes notification overlay thinking it has no notifications left and closing.
 2017-12-27 13:25:42 +09:00
FreezyLemon
c4f5754f94 Fixed only the links being italics for /me messages 2017-12-27 02:14:45 +01:00
Dean Herbert
94449ed597
Merge branch 'master' into notification-verbosity 2017-12-26 20:48:59 +09:00
Dean Herbert
35ae5173cd
Merge branch 'master' into better-notification-delays 2017-12-26 20:48:41 +09:00
Dan Balasescu
460eeafd32
Merge branch 'master' into quieter-notifications 2017-12-26 18:18:28 +09:00
Dean Herbert
ab6c93fba4
Merge branch 'master' into notification-verbosity 2017-12-26 16:14:24 +09:00
Dean Herbert
3524ad3dc2 Merge remote-tracking branch 'upstream/master' into better-notification-delays 2017-12-26 16:10:57 +09:00
Dan Balasescu
f7a54a203b
Merge branch 'master' into beatmap-import-prompt 2017-12-26 16:00:37 +09:00
Dean Herbert
24d8d357d0 Only bounce and flash notification count when increasing 2017-12-26 15:54:37 +09:00
Dean Herbert
45b3acdd6f Fix progress notifications not closing properly when opening their continuation 2017-12-26 15:54:33 +09:00
Dean Herbert
ed1df94f77 Fix unread light not turning off 2017-12-26 15:54:28 +09:00
Dan Balasescu
ef0031a719
Merge branch 'master' into popup-word-wrap 2017-12-26 15:47:58 +09:00
Dan Balasescu
d089e27cad
Merge branch 'master' into osu-prefixed-text 2017-12-26 15:40:29 +09:00
Dan Balasescu
ad811961a7
Merge branch 'master' into quieter-notifications 2017-12-26 15:30:12 +09:00
ColdVolcano
bc90793b1c Trim whitespace 2017-12-25 19:18:57 -06:00
ColdVolcano
044e4d0acd Add blur to background in Player 2017-12-25 19:11:49 -06:00
FreezyLemon
962e4d7c8a Removed LinkId and word wrapping (for now). 
Also reimplemented the OsuHoverContainer properly
 2017-12-25 20:46:04 +01:00
FreezyLemon
a30448095e Merge branch 'master' into url-parsing-support 2017-12-25 19:12:23 +01:00
Dean Herbert
0886107ec9 Connect counter with button display 2017-12-26 01:56:57 +09:00
Dean Herbert
1fc240f6c5 Expose unread notification count 2017-12-26 01:50:05 +09:00
Dean Herbert
bb33d0211a Add a count of unread notifications to the toolbar 2017-12-26 01:36:58 +09:00
Dean Herbert
dff082ed94 Make toolbar testable and add the most basic of visual tests 2017-12-26 01:12:46 +09:00