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 |
|