1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-26 04:32:55 +08:00
Commit Graph

263 Commits

Author SHA1 Message Date
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
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
miterosan
290b6e5f1d Fix the crash in the visual testcase 2018-07-09 22:09:27 +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
1589b65494 Move tab related stuff to /tabs, move selection related stuff to /selection, remove channeltabcontrol 2018-07-09 19:42:57 +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
Dean Herbert
49a683e386 Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages 2018-05-31 14:50:20 +09:00
smoogipoo
2d6b2d10f7 Use bindable transforms 2018-05-02 18:26:23 +09:00
miterosan
29e8c70ed7 Only use one tabControl (channeltabcontrol). Fix that the Channel messages did not refresh. 2018-04-18 20:46:42 +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
a9f3885d28 Remove not needed using 2018-04-12 23:29:23 +02:00
miterosan
e39f5a1adf Rename var chatmanager -> channelManager
Apply requested changes
2018-04-12 23:19:13 +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
762b4412e5 Convert if to switch 2018-04-09 22:29:48 +02:00
miterosan
2a314f052a Trim more whitespace 2018-04-08 22:28:50 +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
c937789684 Rename GetMessagesRequest to GetChannelMessagesRequest 2018-03-28 21:33:50 +02:00
miterosan
56de6c1067 Rename Channel to ChannelChat 2018-03-28 21:11:06 +02:00
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
Dean Herbert
f2b3d9a0e8 Change some missed instances 2018-02-22 14:17:35 +09:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +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
smoogipoo
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
Dean Herbert
faf1181fc3
Merge branch 'master' into url-parsing-support 2018-01-02 17:51:50 +09:00
FreezyLemon
e7721d71f3 Changed chat link implementation according to review 2017-12-31 00:51:47 +01:00
Dean Herbert
8733f809a5 Remove chat overlay local override 2017-12-30 21:10:57 +09:00
FreezyLemon
18eabd35f6 Set an empty list as default for AvailableChannels (mostly so that tests don't break, but also so that if no connection exists, the links don't break) 2017-12-07 16:25:30 +01:00
FreezyLemon
ec8b5c2465 Permitted nulls in ChatOverlay.load() so that in testing, no "OsuGame" instance is required. Also added null checks to the links' on click actions 2017-12-07 10:31:02 +01:00
FreezyLemon
94eb853d3d Added centralised handling for some chat links 2017-12-06 16:41:57 +01:00
FreezyLemon
2d270a1cfe Added ability to open other channels from chat links. 2017-12-03 20:45:30 +01:00
smoogipoo
b3bf6e7bee Merge master into netstandard 2017-11-21 16:39:21 +09:00
Dean Herbert
2610cadd3c CI fixes 2017-11-21 12:11:29 +09:00
Dean Herbert
4f6263ef86 Make many internal classes and methods public
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
smoogipoo
aac41d2de6 Disable resharper inspections on case-by-case basis 2017-11-20 18:55:48 +09:00
MrTheMake
34fb6ccdf5 Removed generic parameter function 2017-09-22 16:17:03 +02:00
MrTheMake
0a27916761 Added infoMessage class to the project, use the class for the /help command and handle command parameter better 2017-09-22 15:31:30 +02:00
MrTheMake
31e26364a6 Initial implementation of chat commands 2017-09-22 01:47:24 +02:00
MrTheMake
9839a3b937 Smoothly transform the chat height when opening the channel selection 2017-09-12 18:47:21 +02:00
MrTheMake
c78695cfe0 Removed redundant call 2017-09-12 18:26:52 +02:00
MrTheMake
15dd8d9071 Mind the minimum size of the channel selection overlay 2017-09-08 18:21:42 +02:00
Dean Herbert
c6fa899b15 Merge remote-tracking branch 'upstream/master' into quit-chat-channels 2017-09-06 21:43:03 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
naoey
6291bd5ced Handle null current channel in setter, update framework. 2017-08-24 10:40:42 +05:30
naoey
3f403ba524 Merge remote-tracking branch 'upstream/master' into quit-chat-channels 2017-08-24 10:06:29 +05:30
Dean Herbert
9ba2258f80 Add spaces for smoogipoo 2017-08-21 17:44:39 +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
2ae3ce8b91 Add ability to close chat tabs. 2017-08-14 10:11:14 +05:30
EVAST9919
3263aa2ca7 Always return true while dragging 2017-07-27 17:02:23 +03:00
EVAST9919
eb4880cdd5 Applied suggestions 2017-07-27 16:33:10 +03:00
EVAST9919
dd96e101d4 Merge remote-tracking branch 'refs/remotes/ppy/master' into chat_dragging 2017-07-23 13:26:23 +03:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
EVAST9919
66f816692f Better boolean naming 2017-07-21 13:40:09 +03:00
EVAST9919
270ab5c987 Allow ChatOverlay resize only if it dragged by the tabs area only 2017-07-21 13:37:22 +03: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
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
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
Thomas Müller
6de9776e05 Update framework with tooltip changes 2017-07-07 08:59:17 +03:00
Dean Herbert
724e5aa99e Merge master into better-input 2017-07-05 13:59:40 -07:00
Thomas Müller
bb15bc0467 Use ReceiveMouseInputAt whenever possible 2017-06-30 09:54:03 +03:00
Dean Herbert
28f0da606a Add OsuFocusedOverlayContainer with predefined sounds. 2017-06-28 10:18:12 -07:00
Thomas Müller
e3489928b7 Remove now obsolete InternalContains 2017-06-24 09:21:08 +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
e94425f311 Improve the loading animation and use it in multiple places
- Supersedes https://github.com/ppy/osu/pull/926.
- [ ] Depends on https://github.com/ppy/osu-framework/pull/817.
2017-06-12 17:04:42 +09:00
John Neijzen
aa3a231763 Review Changes 2017-06-07 22:00:14 +08:00
John Neijzen
23a7045eef More Clean UP 2017-06-07 20:07:18 +08:00
Thomas Müller
fac16bdebd Do not release focus of the chat text box when sending a message 2017-06-05 18:07:28 +02:00
Dean Herbert
6b7e18a1e3 Fix not being able to change channels when channel select dialog is up 2017-06-05 23:12:39 +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
c13e807d82 Redundant parenthesis 2017-06-02 01:48:43 -03:00
DrabWeb
1fa70167c2 Fix channel list occasioanlly taking clicks when not open 2017-06-02 01:35:36 -03:00
DrabWeb
90dabe01f4 Fix the channel list appearing behind the tab bar 2017-06-02 01:00:09 -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
24b3ec7787 Fix tab background not fading 2017-06-01 08:16:53 -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
c2d1a44de5 Fix channel selection not getting focus 2017-06-01 05:17:45 -03:00
DrabWeb
32f98ca62b Don't autohide the channel list if the chat is too tall 2017-05-31 22:42:53 -03:00
DrabWeb
e7bf1e02cb Merge https://github.com/ppy/osu into channel-selection 2017-05-31 22:32:05 -03:00
DrabWeb
6176f1d275 Make the transition when chat is too tall and opening the channel selector smoother 2017-05-31 22:29:52 -03:00
DrabWeb
d970430174 Fix the channel selector not appearing if the chat is scaled up too tall then back down 2017-05-31 22:08:25 -03:00
Dean Herbert
8544b45443 Update in line with framework 2017-05-30 22:23:51 +09:00
DrabWeb
2edbf64d69 Redundant parentheses 2017-05-29 22:22:14 -03:00
DrabWeb
96efa5a240 Hook up to channel selector tab item 2017-05-29 22:10:07 -03:00
DrabWeb
b9292b6240 Merge https://github.com/ppy/osu into channel-selection 2017-05-29 22:06:05 -03:00
Dean Herbert
e91a3f06f1 Merge remote-tracking branch 'upstream/master' into channel-selector-tab-item 2017-05-30 09:54:35 +09:00
DrabWeb
745e2e5e18 Make the channel selection overlay hide/resize with chat 2017-05-29 21:23:03 -03:00
DrabWeb
21a8071293 Merge https://github.com/ppy/osu into channel-selection 2017-05-29 20:31:35 -03:00
Thomas Müller
bb14708165 Merge branch 'master' into fix-chat-overlay-drift 2017-05-28 14:38:39 +02:00
Dean Herbert
bc47dedf27 Add non-null assertion 2017-05-28 21:34:15 +09:00
Dean Herbert
ed8b34d5ed Fix drift when dragging chat beyond bounds 2017-05-28 21:11:46 +09:00
Dean Herbert
d749fc516d Update focus handling in line with framework changes 2017-05-28 20:08:46 +09:00
DrabWeb
754fe956f9 Make ChannelSection headers uppercase in the setter 2017-05-27 17:40:20 -03:00
DrabWeb
38d0138978 CI fixes 2017-05-26 04:11:45 -03:00
DrabWeb
d29ebb139f Cleanup 2017-05-26 03:38:52 -03:00
DrabWeb
64016f9466 Merge https://github.com/ppy/osu into channel-selection 2017-05-26 03:24:41 -03:00
Dean Herbert
5c5a18833a Merge branch 'master' into channel-selector-tab-item 2017-05-22 20:22:57 +09:00
DrabWeb
a60d1efc21 Basic channel joining (ignore layout in ChatOverlay, temporary) 2017-05-20 21:26:39 -03:00
Jorolf
94484974f9 use AddTabItem instead + Bindable for ChannelSelectorTabItem 2017-05-19 11:59:23 +02:00
Jorolf
0e3fb55d5e usage of constant and formatting 2017-05-18 17:02:11 +02:00
Jorolf
67806c4247 add tab item 2017-05-17 21:16:53 +02:00
Huo Yaoyuan
23e2d3ef07 Use GroupBy in ChatOverlay. 2017-05-18 02:40:36 +08:00
Huo Yaoyuan
b5d7211cd6 Expire placeholder text. 2017-05-18 02:40:29 +08:00
Dean Herbert
d606b5b3a7 Fix CI warning 2017-05-17 22:13:56 +09:00
Dean Herbert
231f7939a6 Fix channels being unnecessarily recycled on disconnect
Resolves #768
2017-05-17 12:42:02 +09:00
Dan Balasescu
be3953aeb2 Merge branch 'master' into general-fixes 2017-05-16 20:52:38 +09:00
Dean Herbert
fdf0137fc2 Remove incorrect padding 2017-05-16 19:58:34 +09:00
Dean Herbert
23807aa3b9 Better handling of logged in state 2017-05-16 19:55:45 +09:00
Dean Herbert
712bd21e25 Fix duplicate channels being created on connection loss
Resolves #763
2017-05-16 18:28:42 +09:00
Dean Herbert
89e2a39d14 Merge remote-tracking branch 'upstream/master' into margin-padding-namespace 2017-05-16 16:36:34 +09:00
Dean Herbert
f0ea445e46 Fix initial requests of channel mesages not being performed
fetchReq was being set even for initial lookups, which caused only one to run, and subsequent requests to be excessive to try and catch up.
2017-05-16 15:59:01 +09:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Dean Herbert
3b1d5ce7df CI fix 2017-05-15 13:31:51 +09:00
Dean Herbert
dcd4b4450d Add error message in chat when attempting to use commands 2017-05-15 13:26:35 +09:00
Dean Herbert
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
Dean Herbert
bc5bcfa66a Make tab background opaque when chat is fullscreen 2017-05-12 19:15:04 +09:00
Dean Herbert
dbf60d24bf Second design update pass. 2017-05-12 15:39:00 +09:00
Dean Herbert
6ea65009c4 Initial design update pass 2017-05-12 15:38:55 +09:00
Dean Herbert
c4a93cbc85 Move drawable chat related classes to better namespace 2017-05-12 15:38:51 +09:00
Dean Herbert
9cf4998701 Make chat resizable via drag, save user set size 2017-05-12 15:36:37 +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
Dean Herbert
b258109a9e Fix chat input box not always keeping focus as expected 2017-05-11 19:38:36 +09:00
Dean Herbert
c7246fd2ac
Reorganise ChatOverlay to not suck. 2017-04-19 19:15:21 +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
87f6dc9e5a
Change default channel to #lazer. 2017-04-19 18:46:50 +09:00
Dean Herbert
325af333b9
Update API responses for chat. 2017-04-19 18:46:48 +09:00
Poliwrath
dffdb100ab Small fix to the chat overlay to prevent crashing on the test 2017-04-11 21:35:49 -04:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +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
Andrey Zavadskiy
3487dfe236 Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
190bed8939
Add top padding. 2017-02-22 13:38:22 +09:00
Dean Herbert
b7a9fd85ea
Assert single channel support for now. 2017-02-22 13:38:10 +09:00