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