1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:07:26 +08:00
Commit Graph

455 Commits

Author SHA1 Message Date
FreezyLemon
c5a7f5b163 Renamed the static variables and made them readonly, aswell as other small adjustments (CI) 2017-12-07 19:39:39 +01:00
FreezyLemon
908553ffaf Added parameter for LoadMultiplayerLobby (CI warning for unused int) 2017-12-07 19:38:03 +01:00
FreezyLemon
e05618a415 Removed unnecessary "using" directives 2017-12-07 19:36:56 +01:00
FreezyLemon
ce9b003e9a Reverted GetUserRequest because spectating is not implemented yet, and thus the additions are not needed (yet) 2017-12-07 16:52:43 +01:00
FreezyLemon
2ceb073b5d Renamed OnClick to OnLinkClicked to (what should be) obvious reasons 2017-12-07 16:30:15 +01:00
FreezyLemon
2129d6cede Renamed the "on click" method to OnClick() and moved most of the implementation to ChatLink.
Also fixed the tooltip text up
2017-12-07 16:23:43 +01:00
FreezyLemon
5ded6e877c Added some tooltip text handling.
Also fixed a bug caused by SameLinkSprites where "this" is actually supposed to be included by just adding a manual function call.
2017-12-07 13:49:44 +01:00
FreezyLemon
8ba66015f4 Implemented the new IHasHoverSounds interface in a private "ChatHoverContainer" class which is now used for ChatLink instances.
Also moved the overhead for finding all sprites in the same line that reference the same URL to the LoadComplete (used to be every hover, now only once).
2017-12-07 13:17:40 +01:00
FreezyLemon
f4f1291919 Removed "wiki:" prefix from wiki links (links are visible on tooltips so this is unnecessary now) 2017-12-07 11:23:31 +01:00
FreezyLemon
8a88040ef5 Added tooltip to links 2017-12-07 11:12:21 +01:00
FreezyLemon
bd11124e6d Removed unnecessary copy (pass-by-reference anyways) 2017-12-07 11:12:12 +01:00
FreezyLemon
1b971c01e6 Fixed a bug where links would be out of order in their List which would cause the game to crash 2017-12-07 10:31:44 +01:00
FreezyLemon
541c25e995 Renamed ChatLinkSpriteText to ChatLink for convenience 2017-12-07 10:28:12 +01:00
FreezyLemon
fd13bacf4a Made default link ID -1 (if no link is present) because linkId is currently being set to link.index which can be 0. 2017-12-04 13:34:16 +01:00
FreezyLemon
c574cc4308 Removed unnecessary "using" statements 2017-12-03 11:16:34 +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
78ff5d81d3 Fixed casting 2017-12-01 21:03:41 +01:00
FreezyLemon
152eb83c42 Added new class for chat lines, that colour the messages after formatting. URLs will become blue, and on hover (also defined here) be turned yellow-ish 2017-12-01 20:33:27 +01:00
FreezyLemon
f5f287bed5 Rolled back the idea that there should be a separate class for formatted messages 2017-12-01 20:25:02 +01:00
FreezyLemon
01bea3bada Re-implemented message formatting (mostly taken from osu-stable code) 2017-12-01 10:56:48 +01:00
smoogipoo
aac41d2de6 Disable resharper inspections on case-by-case basis 2017-11-20 18:55:48 +09:00
MrTheMake
02bc429911 CI fix 2017-09-22 15:37:17 +02:00
MrTheMake
18c26a85ba Added an infoMessage class to represent system messages that aren't errors 2017-09-22 15:30:07 +02:00
MrTheMake
31e26364a6 Initial implementation of chat commands 2017-09-22 01:47:24 +02:00
Dean Herbert
4f4b0a1f35 Allow posting to chat in all channels 2017-09-06 20:26:01 +09:00
Dean Herbert
a9fe1d94f7 Remove unnecessary using 2017-08-21 23:41:51 +09:00
Dean Herbert
7d1c270126 Review fixes 2017-08-21 23:34:08 +09:00
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
DrabWeb
d29ebb139f Cleanup 2017-05-26 03:38:52 -03:00
DrabWeb
fb0b54e66a Remove merge error 2017-05-26 03:28:09 -03:00
DrabWeb
64016f9466 Merge https://github.com/ppy/osu into channel-selection 2017-05-26 03:24:41 -03:00
DrabWeb
a60d1efc21 Basic channel joining (ignore layout in ChatOverlay, temporary) 2017-05-20 21:26:39 -03:00
DrabWeb
7eba619f80 Move Joined to Channel 2017-05-20 19:37:11 -03:00
Huo Yaoyuan
cd065b8ff3 Add back GetHashCode. 2017-05-18 05:27:20 +08:00
Huo Yaoyuan
6c9505fa3a Handle possible nulls. 2017-05-17 18:11:38 +08:00
Huo Yaoyuan
b9b45493e6 Use generic IComparable together with IEqutable for Message. 2017-05-17 18:02:17 +08:00
Dean Herbert
78c1d4581f
Revert "Use generic IComparable for message."
This reverts commit aaaee5ed10.
2017-05-17 13:44:43 +09:00
Huo Yaoyuan
aaaee5ed10 Use generic IComparable for message. 2017-05-16 21:46:22 +08:00
Huo Yaoyuan
d213706d07 Use DateTimeOffset. 2017-05-16 21:14:50 +08:00
Dean Herbert
dcd4b4450d Add error message in chat when attempting to use commands 2017-05-15 13:26:35 +09:00
Dean Herbert
c4a93cbc85 Move drawable chat related classes to better namespace 2017-05-12 15:38:51 +09:00
Dean Herbert
f248efb01f CI Fixes 2017-05-12 13:25:50 +09:00
Dean Herbert
ffa59c6cb3 Support read-only channels, post to correct channel.
Also cache drawable channels better.
2017-05-11 23:51:26 +09:00
Dean Herbert
a77049213d Add basic hard-coded inefficient multi-channel support. 2017-05-11 23:10:48 +09:00
Huo Yaoyuan
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
Dean Herbert
9cb789f426
Use 24 hour display for chat times. 2017-04-20 17:10:05 +09:00
Dean Herbert
dda3fb85ee
Add user colour support. 2017-04-19 19:07:38 +09:00
Dean Herbert
3129708ccb
Add chat sending support. 2017-04-19 18:46:52 +09:00
Dean Herbert
325af333b9
Update API responses for chat. 2017-04-19 18:46:48 +09:00
Dean Herbert
039f4a65dc
Combine user models. 2017-03-28 00:08:24 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dean Herbert
c24a4f57d9
Raise errors on unnecessary using statements. 2017-03-06 19:15:47 +09:00
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
Thomas Müller
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
default0
03889e6ca6 Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
default0
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
5f29b0dc4f
Update in line with framework changes. 2017-02-21 15:46:04 +09:00
Dean Herbert
6a83620589
Add better focus handling and padding/margin updates. 2017-02-20 21:11:09 +09:00
Dean Herbert
4afa434962
Maintain a scroll position when scrolled to the bottom of a chat channel. 2017-02-20 21:10:23 +09:00
Dean Herbert
75b66871dd
Add colourised usernames. 2017-02-20 21:09:56 +09:00
Dean Herbert
7a2eedbd7e
Add message batching per-channel. 2017-02-20 21:09:34 +09:00
Dean Herbert
729f2eec8d
Increase maximum chat history. 2017-02-20 21:07:44 +09:00
Dean Herbert
c6fa5cc803 Fix order of execution when populating initial messages. 2017-02-19 18:46:19 +09:00
Dean Herbert
cde660a8ef Scroll to bottom. 2017-02-19 18:07:35 +09:00
Dean Herbert
aac4ba2baa Add input box to ChatOverlay. 2017-02-19 18:02:25 +09:00
Dean Herbert
0da0ef5a1b Fix padding, fonts and alignment of chat display. 2017-02-19 17:06:41 +09:00
Thomas Müller
4b0d6cd26b Don't rely on default relative size of ScrollContainer. 2017-02-17 20:08:28 +01:00
Thomas Müller
aaaf7163e0
Update framework. 2017-02-13 17:46:50 +09:00
Andrey Zavadskiy
e06aa44c4c Warning Fixes 2017-02-09 16:18:08 +03:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
Drew DeVault
70ecf48ca7 Add central color class
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.

Closes #126
2017-01-09 17:20:31 -05:00
Dean Herbert
18509e6a60 ChatConsole -> ChatOverlay. Namespace tidying. 2016-11-30 18:30:06 +09:00
Huo Yaoyuan
53deaf2a00 Merge branch 'master' 2016-11-16 10:51:39 +08:00
Huo Yaoyuan
c8d23408d7 Fix ChatLine for now. 2016-11-15 01:49:05 +08:00
Dean Herbert
0f4538f69f Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
Thomas Müller
ac99e2d488 Avoid using load to construct the drawable hierarchy whereever possible. 2016-11-12 18:34:36 +01:00
Dean Herbert
cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
2016-11-12 20:18:26 +09:00
Drew DeVault
ee24cd310c Convert everything to DI pattern 2016-11-10 16:41:18 -05:00
Dean Herbert
b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
Dean Herbert
28a41dcca6 Fix FlowContainers. 2016-10-22 18:05:46 +09:00
Dean Herbert
cdef75c98b Fix AutoSize references. 2016-10-22 17:50:42 +09:00
Thomas Müller
7751a85e14 Update framework. 2016-10-16 14:10:06 +02:00
Huo Yaoyuan
aad5c6a44d Use DateTimeOffset for message timestamp. 2016-10-13 21:42:51 +08:00
Dean Herbert
8707c7f746 Fix regression causing multi-line (wrapped) chat messages to overlap. 2016-10-13 03:06:06 +09:00
Dean Herbert
aa96d98822 Merge branch 'master' into limit-game-access
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
	osu.Game/GameModes/Menu/ButtonSystem.cs
	osu.Game/Online/Chat/Display/ChatLine.cs
	osu.Game/OsuGame.cs
	osu.Game/Overlays/ToolbarButton.cs
2016-10-12 20:44:33 +09:00
Dean Herbert
4052a665bf Remove all non-load Game access. 2016-10-12 15:47:08 +09:00
Dean Herbert
1c0b769451 Centralise the maximum chat history variable. 2016-10-12 15:25:07 +09:00
Dean Herbert
05031d18ef Fix some display regressions in ChatConsole. 2016-10-12 13:35:21 +09:00
Dean Herbert
c0ea061bd4 Update framework; amend ToolbarButton to use padding and Children initialiser. 2016-10-12 12:24:07 +09:00
Dean Herbert
97c2dcf590 Use PaddingContainer for better layout. 2016-10-08 23:25:38 +09:00
Dean Herbert
47faf8f40d Add in-game chat display, along with a global hotkey handling method. 2016-10-08 19:23:21 +09:00
Dean Herbert
3067c890ce General improvements to chat querying and logic organisation. 2016-10-08 19:23:21 +09:00
Dean Herbert
ac16bffe49 Bring framework and resources up-to-date. 2016-10-01 19:05:26 +09:00
Dean Herbert
b4c9dca54b Merge remote-tracking branch 'upstream/master' into api-channels-messages
Conflicts:
	osu.Game/Online/Chat/Message.cs
2016-09-29 23:54:33 +09:00
Dean Herbert
a69c5b4fc0 Fix a few warnings. 2016-09-29 23:46:27 +09:00
Dean Herbert
7c98ef1b3d Move initialisation of ChatLine to Load. 2016-09-28 16:33:20 +09:00
Dean Herbert
67652a6d8e Improve formatting of chat lines. 2016-09-27 20:45:26 +09:00
Dean Herbert
754d9c78bd Simple chat message display functionality. 2016-09-27 19:22:22 +09:00
Dean Herbert
28045b7136 Add back basic API support for channel/message retrieval. 2016-09-27 18:33:52 +09:00
Dean Herbert
8870935a4b Add basic online API support. 2016-08-31 20:14:01 +09:00