DrabWeb
|
52b157d072
|
Merge https://github.com/ppy/osu into multiplayer-room-settings
|
2018-08-14 11:16:25 -03: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 |
|
miterosan
|
b1e9a4fd24
|
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
|
2018-07-29 23:28:34 +02:00 |
|
miterosan
|
8c0bcb8e3c
|
Fix drawable crash and lload the inital messages of newly joined channels
|
2018-07-29 21:40:43 +02:00 |
|
Dean Herbert
|
da8fc0ee5d
|
ToLower -> ToLowerInvariant
|
2018-07-25 07:37:05 +02:00 |
|
Dean Herbert
|
7b653fab17
|
Pass in lastMessageId instead of self referencing
|
2018-07-24 18:01:28 +02:00 |
|
Dean Herbert
|
6937cf27a7
|
Tidy up channel join logic
|
2018-07-24 17:51:20 +02:00 |
|
Dean Herbert
|
090d197b21
|
Remove unnecessary using
|
2018-07-24 17:35:08 +02:00 |
|
Dean Herbert
|
da730269a9
|
Formatting and ctor usage for required parameters
|
2018-07-24 15:25:47 +02:00 |
|
miterosan
|
42df0c974f
|
Rename UserChannel to private channel.
|
2018-07-24 05:17:57 +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
|
16db81e9b5
|
Extract the message hadling logic into IncomingMessagesHandler
|
2018-07-24 04:54:11 +02:00 |
|
miterosan
|
9a6d92bb22
|
Rename fetchMsgReq to fetchMessageReq in ChannelManager.cs
|
2018-07-23 22:09:05 +02:00 |
|
miterosan
|
2ae890366a
|
Nicefy the errormessage in the constructor of GetMessagesRequest
|
2018-07-23 22:08:37 +02:00 |
|
Dean Herbert
|
1ab75529a1
|
Simplify user channel message population code
|
2018-07-23 21:15:52 +02:00 |
|
Dean Herbert
|
0aacde836a
|
Move private channel constructor to own class
|
2018-07-23 20:46:44 +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 |
|
miterosan
|
8e93269885
|
Remove whitespace
|
2018-07-09 22:47:01 +02:00 |
|
miterosan
|
3140b2e15c
|
Fix duplicate messages appearing
|
2018-07-09 22:14:21 +02:00 |
|
miterosan
|
290b6e5f1d
|
Fix the crash in the visual testcase
|
2018-07-09 22:09:27 +02:00 |
|
miterosan
|
ec914a5095
|
Fix crash when the local echo is send to the wrong channel.
|
2018-07-09 21:00:39 +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
|
d4f9bcdee1
|
Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages
|
2018-07-09 20:14:16 +02:00 |
|
miterosan
|
16d3815a59
|
Clean Channel up and reword two comments
|
2018-07-09 18:58:33 +02:00 |
|
miterosan
|
4b638db475
|
Reorder the properties and fields on Channel.
Make MAX_HISTORY because cause can not be public.
|
2018-07-09 18:52:28 +02:00 |
|
miterosan
|
263e68de91
|
Use a custom channel not found exception.
|
2018-07-09 18:45:11 +02:00 |
|
miterosan
|
c56a4ea893
|
Merge branch 'master' into Private_Messages
|
2018-07-08 19:29:33 +02:00 |
|
DrabWeb
|
6b240280d0
|
Merge https://github.com/ppy/osu into multiplayer-room-settings
|
2018-07-07 01:10:27 -03:00 |
|
Dean Herbert
|
625b9ead4c
|
Fix links from profile top scores to beatmaps not working correctly
|
2018-07-05 21:00:23 +09:00 |
|
smoogipoo
|
73851fb194
|
Fix beatmap details not working for unranked beatmaps
|
2018-07-03 15:57:05 +09:00 |
|
miterosan
|
884ac71874
|
Merge branch 'master' into Private_Messages
|
2018-06-28 21:04:02 +02:00 |
|
smoogipoo
|
f1dfe04bd9
|
Fix broken conditional
|
2018-06-26 20:13:44 +09:00 |
|
Dean Herbert
|
78ccbcabf3
|
Fix API getting stuck in an endless loop under a certain unauthorized scenario
|
2018-06-22 17:34:29 +09:00 |
|
miterosan
|
cd0fe6a09e
|
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
# Conflicts:
# osu.Game.Tests/Visual/TestCaseChatLink.cs
|
2018-06-17 14:15:14 +02:00 |
|
Dean Herbert
|
955a78e76d
|
Remove OnlineBeatmapSetID from BeatmapInfo
It should now be retrieved via the linked BeatmapSetInfo
|
2018-06-08 15:26:27 +09:00 |
|
Dean Herbert
|
e8455dc1e4
|
Fix incorrect hash usage
|
2018-06-08 14:38:04 +09:00 |
|
Dean Herbert
|
21c8ef576c
|
Expose result for synchronous consumption
|
2018-06-08 14:37:48 +09:00 |
|
Dean Herbert
|
b265f02d56
|
Add comment about scheduled invocation
|
2018-06-08 14:37:27 +09:00 |
|
Dean Herbert
|
8220e0c79a
|
Remove OnlineBeatmapSetID from BeatmapMetadata
|
2018-06-08 12:46:34 +09:00 |
|
Dean Herbert
|
d1e9dba4aa
|
Move beatmap lookup ability to new request
|
2018-06-08 12:21:12 +09:00 |
|
Dean Herbert
|
b45354ce97
|
Add missing header
|
2018-06-08 12:06:58 +09:00 |
|
Dean Herbert
|
1716975a37
|
Move out APIBeatmap
|
2018-06-08 12:04:33 +09:00 |
|
Dean Herbert
|
8cc31aca54
|
Reorganise API requests and response classes
They were previously breaking the two-class-per-file rule.
|
2018-06-08 11:42:35 +09:00 |
|
DrabWeb
|
93b61840c8
|
Compare GameTypes by type instead of reference.
|
2018-06-06 04:25:11 -03:00 |
|
Dean Herbert
|
645f6efce7
|
Fix web request failures not being correctly handled at an APIRequest level
|
2018-06-03 13:01:52 +09:00 |
|
Dean Herbert
|
ae6f603d16
|
Merge branch 'master' into match-panel-with-web
|
2018-06-01 21:31:18 +09:00 |
|
DrabWeb
|
59762c0393
|
Change Room.Participants to an IEnumerable.
|
2018-06-01 06:15:23 -03:00 |
|
Joehu
|
1095669a55
|
Match panel with web
|
2018-05-31 08:09:19 -07:00 |
|
Dean Herbert
|
49a683e386
|
Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages
|
2018-05-31 14:50:20 +09:00 |
|
DrabWeb
|
f7a4a4eeef
|
Add Lounge FilterControl.
|
2018-05-22 00:24:39 -03:00 |
|
miterosan
|
1bbeb6d70e
|
Make the sinceId readonly
|
2018-05-06 19:54:41 +02:00 |
|
miterosan
|
ba5861b527
|
Merge remote-tracking branch 'origin/master' into Private_Messages
# Conflicts:
# osu.Game/Online/API/Requests/GetMessagesRequest.cs
# osu.Game/Overlays/Chat/ChatTabControl.cs
|
2018-05-06 19:45:33 +02:00 |
|
Dean Herbert
|
36a671e306
|
Fix new detections in rider 2018.1
|
2018-04-23 14:56:45 +09:00 |
|
miterosan
|
3b68dda23e
|
Merge remote-tracking branch 'origin/master' into Private_Messages
|
2018-04-18 20:55:12 +02:00 |
|
miterosan
|
29e8c70ed7
|
Only use one tabControl (channeltabcontrol). Fix that the Channel messages did not refresh.
|
2018-04-18 20:46:42 +02:00 |
|
Dean Herbert
|
7e5d5a197b
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 16:41:01 +09:00 |
|
smoogipoo
|
ffbe6f2e37
|
Merge remote-tracking branch 'origin/master' into fix-rank-status
# Conflicts:
# osu.Game/Beatmaps/RankStatus.cs
# osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
# osu.Game/Overlays/Direct/FilterControl.cs
# osu.Game/Overlays/DirectOverlay.cs
|
2018-04-18 14:16:58 +09:00 |
|
Dean Herbert
|
f62677222c
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 13:08:53 +09: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 |
|
miterosan
|
1b51da70af
|
Create an abstraction for APIMessagesRequest
|
2018-04-14 13:23:16 +02:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
miterosan
|
e39f5a1adf
|
Rename var chatmanager -> channelManager
Apply requested changes
|
2018-04-12 23:19:13 +02:00 |
|
Joehu
|
463b189d2f
|
Remove unused using directives
|
2018-04-12 08:13:24 -07:00 |
|
Joehu
|
df4b64effc
|
Rename rankStatus to searchCategory
|
2018-04-12 08:03:19 -07:00 |
|
Joehu
|
f18594887b
|
Move enum to SearchBeatmapSetsRequest
|
2018-04-12 07:49:23 -07:00 |
|
Joehu
|
461e063f19
|
Rename RankStatus to BeatmapSearchCategory
|
2018-04-11 22:50:39 -07:00 |
|
smoogipoo
|
baae4427ff
|
Move string-token property to OAuth
|
2018-04-12 14:30:28 +09:00 |
|
smoogipoo
|
e007365916
|
Save OAuth token to config on every token change
|
2018-04-12 14:23:49 +09:00 |
|
miterosan
|
a5e0311253
|
Trim whitespaces
|
2018-04-11 20:53:35 +02:00 |
|
miterosan
|
c2020742b2
|
Actually use the fact that ChannelManager is now a component
|
2018-04-11 20:37:51 +02:00 |
|
miterosan
|
2056258def
|
Fix code sanity
|
2018-04-11 20:31:16 +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
|
5512d58c1d
|
Remove the sealed modifier
|
2018-04-09 21:06:05 +02:00 |
|
miterosan
|
aa26ea483d
|
remove using, remove empty agrument list
|
2018-04-08 22:43:01 +02:00 |
|
miterosan
|
2a314f052a
|
Trim more whitespace
|
2018-04-08 22:28:50 +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
|
525e50e8dd
|
Merge remote-tracking branch 'origin/master' into Private_Messages
|
2018-04-08 15:23:09 +02:00 |
|
miterosan
|
f1696eae92
|
Use IEnumable instead of List
|
2018-04-08 15:01:14 +02:00 |
|
naoey
|
c304c1eecf
|
Make LinkFlowContainer handle beatmap id lookup in game.
|
2018-04-04 21:23:51 +05:30 |
|
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 |
|
DrabWeb
|
19bc6b9168
|
Merge https://github.com/ppy/osu into beatmap-set-status
|
2018-03-27 18:13:58 -03:00 |
|
DrabWeb
|
eb374c5774
|
Add beatmap set online status and display it in direct panels and the beatmap set overlay.
|
2018-03-26 21:04:45 -03:00 |
|
Dean Herbert
|
0e669c9a3f
|
Fix many warnings
|
2018-03-24 18:23:22 +09:00 |
|
smoogipoo
|
c29f7a4333
|
Merge remote-tracking branch 'origin/master' into netstandard
|
2018-03-24 14:49:46 +09:00 |
|
smoogipoo
|
f0c0a51108
|
Convert APIAccess to use cancellation tokens
|
2018-03-23 20:57:04 +09:00 |
|
Dean Herbert
|
6c4e719e0f
|
Fix API never stopping its thread
|
2018-03-23 15:46:55 +09:00 |
|
Dean Herbert
|
ce2997419a
|
Expose API scheduling internally
|
2018-03-14 11:37:50 +09:00 |
|
Dean Herbert
|
07642546bb
|
Make APIAccess a component
|
2018-03-14 11:29:54 +09:00 |
|
Dean Herbert
|
83cd2fd317
|
Move token saving logic to APIAccess
|
2018-03-14 10:15:05 +09:00 |
|
Dean Herbert
|
afc3646450
|
Move API configuration hooks out of OsuGameBase
Also makes username more private, and password completely private.
|
2018-03-14 10:15:05 +09:00 |
|
vperus
|
ba44813c00
|
Fixed exit from game save username instead of email. Resolve #2156
|
2018-03-13 12:10:47 +02:00 |
|
Dean Herbert
|
f78538fea8
|
Merge branch 'master' into user-profile-recent
|
2018-03-07 19:41:52 +09:00 |
|
Dean Herbert
|
07bf8549eb
|
Fix arbitrary API request errors getting identified as timeouts
|
2018-03-06 17:39:34 +09:00 |
|
naoey
|
a77d1eedae
|
Fix achievements parsing and add badges to recent activity.
|
2018-02-26 13:08:12 +05:30 |
|
naoey
|
a20e4bc2c3
|
Fix typos and missing fields in JSON mappings.
|
2018-02-26 11:46:16 +05:30 |
|
naoey
|
5724618b2a
|
Add license headers and sanitise open profile argument.
|
2018-02-26 09:58:11 +05:30 |
|
naoey
|
1ad45b0941
|
R# fixes.
|
2018-02-26 01:21:31 +05:30 |
|
naoey
|
75fdca928e
|
Handle links correctly and don't re-open profile if the user is same.
|
2018-02-26 01:21:29 +05:30 |
|
naoey
|
bb40919f9c
|
Add link handling to recent activities.
- Add a show user action to link handling
|
2018-02-26 01:21:27 +05:30 |
|
naoey
|
7e4bd36391
|
Create drawable and add response to profile.
- Add missing JSON fields to response model
- Add missing enum value
|
2018-02-26 01:21:24 +05:30 |
|
naoey
|
e3a1b07172
|
Create API request and reponse model.
|
2018-02-26 01:21:16 +05:30 |
|
Dean Herbert
|
835136aecb
|
Merge branch 'master' into api-interface
|
2018-02-20 09:33:53 +09:00 |
|
Dean Herbert
|
75dcf72520
|
Improve testability of API
|
2018-02-16 13:57:39 +09:00 |
|
Dean Herbert
|
fa05822d7d
|
Add missing licence headers
|
2018-02-15 16:33:33 +09:00 |
|
Dean Herbert
|
e0d28564d0
|
Move import logic to shared implementation
|
2018-02-15 14:22:39 +09:00 |
|
smoogipoo
|
b500b76407
|
Merge branch 'master' into update-branch
|
2018-02-08 23:35:48 +09:00 |
|
Dean Herbert
|
e5188fd151
|
Add better channel test cases (testing non-existent channels)
|
2018-01-30 17:43:19 +09:00 |
|
Dean Herbert
|
d81d884a01
|
Remove unnecessary paren handling from regex
Can't find a reason for this to exist
|
2018-01-30 17:16:01 +09:00 |
|
Dean Herbert
|
662c7c5bdc
|
Fix osump links
|
2018-01-30 16:44:43 +09:00 |
|
Dean Herbert
|
dd2731b873
|
Add support for markdown style links
|
2018-01-30 16:38:45 +09:00 |
|
Dean Herbert
|
df221b6786
|
Remove usage of ValueTuple to allow for dynamic recompilation
|
2018-01-29 17:45:23 +09:00 |
|
Dean Herbert
|
a5b0d51205
|
Merge remote-tracking branch 'upstream/master' into url-parsing-support
# Conflicts:
# osu.Game/osu.Game.csproj
|
2018-01-27 14:06:58 +09:00 |
|
Michael Manis
|
64d7868c03
|
Update APi.Username in APIAccess intead of ignoring it.
|
2018-01-22 01:19:22 -05:00 |
|
Dean Herbert
|
5a80c49640
|
Improve reference xmldoc
|
2018-01-17 19:44:15 +09:00 |
|
Dean Herbert
|
54b0f4b912
|
Merge branch 'master' into url-parsing-support
|
2018-01-17 16:16:55 +09:00 |
|
Aergwyn
|
ae1adfd2f2
|
remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
|
2018-01-12 19:30:34 +01:00 |
|
Dean Herbert
|
45301d07fd
|
Merge branch 'master' into url-parsing-support
|
2018-01-12 19:34:44 +09:00 |
|
FreezyLemon
|
2c67ff75ed
|
added custom hoverclicksounds so links make sounds on hover&click
|
2018-01-11 18:52:50 +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
|
1be0569743
|
Update licence headers
|
2018-01-09 14:34:52 +09:00 |
|
Dean Herbert
|
b035a92bda
|
Merge branch 'master' into url-parsing-support
|
2018-01-09 14:28:20 +09:00 |
|
Aergwyn
|
a61666d2a7
|
update licence headers
|
2018-01-06 10:54:53 +01:00 |
|
Aergwyn
|
e6b581e259
|
Merge branch 'master' into expand-social-tab
|
2018-01-06 10:48:27 +01: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 |
|
Aergwyn
|
cc4ef5d0aa
|
Merge branch 'master' into expand-social-tab
|
2018-01-01 12:00:50 +01:00 |
|
FreezyLemon
|
e7721d71f3
|
Changed chat link implementation according to review
|
2017-12-31 00:51:47 +01:00 |
|
Aergwyn
|
ccb69d16d9
|
move HitResult in Scoring namespace to replace HitCount
|
2017-12-30 21:23:18 +01:00 |
|
Aergwyn
|
138d78309f
|
add HitCount enum and replace string usage with enum
|
2017-12-30 18:07:30 +01:00 |
|
FreezyLemon
|
7454633f63
|
Refactor and general tidying up
|
2017-12-28 20:11:21 +01:00 |
|
Aergwyn
|
66f076815f
|
query friends endpoint to fetch friendlist
|
2017-12-28 19:32:06 +01:00 |
|
smoogipoo
|
7a793eaded
|
Merge master into netstandard
|
2017-12-27 20:48:53 +09:00 |
|
FreezyLemon
|
7c49becc83
|
CI adjustments
|
2017-12-25 20:56:20 +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
|
a30448095e
|
Merge branch 'master' into url-parsing-support
|
2017-12-25 19:12:23 +01:00 |
|
naoey
|
85dee3abac
|
Increase GetScoresRequest timeout & leave existing scores when API dies.
|
2017-12-20 20:48:30 +05:30 |
|
Dean Herbert
|
c871a25dfa
|
Remove unnecessary constructure and make ruleset required
|
2017-12-20 20:41:01 +09:00 |
|
Dean Herbert
|
1b91f24044
|
Simplify scope logic
|
2017-12-20 20:33:16 +09:00 |
|
Dean Herbert
|
63dce59c8c
|
Throw an exception if we try and retrieve local scores online
|
2017-12-20 20:28:00 +09:00 |
|
FreezyLemon
|
d0b7c92b46
|
Removed unnecessary usings.
|
2017-12-11 13:46:23 +01:00 |
|