1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 05:22:54 +08:00
Commit Graph

1043 Commits

Author SHA1 Message Date
Dean Herbert
d5a9542743
Fix incorrect xmldoc in DownloadTrackingComposite (#5261)
Fix incorrect xmldoc in DownloadTrackingComposite
2019-07-05 14:43:28 +09:00
naoey
f1dab946ff Remove need to trim query string 2019-07-05 08:46:17 +05:30
naoey
98a242cc37 Merge remote-tracking branch 'ppy/master' into leaderboard-mod-filter 2019-07-05 08:38:33 +05:30
iiSaLMaN
a30f0c03bb Fix incorrect xmldoc 2019-07-05 05:32:30 +03:00
Joehu
5f6544eebf Fix beatmap leaderboards requiring supporter when signed out 2019-07-04 12:05:07 -07:00
Dean Herbert
2b9f7d551f
Fix incorrect type specification 2019-07-04 16:16:17 +09:00
Dean Herbert
4885f0f0c7 Add messaging telling users how to leave changelog comments 2019-07-04 15:47:06 +09:00
naoey
4ba60ed089
Apply currently selected mods to filter leaderboard scores
Modifies GetScoresRequest to build query string locally instead of using WebRequest.AddParameter since it doesn't support array parameters
2019-07-03 17:04:20 +05:30
naoey
9805adc61d
Fix online ScoreInfo having the wrong ruleset 2019-07-03 14:25:59 +05:30
Dean Herbert
1189092e20 Remove redundant scale specification 2019-07-03 12:49:16 +09:00
Dean Herbert
be904512d9
Merge branch 'master' into animated-rank-grades 2019-07-03 12:44:08 +09:00
iiSaLMaN
c5b3572c28 Add missing details 2019-06-30 08:05:45 +03:00
iiSaLMaN
9498fc2426 Use proper colours for rank background and text 2019-06-30 05:47:52 +03:00
iiSaLMaN
20ad486d53 Scale adjustments 2019-06-30 04:59:33 +03:00
iiSaLMaN
372d90de6a Remove unnecessary assigns 2019-06-30 04:25:47 +03:00
iiSaLMaN
8c5397709b Use drawables instead of textures 2019-06-30 04:20:42 +03:00
naoey
6c81d57178
Remove hacks for updating model info
- Re-retrieve score from database when presenting scores
2019-06-29 16:08:48 +05:30
naoey
7d9e215744
Code quality fixes 2019-06-29 12:29:12 +05:30
naoey
f9316bc038
Hack fix for models not updating correctly when added in DB 2019-06-29 11:09:39 +05:30
naoey
bc52f76556
Move replay button to score card 2019-06-29 10:55:30 +05:30
naoey
53d6d74537
Update to match upstream changes 2019-06-28 09:33:13 +05:30
naoey
ab0bb8b678
Implement replay downloading with ArchiveDownloadModelManager 2019-06-28 09:33:13 +05:30
Dean Herbert
c49b8b1883 Remove accidental change 2019-06-27 12:19:49 +09:00
Dean Herbert
375a6f406d Merge remote-tracking branch 'upstream/master' into not-available-to-download 2019-06-27 11:44:41 +09:00
Dean Herbert
322d92d3e0 Rename class to BeatmapAvailability 2019-06-27 11:40:22 +09:00
Dean Herbert
9edd98efdc Move disposal to end of class 2019-06-27 00:29:38 +09:00
Dean Herbert
768d6c2fb3 ModelInfo -> Model 2019-06-27 00:29:09 +09:00
naoey
8efc504817
Post merge fixes 2019-06-26 18:22:37 +05:30
naoey
f3a84de7b5
Merge remote-tracking branch 'upstream/master' into generic-download-tracking-composite 2019-06-26 18:17:53 +05:30
Salman Ahmed
f4e765cf99
Merge branch 'master' into not-available-to-download 2019-06-26 05:13:58 +03:00
naoey
9d88295ece
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-25 18:27:16 +05:30
Dean Herbert
90acc9b6ca Avoid calling api request callback after user cancel 2019-06-25 13:52:43 +09:00
Dean Herbert
88b182ab3f
Merge branch 'master' into generic-download-model-manager 2019-06-24 18:35:58 +09:00
iiSaLMaN
a1c58b164c
Merge branch 'master' into not-available-to-download 2019-06-21 14:16:31 +03:00
Dan Balasescu
c79c4641f3
Merge branch 'master' into use-modelbackeddrawable 2019-06-21 14:26:07 +09:00
Dean Herbert
4a25a84975 Fix DrawableChannel async flow 2019-06-20 23:01:39 +09:00
naoey
4b46601eae
Remove redundant variable, handle all request failures 2019-06-19 19:43:09 +05:30
KingLuigi4932
97dd34e26c Seperate updateable from drawable 2019-06-19 03:50:16 +03:00
iiSaLMaN
5278c5f365
Merge branch 'master' into not-available-to-download 2019-06-19 01:14:32 +03:00
Dean Herbert
d65c20bbdc
Merge branch 'master' into generic-download-model-manager 2019-06-19 01:29:06 +09:00
Dean Herbert
5bb8649f3b Remove unused property from chat message 2019-06-18 14:22:59 +09:00
KingLuigi4932
d6a39b8a2a Fix CI issues + slight change 2019-06-17 22:33:27 +03:00
KingLuigi4932
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
KingLuigi4932
d665f1fe4b Seperate drawable and updateable flag from Country + Use UpdateableFlag 2019-06-17 20:57:57 +03:00
KingLuigi4932
794ba17a2f Seperate UpdateableRank from DrawableRank and use it 2019-06-17 20:04:09 +03:00
iiSaLMaN
0c299d651f
Merge branch 'master' into use-modelbackeddrawable 2019-06-17 17:06:10 +03:00
Dean Herbert
84a0b948e1 Fix typo in VersionNavigation class name 2019-06-17 16:32:38 +09:00
iiSaLMaN
3087099b32
Use ModelBackedDrawable in DrawableRank 2019-06-17 07:34:35 +03:00
smoogipoo
d693b2a329 Fix multiplayer score submission failing silently 2019-06-16 00:31:14 +09:00
Dean Herbert
38616a2bb5
Merge branch 'master' into fix-beatmapoverlay-graphs 2019-06-15 18:37:01 +09:00
Dean Herbert
7d49028a60
Merge branch 'master' into change-download-extension 2019-06-15 15:37:19 +09:00
Dean Herbert
4882283084
Merge branch 'master' into generic-download-model-manager 2019-06-15 15:35:08 +09:00
Dean Herbert
587edcb716
Merge branch 'master' into fix-beatmapoverlay-graphs 2019-06-15 13:42:13 +09:00
Dean Herbert
bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
naoey
aa7cae0879
Rephrase xmldoc 2019-06-13 16:55:41 +05:30
naoey
52c7ed9960
Add ability to change the flie extension of API download requests 2019-06-13 16:16:48 +05:30
smoogipoo
389997dbc4 Fix metrics being populated with null ratings 2019-06-13 19:14:58 +09:00
smoogipoo
583bb53f53 Remove GetBeatmapDetailsRequest 2019-06-13 16:57:19 +09:00
smoogipoo
0a79b444d9 Move metrics to beatmap set 2019-06-13 16:52:49 +09:00
smoogipoo
f240a157b2 Deserialize API metrics 2019-06-13 16:39:38 +09:00
naoey
7ba676ad31
Rename Info to Model 2019-06-12 21:56:36 +05:30
naoey
951a5abccc
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-12 17:41:16 +05:30
Dean Herbert
021d0273f9
Split out user activity from user status (#4619)
Split out user activity from user status

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-12 20:14:03 +09:00
Dean Herbert
b2b3df3885 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-12 18:28:43 +09:00
Dean Herbert
f358fce9ab Move activity (writable) bindable to APIAccess so it correctly transfers between users 2019-06-12 18:04:57 +09:00
Dean Herbert
c591a6f1fa Rename request type to be less verbose 2019-06-12 13:30:23 +09:00
naoey
ba6546038c
Make ModelInfo and abstract class constructor protected
- Implementing classes would be better off exposing it if necessary under a different name
2019-06-12 00:55:43 +05:30
naoey
7495bc5d3a
Post merge and inverted condition fix 2019-06-12 00:42:05 +05:30
naoey
41da491a7e
Make BeatmapSetInfo equatable 2019-06-11 23:23:40 +05:30
naoey
ab27d82cd5
Make beatmap download buttons inherit BeatmapDownloadTrackingComposite
- Move DownloadTrackingComposite into the online namespace
2019-06-11 23:01:01 +05:30
naoey
06a558c4b7
Remove unecessary third generic and change usages to match 2019-06-11 21:11:30 +05:30
naoey
8ff26a8fbc
Add license headers and xmldoc 2019-06-11 19:49:10 +05:30
naoey
341d137f5c
Make BeatmapManager inherit from new base class 2019-06-11 19:36:08 +05:30
naoey
b4de51b612
Create a generic base archive download manager class 2019-06-11 18:29:33 +05:30
iiSaLMaN
1c6a81e2aa
Merge branch 'master' into not-available-to-download 2019-06-11 12:32:46 +03:00
Arphox
07e17518e9 Fix all "Maintainability" CodeFactor issues 2019-06-11 10:28:16 +02:00
iiSaLMaN
ae284d1127
Merge branch 'master' into not-available-to-download 2019-06-10 21:39:32 +03:00
KingLuigi4932
3202110b80 Add a container for Beatmap Availability 2019-06-10 20:17:44 +03:00
Lucas A
2e911d0e96 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-10 19:13:54 +02:00
KingLuigi4932
3fc604b60a Add Availability to BeatmapSetOnlineInfo 2019-06-10 13:18:38 +03:00
Lucas A
e8c73f3127 Make APIChangelogEntry.Major a non-nullable property 2019-06-08 09:45:34 +02:00
LeNitrous
4e6d7137aa disallow current user from opening their own private channel 2019-06-03 17:25:19 +08:00
Dean Herbert
115a75e4c6 Use a constant for lazer variables 2019-06-03 13:16:05 +09:00
Dean Herbert
a9447eaf7b Remove redundant prefixes 2019-05-21 14:02:34 +09:00
Dean Herbert
a131875a7b Use bindables the whole way 2019-05-21 13:34:35 +09:00
Dean Herbert
58a3480b6a Update ChangelogHeader to work again with OverlayHeader 2019-05-21 12:52:50 +09:00
Dean Herbert
dae315ec0a Move TooltipText to OsuClickableContainer 2019-05-19 11:28:24 +09:00
Dean Herbert
dbc42fd59e Remove StreamColour class and implement locally 2019-05-17 18:31:53 +09:00
Dean Herbert
37e989fc64 fixup! Convert BadgeDisplay to use bindable 2019-05-17 18:31:53 +09:00
Dean Herbert
1505ca976b API request clean-up 2019-05-15 18:21:06 +09:00
Dean Herbert
d66a26cd11 Add JsonProperty hinting 2019-05-13 17:26:50 +09:00
Dean Herbert
8ecd1912e1 Split out web response classes into own files 2019-05-13 17:24:33 +09:00
Dean Herbert
e9c3f54307 Share web request between builds and streams 2019-05-13 16:44:43 +09:00
Dean Herbert
37a8d9eb80 Remove chart references for now 2019-05-13 16:27:54 +09:00
Dean Herbert
219c590b8a Initial pass to make work with real API 2019-05-13 16:24:32 +09:00
Dean Herbert
31b72f168d Fix deprecated calls and code styling (partly) 2019-05-13 00:46:22 +09:00
Dean Herbert
34f54aa945 Resolve compile-time issues 2019-05-13 00:36:05 +09:00
Dean Herbert
943e1574a4
Merge branch 'master' into changelog-overlay 2019-05-13 00:24:18 +09:00
Paul Teng
7adaa09263 Move tab channel class into tab item class 2019-05-12 06:31:11 -04:00
Paul Teng
d53fb9a5c8 Check against type instead of channel name 2019-05-12 06:11:16 -04:00
Paul Teng
6cf1ca288f
Do not try to join the Add-channel button 2019-05-11 19:13:48 -04:00
smoogipoo
35624a5d1c Invert scheduling order 2019-05-09 13:42:04 +09:00
smoogipoo
3fed165b74 Cleanup some schedules 2019-05-09 13:33:18 +09:00
smoogipoo
c69d813745 Fix bindable potentially being set from background thread 2019-05-09 13:32:18 +09:00
smoogipoo
99f2ee0e48 Fix CI issues 2019-05-07 15:09:03 +09:00
Dan Balasescu
288b3deb94
Merge branch 'master' into fix-rank-display 2019-05-07 15:00:51 +09:00
smoogipoo
13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +09:00
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
6bdaca1e3b Fix mod equality checks not working as intended 2019-05-03 10:09:47 +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
Dean Herbert
ae51a9e451 Fix drawable rank texture lookup 2019-04-22 09:57:33 +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
smoogipoo
2c18b6df1c Fix score table using 300/100/50 2019-04-03 16:09:19 +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
a71e9fdb0e
Merge branch 'master' into convert-ranking-statistics 2019-03-29 12:42:49 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
smoogipoo
012dcc25c9 Rename APIScoreInfo -> APILegacyScoreInfo 2019-03-27 17:08:40 +09:00
smoogipoo
d2af2cf21d Set legacy api score statistics directly 2019-03-27 17:08:01 +09:00
smoogipoo
eceecde0f8 Make APIScoreInfo derive LegacyScoreInfo 2019-03-27 17:07:45 +09:00
Dean Herbert
59d0996c8d Cleanup other instance of same function 2019-03-22 14:31:54 +09:00
smoogipoo
860999ad29 Cleanup 2019-03-22 14:20:53 +09:00
Dean Herbert
dc004910d7 Fix AccountCreationOverlay tests and better complete dummy api's behaviour 2019-03-22 11:55:35 +09:00
Dean Herbert
392a0a1d74
Merge branch 'master' into update-framework 2019-03-18 11:34:59 +09:00
Dean Herbert
c496f6e56b Fix usages of OnLoadComplete 2019-03-17 13:44:20 +09:00
Dean Herbert
7d637691d7 Use non-guest user ID for non-guest user 2019-03-13 19:01:42 +09:00
Dan Balasescu
6aa3dc9f55
Use non-real domain
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-13 18:56:48 +09:00
Dean Herbert
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
Dean Herbert
400514630d
Fix incomplete comment 2019-03-08 12:44:33 +09:00
Dean Herbert
11e5c6a2a0 Fire initial APIStateChanged on local thread 2019-03-08 12:15:27 +09:00
Jamie Taylor
ee076bbbe3
Fix chat channel ids not being updated on room creation 2019-03-07 15:35:57 +09:00
Dean Herbert
f98d55531f Add documentation for FetchScores 2019-03-05 18:48:59 +09:00
LeNitrous
8ad258f426 only check IsLoggedIn after requesting scores 2019-03-05 17:34:23 +08:00
Dan Balasescu
8e99f54fed
Merge branch 'master' into update-beatmap-sections 2019-03-05 17:39:47 +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
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
smoogipoo
d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +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
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
e57409fe41 Remove unnecessary bindable properties on mod lists 2019-02-12 10:51:39 +09:00
Dean Herbert
88ffc78103 Restructure 2019-02-11 19:11:34 +09:00
smoogipoo
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
smoogipoo
d9537017c8 Use CMC in the Multiplayer screen 2019-02-05 16:03:05 +09:00
Dean Herbert
b69a19f810 Attach progress immediately 2019-01-31 19:08:45 +09:00
Dean Herbert
327a34f12a Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
2019-01-31 18:45:09 +09:00
Dean Herbert
baea9691cc Fix baetmap downloads using too much memory 2019-01-29 18:34:10 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
7d6d7cf457 Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
#	osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
2019-01-23 11:06:29 +09:00
Joehu
33735b15ae Update osu!direct beatmap sections sorting 2019-01-20 09:39:07 -08:00
Dean Herbert
21e79f51b1 Remove necessity of BeatmapSetDownloader 2019-01-18 14:28:06 +09:00
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
Dean Herbert
045ed741b0 Fix API getting stuck in eternal failing state if login request fails 2019-01-09 15:29:27 +09:00
Dean Herbert
276014f591
Merge branch 'master' into update-framework 2019-01-08 11:26:10 +09:00
Dean Herbert
8eedef3e86 Move cancellation to safer place 2019-01-07 19:31:05 +09:00
Dean Herbert
d72412d24d Fix leaderboard not correctly handling cancellation 2019-01-07 19:28:46 +09:00
Dean Herbert
f6018294b5 Update framework 2019-01-07 18:50:27 +09:00
Dean Herbert
0908309232
Merge branch 'master' into fix-room-ordering 2018-12-28 13:35:56 +09:00
smoogipoo
a7db0bbb91 Sort rooms based on their API position 2018-12-28 01:45:19 +09:00
Lanyun Hou
f2f1ba8cbe
Fix typo in line 42 2018-12-28 00:43:20 +08:00
Dean Herbert
c5764ded1c Fix infinite polling rate in certain scenarios 2018-12-27 20:03:32 +09:00
smoogipoo
dae710f9a6 Make leaderboard top not fade by default 2018-12-27 17:29:55 +09:00
smoogipoo
8e031325dd CI fixes 2018-12-27 16:28:17 +09:00
smoogipoo
a3b6a3981c Use .Equals() override instead of manual type checks 2018-12-27 16:19:00 +09:00
Dean Herbert
67e200e1b2 Leaderboard design updates 2018-12-27 15:52:40 +09:00
smoogipoo
1e71c5c9c4 Add + set ended room status 2018-12-27 13:32:44 +09:00
Dean Herbert
bfbd7e5106 Merge remote-tracking branch 'upstream/master' into timeshift-wip 2018-12-26 22:42:24 +09:00
Dean Herbert
6b7b0af2e4 Temporary fix for participant count being nullable 2018-12-26 22:25:15 +09:00
smoogipoo
e7310a16c7 Fix playlist not updating correcly 2018-12-26 22:14:49 +09:00
Dean Herbert
a1fa914c66 Participants 2018-12-26 21:58:14 +09:00
Dean Herbert
fb15806c98
Merge branch 'master' into fix-webrequest-cancellation 2018-12-26 21:21:29 +09:00
smoogipoo
bee4e8ad28 Fix cancelled webrequests triggering exceptions 2018-12-26 21:17:10 +09:00
Dean Herbert
171287591c Merge branch 'updateable-beatmap-sprite' into timeshift-wip
# Conflicts:
#	osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
#	osu.Game/Graphics/Containers/LinkFlowContainer.cs
2018-12-26 20:52:36 +09:00
smoogipoo
be9ba78d47 Add error message when creation fails 2018-12-26 20:33:19 +09:00
Dean Herbert
f442e59620 Icon and beatmap title visual pass 2018-12-26 18:01:53 +09:00
Dean Herbert
c6c8c472bb Split class out 2018-12-26 16:50:50 +09:00
Dean Herbert
9b2575cc20 RoomSettingsOverlay -> MatchSettingOverlay 2018-12-26 16:50:50 +09:00
smoogipoo
aeb2186539 Fix api get user request never failing 2018-12-26 16:06:39 +09:00
smoogipoo
6a5f0eca18 Fix various elements flashing 2018-12-25 18:07:50 +09:00
smoogipoo
d4f5a8507c Exit from match screen on escape 2018-12-25 17:14:56 +09:00
smoogipoo
02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00
smoogipoo
30dbc36fce Don't clear username on logout 2018-12-22 17:54:19 +09:00
smoogipoo
d9b8df1595 Merge remote-tracking branch 'origin/master' into user-registration 2018-12-22 17:19:28 +09:00
smoogipoo
c2a00b84c7 Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Multi/IMultiplayerScreen.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/SoloResults.cs
#	osu.Game/Screens/Ranking/IResultPageInfo.cs
#	osu.Game/Screens/Ranking/ResultMode.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/ResultModeTabControl.cs
#	osu.Game/Screens/Ranking/Results.cs
2018-12-22 16:22:02 +09:00
Dan Balasescu
2c97409e2e
Merge branch 'master' into rewrite-standalone-chat 2018-12-22 16:07:27 +09:00
smoogipoo
baed0ef3ba Rename variable 2018-12-22 15:46:04 +09:00
smoogipoo
b9ec179713 Split out more requests + responses 2018-12-22 15:45:16 +09:00
smoogipoo
bdb6e03dfb Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip
# Conflicts:
#	osu.Game/Online/Leaderboards/Leaderboard.cs
#	osu.Game/Online/Leaderboards/LeaderboardScore.cs
#	osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
#	osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
2018-12-22 15:33:26 +09:00
Dean Herbert
52c6d5bfd4 Move protected method down 2018-12-22 15:23:32 +09:00
Dean Herbert
787e65c3c5 Reduce generic-ness 2018-12-22 15:20:35 +09:00
Dean Herbert
23259b295c Remove unnecessary using 2018-12-22 14:45:35 +09:00
smoogipoo
e657f13c15 Separate out Leaderboard into BeatmapLeaderboard 2018-12-22 14:44:36 +09:00
smoogipoo
1cb69c3478 Split requests/responses into separate files 2018-12-22 12:50:37 +09:00
Dean Herbert
396caae0a9 Remove redundant newline 2018-12-21 19:01:19 +09:00
Dean Herbert
81104f4803 Make standalone chat reuse more code from main chat overlay 2018-12-21 17:54:12 +09:00
smoogipoo
1df4826a1d Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-21 14:14:17 +09:00
smoogipoo
6a9b0a0ba3 Fix initial messages not being received 2018-12-21 14:02:36 +09:00
smoogipoo
6b6629e9fd Fix not posting to the correct channel 2018-12-21 14:02:29 +09:00
smoogipoo
fa2bc16140 Remove participants, add match chat 2018-12-21 14:01:11 +09:00
smoogipoo
e27b7b0c0d Cleanup 2018-12-21 13:06:11 +09:00
smoogipoo
5d59a1ffca Merge remote-tracking branch 'origin/master' into timeshift-wip
# Conflicts:
#	osu.Game.Tests/Visual/TestCasePollingComponent.cs
#	osu.Game/Online/API/APIRequest.cs
#	osu.Game/osu.Game.csproj
2018-12-21 12:51:31 +09:00
Dean Herbert
bc8b0485d8 Add textbox/posting support 2018-12-20 18:49:03 +09:00
Dean Herbert
65447d6f4a Add optional parameters to target messages at a specific channel 2018-12-20 17:01:08 +09:00
Dean Herbert
3a13899ce1 Add stand-alone chat component 2018-12-20 16:54:49 +09:00
smoogipoo
c86d9533bd Add PollImmediately() 2018-12-19 18:01:21 +09:00
smoogipoo
9d8170efa0 Only go into failing state if previously online 2018-12-19 14:32:43 +09:00
smoogipoo
a8d88dea3b Display time remaining in the room 2018-12-19 13:07:56 +09:00
smoogipoo
2c000a9a1d Disallow starting gameplay if there's not enough time in the room 2018-12-19 10:52:15 +09:00
Dean Herbert
6088612a26 Remove all retry logic and simplify overall handling of API requests 2018-12-18 20:20:17 +09:00
smoogipoo
7c4fd8ca60 Cleanup room definition 2018-12-17 14:46:43 +09:00
smoogipoo
cc68cf2f95 Implement duration 2018-12-17 14:44:54 +09:00
Dean Herbert
00998d5443 Fix web requests not getting correctly handled on first connection 2018-12-17 14:29:11 +09:00
smoogipoo
2fd2425cc4 Fix playlist deserialisation for creating rooms 2018-12-17 11:05:03 +09:00
smoogipoo
9726eea0d0 Basic score submission implementation 2018-12-14 21:09:17 +09:00
smoogipoo
e8007ac37f Implement multiplayer room leaderboard 2018-12-14 21:08:55 +09:00
smoogipoo
d9fc7c7d66 Separate out Leaderboard into BeatmapLeaderboard 2018-12-14 19:51:27 +09:00
Dean Herbert
fc5d5a7752
Merge branch 'master' into user-registration 2018-12-14 19:45:27 +09:00
Dean Herbert
ec793bd708
Merge pull request #3848 from peppy/polling-component
Polling component
2018-12-14 19:41:36 +09:00
Dean Herbert
38fd35a0cf Add polling time to ctor 2018-12-14 19:17:21 +09:00
Dean Herbert
9072af9792 Move bulk of method into separate private method with minor clean-ups 2018-12-14 15:48:34 +09:00
smoogipoo
28192aef90 Fix nullref 2018-12-14 15:03:49 +09:00
smoogipoo
c9c04a6200 Fix ToBeatmap not using the correct metadata
Metadata is always come from the API via the beatmap set.
2018-12-14 13:43:52 +09:00
smoogipoo
680a3e2aa4 Update with proper playlist usage 2018-12-13 18:38:03 +09:00
smoogipoo
264bd0e2aa Fix invalid room values 2018-12-13 16:06:30 +09:00
smoogipoo
bac4f42eac Fix backgrounds not quite working 2018-12-12 19:34:37 +09:00
smoogipoo
450e4cd223 Hook up API 2018-12-12 19:04:11 +09:00
smoogipoo
87ebb00f1c Make Target abstract (should absolutely always be set) 2018-12-12 19:03:27 +09:00
smoogipoo
9af2b49c01 Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-12 16:22:14 +09:00
smoogipoo
6123a11b67 Use RoomID for creation 2018-12-12 16:20:11 +09:00
smoogipoo
439d741dee Implement basic api structure for rooms 2018-12-12 16:06:56 +09:00
Dean Herbert
ea4dce8454 Add a polling component model 2018-12-10 21:08:14 +09:00
smoogipoo
77193eeea4 Move from lobby into match for creation process 2018-12-10 18:00:57 +09:00
Dean Herbert
7a703f9237 Fix API getting stuck in connecting state on some exceptions 2018-12-09 15:08:25 +09:00
Dean Herbert
2a2561e5c8 Update framework and otehr nuget packages 2018-12-07 19:39:54 +09:00
Dean Herbert
2f9de149dd Add constructor to create a PM channel from a User 2018-12-07 13:56:21 +09:00
Dean Herbert
ab27701ed1 Merge branch 'user-registration' of https://github.com/peppy/osu into user-registration 2018-12-06 17:11:57 +09:00
Dean Herbert
6ebe555838 Fix incorrect filename 2018-12-06 17:11:39 +09:00
Dean Herbert
9689c4fa17
Merge branch 'master' into user-registration 2018-12-06 17:06:43 +09:00
Dean Herbert
94045413ce Change statistics to be int for now 2018-12-05 19:44:01 +09:00
Dean Herbert
1ca00f6662 Add registration API call and related error handling 2018-12-05 17:13:22 +09:00
smoogipoo
e7d7e00516 Better disabling of various controls 2018-12-05 17:01:14 +09:00
Dean Herbert
f3f449c749 wip 2018-12-05 13:08:35 +09:00
Dean Herbert
1a974f64de Initial design for user registration dialog 2018-12-05 12:57:26 +09:00
smoogipoo
ec83790734 Add timeshift game type 2018-12-04 18:58:45 +09:00
smoogipoo
e22cefc27d Immediately select newly-created rooms 2018-12-04 12:49:22 +09:00
smoogipoo
6a28e8c696 Add settings to lounge 2018-12-03 18:30:26 +09:00
Dean Herbert
af3ef9a089 Fix some data types on ScoreInfo 2018-11-30 20:43:38 +09:00
Dean Herbert
059e9e180b Apply review 2018-11-30 18:07:15 +09:00
Dean Herbert
d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
Dean Herbert
84f3d4f48d Fix nullref 2018-11-30 17:15:32 +09:00
Dean Herbert
3727955911 Refactors/renames 2018-11-30 16:35:45 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
Dean Herbert
f42d4a9382 Add wildcard scope to oauth requests 2018-11-28 19:02:23 +09:00
smoogipoo
b8e60afa69 Move replays to an wrapping Score class 2018-11-28 18:45:17 +09:00
smoogipoo
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo
ed02847752 Beatmap -> BeatmapInfo + add foreign key 2018-11-28 17:26:39 +09:00
smoogipoo
2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
smoogipoo
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
Dan Balasescu
38ef1d1f03
Merge branch 'master' into multiplayer-room-settings 2018-11-26 16:46:27 +09:00
smoogipoo
dcf740e5d3 Merge remote-tracking branch 'origin/master' into multiplayer-room-settings 2018-11-26 16:27:22 +09:00
smoogipoo
efdad3a3a7 Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection 2018-11-26 16:12:55 +09:00
smoogipoo
cadfe41f83 Merge remote-tracking branch 'origin/master' into external_link_warning 2018-11-23 15:19:52 +09:00
Dean Herbert
a144e97568 Fix crash on creating two new PM channels 2018-11-22 18:27:22 +09:00
smoogipoo
d1ec9fc294 Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence 2018-11-22 13:04:32 +09:00
miterosan
4f41512265 Lowercase the references to joinedChannel and availableChannels 2018-11-21 23:21:27 +01:00
miterosan
21c9353fee Remove not used usings 2018-11-21 23:15:45 +01:00
miterosan
a14b6ac9df Replace ObservableCollection with BindableCollection 2018-11-21 23:15:44 +01:00
smoogipoo
39e9c61e24 OpenTK -> osuTK 2018-11-21 23:11:08 +01:00
Dean Herbert
2126cf0d9a Fix join process for PMs being incorrect 2018-11-21 20:44:41 +09:00
Dean Herbert
b31efb7bb9 Fix PM channel type 2018-11-21 20:34:36 +09:00
Dean Herbert
d677921680 Remove excess newline 2018-11-21 18:53:50 +09:00
Dean Herbert
7755242a43
Merge branch 'master' into osuTK 2018-11-21 18:53:11 +09:00
Dean Herbert
88f82eb722 Fix instabilities in channel join logic 2018-11-21 17:15:15 +09:00
Dean Herbert
4cde66240d Fix default channels not being joined 2018-11-21 17:15:15 +09:00
smoogipoo
ab2c969122 Add private channel types 2018-11-21 12:58:45 +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
9a9d5e60af More refactors 2018-11-14 13:59:02 +09:00
Dean Herbert
c4769f6802 Refactors 2018-11-14 13:19:51 +09:00
Dean Herbert
72ae22b0c4 Add support for creating new PM conversations 2018-11-13 17:24:11 +09: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
7401fabb5d Extract external link opening to the ExternalLinkOpener class 2018-10-23 23:03:00 +03:00
Dean Herbert
94093ac948 Update beatmap search API to match latest osu-web structure 2018-10-23 18:05:41 +09:00
Hōtarō Oreki
b8ac328ae9 Rename APIChangelog to APIChangelogBuild 2018-10-18 21:04:21 +02:00
Jarosław Zgierski
7cc5128353
Merge branch 'master' into changelog-overlay 2018-10-18 20:26:56 +02:00
Dean Herbert
3cacc11af1 Fix outdated API variable 2018-09-28 19:33:30 +09:00
Dean Herbert
e1c187b641 Merge remote-tracking branch 'origin/update-chat-api' into update-framework 2018-09-28 18:23:09 +09:00
Dean Herbert
6a763334a1 Exit early as safety when no messages are received 2018-09-28 10:00:40 +09:00
Dean Herbert
6f3c8e9f8b Add explicit usage via attribute 2018-09-26 19:58:58 +09:00
Dean Herbert
1b77d9fd05 Merge branch 'update-chat-api' into update-framework 2018-09-26 19:50:23 +09:00
Dean Herbert
1fd2782dd4 Fix loading spinner not disappearing on empty channels 2018-09-26 19:15:02 +09:00
Dean Herbert
2436ee589d Remove incorrect API response 2018-09-26 19:13:38 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
7cd547a760 Update chat to work with new API version 2018-09-25 20:53:24 +09:00
Dan Balasescu
d3bb78d139
Merge branch 'master' into add-rank-status 2018-09-18 14:10:42 +09:00
Dean Herbert
3c8c7a0459 Move ChannelManager to OsuGame
There's no reason for it to exist at OsuGameBase
2018-09-14 13:31:25 +09:00
Unknown
638a2e5ba8 populate Status for Beatmap + BeatmapSet
also added Status to APIBeatmap + APIBeatmapSet
2018-09-13 11:57:40 +02:00
Dean Herbert
4341d258af Make readonly instead 2018-09-13 14:03:21 +09:00
Dean Herbert
0be3ba946f Fix system user attempting to show in profile overlay 2018-09-13 13:40:46 +09:00
Dean Herbert
5d264fdbdd Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-09-11 13:56:57 +09:00
Dean Herbert
e6d5bbd886
Merge branch 'master' into multiplayer-room-settings 2018-09-09 22:40:08 +09:00
Dean Herbert
d05cd52d9a Run the queue faster if multiple requests are pending 2018-09-06 17:38:15 +09:00
Dean Herbert
562a792a99 Use thread instead of LongRunning for API 2018-09-01 13:19:22 +09:00
Dean Herbert
bf6fb1c380 Don't use ConcurrentQueue for API
This queue type can hold several references to already dequeued requests. In our usage, this can cause old api calls to hold references to already-disposed screens (and in turn, very large memory portions).
2018-09-01 12:56:09 +09:00
Jarosław Zgierski
5256f3ed31
Merge branch 'master' into changelog-overlay 2018-08-21 13:55:02 +02:00
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
HoutarouOreki
a8b0e23ed6 Merge remote-tracking branch 'upstream/master' into changelog-overlay 2018-07-26 15:41:33 +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
HoutarouOreki
80808bddbf Add changelog listing 2018-07-22 05:28:43 +02:00
HoutarouOreki
b5207d65f7 Show listing graph; Slight refactor 2018-07-21 10:05:12 +02:00
HoutarouOreki
ba0430752c Check wether a chart is populated; Fixes to graph's colour setting 2018-07-21 09:45:14 +02:00
HoutarouOreki
ce0029eabf Make build's creation date not nullable 2018-07-21 03:19:30 +02:00
HoutarouOreki
8d4de68c39 Nullables in APIChangelog; Primitive changelog entries display 2018-07-20 23:57:46 +02:00
HoutarouOreki
c36a303b36 Fix ChangelogEntries being a list of objects 2018-07-20 23:14:05 +02:00
HoutarouOreki
b049ffa11d Improve fake-api 2018-07-20 18:23:25 +02:00
HoutarouOreki
02a8fb2154 Update comments; Improve neighboring builds handling;
Apply fixes to things pointed out by AppVeyor
2018-07-20 15:48:20 +02:00
HoutarouOreki
227394925a Add neighboring builds handling;
+ provoke angry AppVeyor
2018-07-20 13:51:31 +02:00
HoutarouOreki
1b3010a1b5 Remove accidental partial modifier in APIChangelog 2018-07-20 12:33:44 +02:00
HoutarouOreki
c7669b2128 Add build-scoped requests;
Add OnClick to TooltipIconButton; Actions on pressing previous/next in builds
2018-07-20 12:22:31 +02:00
HoutarouOreki
1857c91647 Expand APIChangelog; Normalize its line endings 2018-07-20 11:20:01 +02:00
HoutarouOreki
a857999950 Refactor3 2018-07-20 00:52:50 +02:00