Max Hübner
|
f7b9ddb48c
|
combine Text and TextBold
|
2019-07-28 12:40:21 +02:00 |
|
Max Hübner
|
df8d4d8966
|
add truncation to base class
|
2019-07-28 12:16:32 +02:00 |
|
Max Hübner
|
c6d4ce0f8a
|
revert truncation in derived class
|
2019-07-28 12:14:06 +02:00 |
|
Max Hübner
|
edf6453e04
|
truncate long usernames in private chat
|
2019-07-27 18:56:37 +02:00 |
|
Dean Herbert
|
56b27db7a4
|
Use "Click" instead of "Action"
|
2019-07-26 13:17:33 +09:00 |
|
Dean Herbert
|
7ec6ac7b0e
|
Remove unnecessary override
|
2019-07-26 13:15:36 +09:00 |
|
Max Hübner
|
78a8a6490e
|
close chat tabs with middle mouse button
|
2019-07-24 17:17:29 +02:00 |
|
Dean Herbert
|
704fe2d655
|
Remove text shadow in chat
|
2019-07-23 16:04:50 +09:00 |
|
Dean Herbert
|
e6c1b059bc
|
Disable dimming main content
|
2019-07-01 18:49:36 +09:00 |
|
David Zhao
|
e92c1ca009
|
Fix styling, private tabClosed, remove type check
|
2019-06-26 19:25:54 +09:00 |
|
David Zhao
|
6c8cc9728f
|
fix channel selector not being closed
|
2019-06-26 12:00:58 +09:00 |
|
Dan Balasescu
|
c79c4641f3
|
Merge branch 'master' into use-modelbackeddrawable
|
2019-06-21 14:26:07 +09:00 |
|
Dean Herbert
|
4a25a84975
|
Fix DrawableChannel async flow
|
2019-06-20 23:01:39 +09:00 |
|
Dean Herbert
|
4ef165fdac
|
Fix ChatLine not being correctly loaded asynchronously
|
2019-06-20 23:01:02 +09:00 |
|
KingLuigi4932
|
fec0db8fe1
|
Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar
|
2019-06-17 21:55:07 +03:00 |
|
Dean Herbert
|
bc574520bf
|
Update ScrollContainer usages in line with framework changes
|
2019-06-14 15:55:32 +09:00 |
|
LeNitrous
|
516575a132
|
don't create "Start Chat" option when the sender is the local user
|
2019-06-03 18:54:29 +08:00 |
|
Paul Teng
|
7adaa09263
|
Move tab channel class into tab item class
|
2019-05-12 06:31:11 -04:00 |
|
Paul Teng
|
8957ad5a7e
|
Instantiate channel in tab item
|
2019-05-12 06:26:03 -04:00 |
|
Paul Teng
|
496a9dd41d
|
Create separate type for Join-Channel button
|
2019-05-12 06:02:21 -04:00 |
|
smoogipoo
|
d7c09e7dbd
|
Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
|
2019-05-07 13:20:17 +09:00 |
|
Dean Herbert
|
d40177f97c
|
Merge branch 'master' into drawnode-composability
|
2019-04-27 18:41:19 +09:00 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
smoogipoo
|
772bef91fa
|
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
|
2019-04-08 23:01:12 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
Dean Herbert
|
c39c37a18d
|
Apply more missed cases
|
2019-04-01 12:44:46 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Dean Herbert
|
2f5668f4e7
|
Fix remaining framework changes
|
2019-03-29 00:29:14 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Dean Herbert
|
9a11a08acc
|
Update textbox usages
|
2019-03-23 02:00:27 +09:00 |
|
Dean Herbert
|
c496f6e56b
|
Fix usages of OnLoadComplete
|
2019-03-17 13:44:20 +09:00 |
|
smoogipoo
|
268ea6a836
|
Wrong line
|
2019-03-02 13:28:16 +09:00 |
|
smoogipoo
|
83a02d32f7
|
Fix a few incorrect fonts
|
2019-03-02 13:25:59 +09:00 |
|
Dean Herbert
|
0788a7e9f1
|
Merge branch 'master' into more-inspections
|
2019-02-28 14:32:57 +09:00 |
|
Dean Herbert
|
42be7857d1
|
Use expression body for property get/set where possible
|
2019-02-28 13:58:19 +09:00 |
|
Dean Herbert
|
26d53d06a9
|
Fix remaining issues
|
2019-02-28 13:31:40 +09:00 |
|
Dean Herbert
|
3015d40f8f
|
Merge branch 'master' into osu-fontusage
|
2019-02-22 18:09:23 +09:00 |
|
Dean Herbert
|
3fe4b8fd1c
|
Update variable names
Also cleans up some weird code
|
2019-02-22 17:51:39 +09:00 |
|
smoogipoo
|
d8c55bc729
|
Adjust namespaces
|
2019-02-21 19:05:52 +09:00 |
|
smoogipoo
|
bca347427f
|
Update with framework bindable changes
|
2019-02-21 18:56:34 +09:00 |
|
smoogipoo
|
4db5531e4b
|
Replace copy-constructor/method with extension method
|
2019-02-20 19:32:30 +09:00 |
|
smoogipoo
|
dbfa95b9e7
|
Made medium the default font weight
|
2019-02-20 16:52:36 +09:00 |
|
smoogipoo
|
a2aa3ec5cb
|
Adjust sprite texts in-line with framework changes
|
2019-02-20 15:03:20 +09:00 |
|
Dean Herbert
|
260034a80e
|
Don't auto-focus textboxes when on screen keyboard would cause inconvenience
|
2019-01-25 19:20:29 +09:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
Unknown
|
6eff79913b
|
remove blank lines
|
2019-01-11 10:34:56 +01:00 |
|
Dean Herbert
|
8b25e4c9ee
|
Fix searching for "channel" matching all channels
|
2019-01-03 12:04:36 +09:00 |
|
smoogipoo
|
40db23ff4c
|
Disable avatar clicks in chat tabs
|
2018-12-22 19:30:52 +09:00 |
|
Dean Herbert
|
81104f4803
|
Make standalone chat reuse more code from main chat overlay
|
2018-12-21 17:54:12 +09:00 |
|
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 |
|
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 |
|