1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 15:27:26 +08:00
Commit Graph

274 Commits

Author SHA1 Message Date
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
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
Shane Woolcock
84bda7d23f Update framework and ensure the add channel button is not switchable 2018-04-24 20:46:44 +09:30
miterosan
29e8c70ed7 Only use one tabControl (channeltabcontrol). Fix that the Channel messages did not refresh. 2018-04-18 20:46:42 +02: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
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09: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
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
aa26ea483d remove using, remove empty agrument list 2018-04-08 22:43:01 +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
56de6c1067 Rename Channel to ChannelChat 2018-03-28 21:11:06 +02:00
smoogipoo
78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
Dean Herbert
e5188fd151 Add better channel test cases (testing non-existent channels) 2018-01-30 17:43:19 +09:00
FreezyLemon
174fdf5037 Nicer code to remove non-existent channels from links 2018-01-11 18:51:20 +01:00
FreezyLemon
3bf9901dd2 Fixed bugs and added tests 2018-01-09 16:11:45 +01: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
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
FreezyLemon
e7721d71f3 Changed chat link implementation according to review 2017-12-31 00:51:47 +01: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
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
FreezyLemon
c4f5754f94 Fixed only the links being italics for /me messages 2017-12-27 02:14:45 +01:00
FreezyLemon
962e4d7c8a Removed LinkId and word wrapping (for now).
Also reimplemented the OsuHoverContainer properly
2017-12-25 20:46:04 +01:00
FreezyLemon
34a37935e3 Removed unused property and unnecessary return statement (CI) 2017-12-07 19:38:59 +01:00
FreezyLemon
772bba27be Small style changes 2017-12-07 16:41:46 +01:00
FreezyLemon
d90eb2cdce Moved "Does this channel exist" check to ChatLine so that if a #name does not exist as a channel, it does not get added as a link (and does not contain a URL or anything else to prevent jankiness) 2017-12-07 16:26:28 +01:00
FreezyLemon
541c25e995 Renamed ChatLinkSpriteText to ChatLink for convenience 2017-12-07 10:28:12 +01:00
FreezyLemon
7bf25bdd4d Changed it so the ":" character does not appear after usernames when the displayed message is an action (e.g. /np). Just makes more sense imo 2017-12-07 10:23:57 +01:00
FreezyLemon
63a6a8b669 Fixed messages sent by yourself not being formatted 2017-12-04 19:31:48 +01:00
FreezyLemon
cf96323980 Added new OsuLinkSpriteText.TextColour property that sets the internal content (OsuHoverContainer)'s colour instead of the whole container, so that text colour is always changed through that (e.g. link colouring, link hover fade).
Implemented it to be used when adding text to an OsuLinkTextFlowContainer.
2017-12-04 13:33:42 +01:00
FreezyLemon
3f336b8e61 Made the style a bit better, fixed a bug or two 2017-12-03 21:02:05 +01:00
FreezyLemon
0aced85908 Changed the LinkID to the link's own Index instead of the previous one (just makes more sense imo) 2017-12-02 09:47:59 +01:00
FreezyLemon
ade7311c15 Updated implementation to be based around a "LinkId" (atm the position of the link, anything unique to a link inside its message will be fine), which does not allow matching (OnHover related) between different links 2017-12-01 21:31:12 +01:00
FreezyLemon
7f1f886406 implemented method formatting into chat. Also added all necessary files to the .csproj 2017-12-01 21:04:24 +01:00
Dean Herbert
ac7e373f40 Add hover/click sound effects to more stuff everywhere 2017-11-26 17:21:21 +09:00
MrTheMake
29707788f9 Code formatting 2017-09-22 15:29:04 +02:00
MrTheMake
dc5c046d4b Fixed wrong action message color 2017-09-22 14:33:20 +02:00
MrTheMake
3e8941f8e1 Fix chat message style for non action messages 2017-09-22 11:35:07 +02:00
MrTheMake
dce577f92a Updated design 2017-09-22 11:30:01 +02:00
MrTheMake
31e26364a6 Initial implementation of chat commands 2017-09-22 01:47:24 +02:00
Dean Herbert
b7c9819680 Add context menus to chat names and user panels 2017-09-14 15:43:47 +09:00
MrTheMake
89b5a6670e Changed type of IHasFilterTerms.FilterTerms according to framework update 2017-09-13 16:18:02 +02:00
MrTheMake
5c125737cb Fix wrong initial topic color of not joined channels in the channel selection 2017-09-08 17:47:23 +02:00
Dean Herbert
e5308b6247 Method rename 2017-09-06 23:12:32 +09:00
Dean Herbert
da294c9605 Don't use base call when we don't have to 2017-09-06 23:10:08 +09:00
Dean Herbert
4f49a0c183 Simplify action 2017-09-06 22:58:21 +09:00
Dean Herbert
a7fa66b9f9 Fix CI issue 2017-09-06 22:41:03 +09:00
Dean Herbert
940c45b6d1 Fix visual styling and code styling 2017-09-06 21:43:20 +09:00
naoey
3f403ba524 Merge remote-tracking branch 'upstream/master' into quit-chat-channels 2017-08-24 10:06:29 +05:30
naoey
2cace0e1ab Don't use virtual methods in ctor, always create closeButton. 2017-08-24 09:48:53 +05:30
Dean Herbert
1d0b89d592 Restore usage of AddRange 2017-08-21 18:51:14 +09:00
Dean Herbert
877c69d5fe Add local chat echo support 2017-08-21 17:43:26 +09:00
naoey
7ad4c046db Make current value behaviour between channels and tabs consistent.
- Trim whitespace
2017-08-18 13:35:48 +05:30
naoey
4f7ae1ed8b Clear messages when the current channel is removed.
- Stop using TabContainer.Children
2017-08-17 09:00:45 +05:30
Dean Herbert
a5007fc64f Fix some remaining usage of local InputManager instances 2017-08-16 13:07:18 +09:00
naoey
381c709639 Fix selectorTab Depth if it's wonky when new tabs are added. 2017-08-14 10:11:34 +05:30
naoey
8dbbc623c7 Add next tab selection logic in game, make IsRemovable public.
- Don't clear DrawableChannel when unjoined
2017-08-14 10:11:30 +05:30
naoey
3b6ffadcc7 Renaming to match framework changes.
- IsClosable -> IsRemovable
- EasingTypes -> Easing
- Also remove all messages on a channel being un-joined
2017-08-14 10:11:25 +05:30
naoey
2ae3ce8b91 Add ability to close chat tabs. 2017-08-14 10:11:14 +05:30
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
ed7bb329de Add word wrap support to chat 2017-07-24 18:11:25 +09:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
e36b65bfe0 Merge branch 'master' into better-transforms 2017-07-22 10:50:58 +02:00
Dean Herbert
7549d3a2c4 Allow ChatLines to exist without UserProfileOverlay
Fixes testcases failing when logged in.
2017-07-22 17:18:20 +09:00
Thomas Müller
2cd8f6b30c Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-21 11:15:26 +02:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-19 19:15:51 +02:00
Dean Herbert
2c5019ff7c Forward action in saner way 2017-07-19 18:22:46 +09:00
Dean Herbert
b6b7ae47db Merge branch 'master' into user-profile-fixes 2017-07-19 18:15:38 +09:00
Thomas Müller
a225b542d5 Sender is always non-null 2017-07-18 12:35:36 +03:00
Thomas Müller
fce5a191f1 Migrate padding into the scroll content to not cut off effects 2017-07-18 12:26:27 +03:00
Thomas Müller
e58ea97604 Improve design as requested 2017-07-18 12:26:05 +03:00
Thomas Müller
e72c009dd7 Highlight custom-named users 2017-07-18 10:53:41 +03:00
Jorolf
b9eb7a8445 make chat message users open UserProfileOverlay 2017-07-17 20:26:55 +02:00
Thomas Müller
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Dean Herbert
9d47dd9ff9 Add support for right mouse absolute scrolling (when enabled)
Will likely need to be bindable when hooked up to settings and actually used.
2017-07-12 18:57:44 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Dean Herbert
ee96d39b93 Shuffle sound samples around and make more conformant 2017-06-28 10:19:04 -07:00
Dean Herbert
28f0da606a Add OsuFocusedOverlayContainer with predefined sounds. 2017-06-28 10:18:12 -07:00
Thomas Müller
1bca9ca0e9 Update framework with better children list 2017-06-24 12:56:35 +02:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
Dean Herbert
3efe8629d6 Fix hacky tabs 2017-06-12 18:39:22 +09:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
Dean Herbert
64682a741c Update framework 2017-06-08 17:05:25 +09:00
Dean Herbert
d9106c4e30 Temporarily disable inspection 2017-06-05 21:58:13 +09:00
Dean Herbert
16fcfc473d Fix toggle not toggling on pressing escape
Also add comment about hacky implementation of toggle tab.
2017-06-05 18:04:40 +09:00
Dean Herbert
778865b6eb Merge remote-tracking branch 'upstream/master' into channel-selection 2017-06-05 17:36:14 +09:00
DrabWeb
d81ff9cbc2 Add visual states for ChannelSelectorTabItem 2017-06-02 01:41:55 -03:00
DrabWeb
62ada0afcb Make the add tab item unselectable and toggle the channel list 2017-06-01 20:46:18 -03:00
DrabWeb
697fab9248 Reselect the chosen tab when closing the channel list 2017-06-01 20:22:09 -03:00
DrabWeb
ecb0c2f68f Cleanup ChannelListItem Joined binding 2017-06-01 07:55:01 -03:00
Dean Herbert
5b80c8ac49 Load initial channel content asynchronously
Quite often, the first time loading a chat channel will be loading font characters (textures) that were previously never displayed. This stops the game from stuttering in such a scenario.
2017-06-01 18:29:34 +09:00
DrabWeb
fad5b4ca9d Speed up animations 2017-06-01 06:10:26 -03:00
DrabWeb
a707d63647 Fix visual errors if spamming close/open on channel list 2017-06-01 05:41:21 -03:00
DrabWeb
d728c87cca Fix janky opening transition when resizing the chat and reopening the channel list 2017-06-01 05:26:01 -03:00
DrabWeb
52d524a65e Update with framework changes 2017-05-31 22:39:03 -03:00
DrabWeb
b9292b6240 Merge https://github.com/ppy/osu into channel-selection 2017-05-29 22:06:05 -03:00
DrabWeb
2ba86cffa6 Channel list item hover effect 2017-05-29 22:04:53 -03:00
DrabWeb
d8e86da78c Better scroll dragger position 2017-05-29 22:00:15 -03:00
Dean Herbert
fde579262f User a simpler method to hide the background icon 2017-05-30 09:54:29 +09:00
DrabWeb
d29bf58817 Show scroll dragger 2017-05-29 21:50:15 -03:00
DrabWeb
50e50ce67e Update with framework changes 2017-05-29 20:33:28 -03:00
DrabWeb
b88c07f1a0 Make channel readonly 2017-05-27 17:49:57 -03:00
DrabWeb
754fe956f9 Make ChannelSection headers uppercase in the setter 2017-05-27 17:40:20 -03:00
DrabWeb
b632e7f1ad Accept Channel in ctor and remove Channel property 2017-05-27 17:35:42 -03:00
Jorolf
1e4bca90f0 remove duplicate code 2017-05-26 12:10:16 +02:00
DrabWeb
38d0138978 CI fixes 2017-05-26 04:11:45 -03:00
DrabWeb
ae96ef08f7 Tab character 2017-05-26 04:02:04 -03:00
DrabWeb
4c551270e9 Add OnRequestLeave 2017-05-26 03:56:10 -03:00
DrabWeb
d632435a34 Make ChannelListItems scale better 2017-05-26 03:51:09 -03:00