Commit Graph

2480 Commits

Author SHA1 Message Date
da730269a9 Formatting and ctor usage for required parameters 2018-07-24 15:25:47 +02:00
53f556de9a Trim whitespace 2018-07-24 15:10:55 +02:00
42df0c974f Rename UserChannel to private channel. 2018-07-24 05:17:57 +02:00
9bc225e14b rename user to private 2018-07-24 05:14:47 +02:00
e769c15d28 Provide XML doc in Channel.cs and ChannelManager.cs and ChatTabControl.cs 2018-07-24 05:14:33 +02:00
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
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
2726d91594 Remove unessary usings 2018-07-23 16:05:39 +02:00
344ec40a27 Readd usings I removed with my merge 2018-07-23 15:48:48 +02:00
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
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
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
64cde1ebad Merge branch 'master' into use-switch-over-if 2018-07-17 16:44:57 +09:00
97e71245e9 Merge branch 'master' into reduce-panel-width 2018-07-17 16:36:05 +09:00
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
745d596343 Merge branch 'master' into fix-incorrect-mods 2018-07-17 13:41:02 +09:00
4f1b7c8065 Merge branch 'master' into reduce-panel-width 2018-07-17 04:20:40 +09:00
84c13174d9 Merge branch 'master' into use-has-flags 2018-07-17 03:50:40 +09:00
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
a117b323e2 Merge branch 'master' into make-notifications-quieter 2018-07-16 13:15:07 +09:00
a12c47536b Change default to being important 2018-07-16 13:00:21 +09:00
4829f4f09c Merge branch 'master' into download-button-state 2018-07-16 03:17:26 +09:00
730eb2daa2 Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions 2018-07-14 03:47:56 +09:00
81e5a37d6d Enlist a few more important notifications 2018-07-14 03:31:19 +09:00
e0bcd6988a Merge branch 'master' into lesserSideKeys 2018-07-13 23:32:44 +09:00
d63611a9b3 Merge branch 'master' into fix-incorrect-mods 2018-07-13 22:08:21 +09:00
6698f320fb Merge branch 'master' into download-button-state 2018-07-13 22:05:26 +09:00
ac4f25c5bc Make notifications less noisy 2018-07-13 21:25:08 +09:00
fc3aff6689 Fix initial colour 2018-07-13 21:19:10 +09:00
3d136ef0f9 Merge branch 'master' into fix-ugly-line 2018-07-13 18:08:55 +09:00
ee2c7c50ad Tidy up button hierarchy 2018-07-13 16:28:18 +09:00
0676919496 Fix incorrect corner radius 2018-07-13 14:56:44 +09:00
09be9c2ed2 Merge remote-tracking branch 'upstream/master' into naoey-download-button-state 2018-07-13 14:52:10 +09:00
ac078153ae Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods 2018-07-13 14:20:56 +09:00
20b805f9eb Merge branch 'master' into fix-key-binding-row 2018-07-12 20:06:47 +09:00
24054246b8 Fix DI regression 2018-07-11 17:54:01 +09:00
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
55e0cd770d Use BypassAutoSizeAxes 2018-07-11 11:24:43 +09:00
dd20663192 Lesser keyboard steps 2018-07-10 17:28:56 +02:00
bf1ce8cdd8 Fix linking still being broken 2018-07-10 16:02:13 +09:00
0f649cd231 Merge remote-tracking branch 'origin/master' into fix-beatmap-links 2018-07-10 16:01:56 +09:00
7f315d79c2 Fix pixel gap in user profile when scrolling 2018-07-10 13:06:03 +09:00
d03367ef9e Fix the start animations of username and the closeButton 2018-07-09 23:12:41 +02:00
9f9444d65a Uppercase shear... wtf 2018-07-09 22:59:29 +02:00
73a87914f2 Rename uppcase shear width to lowercase shearwidth 2018-07-09 22:52:14 +02:00
ad96338af7 Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages 2018-07-09 22:47:34 +02:00
ea597916ca Code cleanups 2018-07-09 22:41:53 +02:00
ae093d2619 Merge branch 'master' into Private_Messages 2018-07-09 22:15:36 +02:00
72ea3128fa Use the AT (@) symbol for the background 2018-07-09 22:14:47 +02:00
290b6e5f1d Fix the crash in the visual testcase 2018-07-09 22:09:27 +02:00