1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 18:07:24 +08:00
Commit Graph

195 Commits

Author SHA1 Message Date
Styphix
bacc07f5ec Changed OsuFocusedOverlayContainer to WaveOverlayContainer from ChannelSelectionOverlay
Not sure what colour i shouldve gone for but im certain that this should be fine
2018-12-18 19:44:31 -05:00
Dean Herbert
2122966cd4 Show channel selector when no channels are joined 2018-12-07 13:26:31 +09:00
Dan Balasescu
f278dff49c
Merge branch 'master' into fix-chat-crash 2018-12-03 19:17:05 +09:00
Dean Herbert
14d9f1d8bb Fix hard crash due to out-of-order chat sequencing 2018-12-03 18:13:10 +09:00
smoogipoo
814d401eb0 Make ChannelSelectorTabItem not switchable 2018-12-03 11:48:36 +09:00
smoogipoo
7255a01bf5 Remove ChatTabControl 2018-12-03 11:48:21 +09:00
smoogipoo
cadfe41f83 Merge remote-tracking branch 'origin/master' into external_link_warning 2018-11-23 15:19:52 +09:00
smoogipoo
df004d7a49 Adjust dialog text 2018-11-23 15:19:15 +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
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
Roman Kapustin
b4809f4417 External link warning code cleanup 2018-11-01 23:52:07 +03:00
Roman Kapustin
b4c68f4cf7 Show a warning prior to opening external links 2018-10-22 23:16:57 +03:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +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
LastExceed
9f546bd484 close tab on Mclick 2018-09-14 13:50:35 +02:00
Dean Herbert
0cefd89ef7 Change transition to match, looks better 2018-09-06 17:22:51 +09:00
Dean Herbert
6a668ffe33 Allow PrivateChannelTab to derive from ChannelTab 2018-09-06 17:00:07 +09:00
miterosan
cc640893c2
Merge branch 'master' into Private_Messages 2018-08-04 00:33:46 +02: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
Dean Herbert
70ee7e4afd Scroll chat to end of buffer when posting a new message 2018-08-02 08:00:14 +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
95cb21299a Remove chatTabControl and transfer the logic into ChannelTabControl. 2018-07-29 21:18:37 +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
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
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
ea597916ca Code cleanups 2018-07-09 22:41:53 +02:00
miterosan
72ea3128fa Use the AT (@) symbol for the background 2018-07-09 22:14:47 +02: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
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