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

2798 Commits

Author SHA1 Message Date
Dean Herbert
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
miterosan
21c9353fee Remove not used usings 2018-11-21 23:15:45 +01:00
miterosan
a14b6ac9df Replace ObservableCollection with BindableCollection 2018-11-21 23:15:44 +01:00
smoogipoo
cd2737156f Fix crashes when importing/deleting from model managers 2018-11-21 23:11:09 +01:00
smoogipoo
39e9c61e24 OpenTK -> osuTK 2018-11-21 23:11:08 +01:00
Dean Herbert
7755242a43
Merge branch 'master' into osuTK 2018-11-21 18:53:11 +09:00
Dean Herbert
eab2776755 Fix a crash on leaving the selected channel 2018-11-21 17:15:15 +09:00
smoogipoo
5ad96afea0 Fix crashes when importing/deleting from model managers 2018-11-20 18:09:23 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert
23a446bab2 Add support for all channel types 2018-11-20 15:03:55 +09:00
Roman Kapustin
376e76e00d Resolve merge conflicts 2018-11-18 16:10:36 +03:00
Dean Herbert
d09b674fb3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-16 20:36:08 +09:00
Dean Herbert
b574a07f23 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-15 13:31:34 +09:00
HoLLy
9dd3d28436 Fix SettingsTextBox having width of 0 2018-11-14 22:29:11 +01:00
smoogipoo
f1f2fc133a Use SkinInfo directly 2018-11-14 19:29:20 +09:00
smoogipoo
aff5fa6169 Update with osu!-side dropdown changes 2018-11-14 18:02:38 +09:00
Dean Herbert
396a5b3cd0
Merge branch 'master' into Private_Messages 2018-11-14 12:49:54 +09:00
Dean Herbert
b9278b3488 Fix brackets 2018-11-14 12:05:07 +09:00
Dean Herbert
c77412992e Merge conditionals 2018-11-14 11:53:34 +09:00
Dean Herbert
f241fcdba1 Add back support for new API and private messages 2018-11-13 15:20:59 +09:00
Dean Herbert
4b1282235a Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-12 20:41:10 +09:00
Dean Herbert
86aab9c31b Fix chat making needless requests 2018-11-10 08:54:56 +09:00
gotopie
4c9dcdf156 hide seekbar when no song is playing 2018-11-02 19:04:30 -04:00
Roman Kapustin
b4809f4417 External link warning code cleanup 2018-11-01 23:52:07 +03:00
Dean Herbert
0f1ffe392f Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-01 17:52:24 +09:00
Dean Herbert
94093ac948 Update beatmap search API to match latest osu-web structure 2018-10-23 18:05:41 +09:00
Roman Kapustin
805f8d98c4 Implement warn about opening external links option 2018-10-22 23:57:37 +03:00
Roman Kapustin
b4c68f4cf7 Show a warning prior to opening external links 2018-10-22 23:16:57 +03:00
Dean Herbert
aaa8aca695 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-10-20 23:00:56 +09:00
Paul Teng
7720fa10eb Reduce height of RankChartLineGraph 2018-10-17 20:19:01 -04:00
Dean Herbert
a4bb4255b1 Add grouping manager 2018-10-13 07:10:13 +09:00
Dean Herbert
77055f6d5c Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-10-12 18:49:47 +09:00
Dean Herbert
f7c887cf79
Merge branch 'master' into debounce-seeks 2018-10-12 17:50:39 +09:00
Paul Teng
2181f34f74
Merge branch 'master' into result-no-gamemode-switch 2018-10-10 06:43:01 -04:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
Paul Teng
a91dda1a89
Merge branch 'master' into result-no-gamemode-switch 2018-10-09 13:04:53 -04:00
Paul Teng
ae79c3832e Add base. for safety 2018-10-09 11:05:15 -04:00
smoogipoo
ccb6723711 Debounce music controller seeks 2018-10-09 16:50:29 +09:00
Dean Herbert
a171ed3500 Fix joined channels not appearing as joined in the channel list 2018-10-09 16:12:20 +09:00
Paul Teng
ca9cbf1aea Fix rulsets being completed unselectable 2018-10-06 07:51:56 -04:00
Paul Teng
8b27741cb0 Do not propagate positional input to subtree 2018-10-05 11:37:44 -04:00
Paul Teng
8264dd49de Update bindable only if enabled 2018-10-05 07:13:18 -04:00
Dean Herbert
716eee9a5c Fix last visit not supporting null values
Can now be null if a user chooses to hide their online status
2018-10-05 00:25:40 +09:00
ekrctb
68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00
ekrctb
b7a2ad1aa5 Use UIEvent level getters for modifier keys. 2018-10-02 13:26:36 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
Dan Balasescu
b1450b1f1a
Merge branch 'master' into fix-3514 2018-10-02 09:24:58 +09:00
AtomCrafty
6c55efdf20 Add true to BindValueChanged call to hide resolution dropdown when starting in windowed mode 2018-10-01 13:12:34 +02:00
Hanamuke
b983e20067 Merge branch 'master' into AR_Catch 2018-09-30 16:01:55 +02:00
Dean Herbert
862d3c4a69 Add back autojoins 2018-09-28 19:33:35 +09:00
Dean Herbert
3cacc11af1 Fix outdated API variable 2018-09-28 19:33:30 +09:00
Dean Herbert
e1c187b641 Merge remote-tracking branch 'origin/update-chat-api' into update-framework 2018-09-28 18:23:09 +09:00
Dean Herbert
d5d8a28b53 Add explanatory comment about startup channel joins 2018-09-28 10:01:25 +09:00
Dean Herbert
f0b1aa7edf Fix unnecessary messages retrieval 2018-09-27 20:04:22 +09:00
Dean Herbert
1b77d9fd05 Merge branch 'update-chat-api' into update-framework 2018-09-26 19:50:23 +09:00
Dean Herbert
1fd2782dd4 Fix loading spinner not disappearing on empty channels 2018-09-26 19:15:02 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
7cd547a760 Update chat to work with new API version 2018-09-25 20:53:24 +09:00
Dean Herbert
2f2dcec8c7 Complete editing support 2018-09-22 06:32:30 +09:00
Dean Herbert
dafbabec31 Fix import buttons having incorrect mappings when setting disabled states 2018-09-21 21:08:21 +09:00
Dean Herbert
aa453f8ff8 Merge remote-tracking branch 'smoogipoo/fix-fullscreen-crash' into update-framework 2018-09-20 19:03:49 +09:00
Dean Herbert
1861547c86 Apply review 2018-09-20 19:01:04 +09:00
Dean Herbert
37f3035437 Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-20 18:39:48 +09:00
smoogipoo
7b8094d731 Move text size/padding out of constructor 2018-09-20 12:53:45 +09:00
Hanamuke
e7d78b94ae Remove ScrollingVisualisation from settings 2018-09-19 18:30:25 +02:00
Dean Herbert
ae4c371bec Merge branch 'update-framework-event-handling' into update-framework 2018-09-20 00:29:42 +09:00
smoogipoo
73fb3fa3a4 Fix macOS crashing in fullscreen mode 2018-09-19 17:52:35 +09:00
smoogipoo
28f31540c4 Apply changes in-line with framework localisation changes 2018-09-19 14:07:46 +09:00
ekrctb
b790e16217 Use Click instead of now removed TriggerOnClick 2018-09-19 11:42:32 +09:00
Dan Balasescu
ad31962643
Cleanup, use similar code to everywhere else 2018-09-18 15:27:21 +09:00
LastExceed
27ea6102bc only return true on Mclick 2018-09-18 08:07:19 +02:00
LastExceed
fce9740f28 return true since we are handling the action 2018-09-15 18:00:47 +02:00
Joehu
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
LastExceed
9f546bd484 close tab on Mclick 2018-09-14 13:50:35 +02:00
Dean Herbert
4341d258af Make readonly instead 2018-09-13 14:03:21 +09:00
Dean Herbert
0be3ba946f Fix system user attempting to show in profile overlay 2018-09-13 13:40:46 +09:00
Dean Herbert
5d264fdbdd Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-09-11 13:56:57 +09:00
Dean Herbert
f149a66a4d Use LargeTextureStore for all online texture retrieval
Until now, many online textures were retrieved via the default texture store, which causes them to never be removed from GPU memory. It also has a performance overhead due to mipmap generation (which will be avoided via ppy/osu-framework#1885.
2018-09-09 02:45:37 +09:00
Dean Herbert
6c150c9ed7 Remove unnecessary override 2018-09-08 03:21:42 +09:00
Dean Herbert
c1cdff8505 Add default resolution to avoid crashing 2018-09-07 19:29:51 +09:00
Dean Herbert
bb67f1a361 Merge remote-tracking branch 'upstream/master' into add-skin-import-delete 2018-09-07 18:18:03 +09:00
Dean Herbert
81da7ce298
Merge branch 'master' into add-skin-import-delete 2018-09-07 16:48:01 +09:00
Dean Herbert
2c0ba401d5 Add ability to click on imported complete notification to present last import 2018-09-07 16:30:11 +09:00
Dean Herbert
bf0ad723f5 Add default fallback for headless operation 2018-09-07 14:35:38 +09:00
Dean Herbert
f76d00e8ae Simplify null checks 2018-09-07 14:31:38 +09:00
Dean Herbert
8b217ad803
Merge branch 'master' into select_resolution_in_fullscreen_mode 2018-09-07 14:25:10 +09:00
Dean Herbert
ab7c0ccd18 Merge remote-tracking branch 'smoogipoo/spritetext-rewrite' into update-framework-with-everyrthing 2018-09-06 18:00:54 +09:00
Dean Herbert
1f47714786
Merge pull request #3355 from peppy/fix-toolbar-blip
Fix the toolbar being visible during startup causing a weird offset
2018-09-06 17:35:24 +09:00
Dean Herbert
0cefd89ef7 Change transition to match, looks better 2018-09-06 17:22:51 +09:00
Dean Herbert
a9d4b56aeb
Merge branch 'master' into fix-web-request-schedules 2018-09-06 17:18:09 +09:00
Dean Herbert
016e395787 Fix disposal logic 2018-09-06 17:11:23 +09:00
Dean Herbert
ccd7c1a17d Cancel request on disposal for safety 2018-09-06 17:04:33 +09:00
Dean Herbert
6a668ffe33 Allow PrivateChannelTab to derive from ChannelTab 2018-09-06 17:00:07 +09:00
Dean Herbert
119f81b86e Fix disposal issues in ChatOverlay testcase 2018-09-06 15:56:04 +09:00
smoogipoo
d5acc96efa Apply changes in line with osu!framework changes 2018-09-05 14:59:37 +09:00
Joehu
77455e4463 Fix direct list play button disappearing after preview/switch 2018-09-04 19:44:49 -07:00
Dean Herbert
581da108fc Rewrite to not suck 2018-09-05 11:32:38 +09:00
Dean Herbert
46b6601cbf Merge remote-tracking branch 'upstream/master' into select_resolution_in_fullscreen_mode 2018-09-05 10:47:34 +09:00
Dean Herbert
da3eb18784 Fix the toolbar being visible during startup causing a weird offset 2018-09-05 10:46:19 +09:00
Dean Herbert
923acfbeaf Fix some web requests being run after disposal of their owner 2018-09-05 10:26:54 +09:00
Dean Herbert
ce92c8d2eb
Merge branch 'master' into Private_Messages 2018-09-05 02:40:02 +09:00
Dean Herbert
5efa9c7652 Fix items in skin settings not always being removed corrrectly 2018-09-03 11:51:03 +09:00
Dean Herbert
144e80dff6 Add "import all skins from stable" option (and mass delete) 2018-09-03 10:10:04 +09:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
Dean Herbert
37bae8c840 Merge remote-tracking branch 'upstream/master' into smoogipoo-update-framework 2018-08-30 14:58:25 +09:00
smoogipoo
327bc708d7 Fix DirectOverlay performing webrequests on startup 2018-08-30 14:41:09 +09:00
smoogipoo
e7a5816d27 Use GetAsync for all samples 2018-08-27 17:30:16 +09:00
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
Dean Herbert
4376ad107e
Merge branch 'master' into Private_Messages 2018-08-24 17:26:33 +09:00
Dean Herbert
9f3f07df2e Fix notifications appearing too early in load process 2018-08-23 11:21:56 +09:00
smoogipoo
ce367bcc42 Fix invalid GC latency mode being set 2018-08-22 12:02:14 +09:00
Dean Herbert
22dce64d6d
Merge branch 'master' into circular-button 2018-08-21 19:15:20 +09:00
smoogipoo
aa3f6337a2 Add comment 2018-08-15 09:14:07 +09:00
smoogipoo
f69bc23ab8 Overflow mod select to account for parallax 2018-08-14 17:26:25 +09:00
smoogipoo
2a5b9f79ff Indent 2018-08-08 15:49:27 +09:00
smoogipoo
ee0cefdd5b Merge remote-tracking branch 'origin/master' into direct-list-view 2018-08-08 15:48:34 +09:00
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
smoogipoo
464333cf0b Merge remote-tracking branch 'origin/master' 2018-07-26 21:28:31 +09:00
Dean Herbert
95cca046fb Merge branch 'master' into open-downloaded-beatmas 2018-07-25 12:38:49 +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
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
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
5fe634a3b6 Click download button to load beatmap 2018-07-18 13:18:50 +09: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
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