1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 10:42:54 +08:00
Commit Graph

190 Commits

Author SHA1 Message Date
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
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09: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
naoey
c304c1eecf
Make LinkFlowContainer handle beatmap id lookup in game. 2018-04-04 21:23:51 +05:30
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
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
Michael Manis
64d7868c03 Update APi.Username in APIAccess intead of ignoring it. 2018-01-22 01:19:22 -05:00
Aergwyn
ae1adfd2f2 remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01: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
Aergwyn
cc4ef5d0aa Merge branch 'master' into expand-social-tab 2018-01-01 12:00:50 +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
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
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