1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 10:17:24 +08:00
Commit Graph

2232 Commits

Author SHA1 Message Date
Dean Herbert
05c6829deb Move all APIAccess State changes to the local thread
Previously changes to the state were triggering events like Logout, which could get things into a bad state.
2017-09-27 12:18:24 +08:00
Dean Herbert
f9300ec3fe Populate author using existing data for now 2017-09-25 23:34:56 +08:00
Dean Herbert
a80f0d4858 Merge branch 'master' into chat-commands 2017-09-25 15:52:35 +08:00
Dean Herbert
2c99fa29f0 Merge branch 'master' into net46 2017-09-25 12:43:35 +08:00
Huo Yaoyuan
2b11ecec13 Remove usings to extensions. 2017-09-24 06:03:52 +08:00
Huo Yaoyuan
c5aebf6401 Use TimeSpan to represent time. 2017-09-24 03:23:31 +08:00
Huo Yaoyuan
d277952e0f Use DateTimeOffset.ToUnixTime 2017-09-24 00:42:46 +08:00
WebFreak001
e04526222c URL encode beatmap filename 2017-09-22 22:47:26 +02:00
MrTheMake
02bc429911 CI fix 2017-09-22 15:37:17 +02:00
MrTheMake
18c26a85ba Added an infoMessage class to represent system messages that aren't errors 2017-09-22 15:30:07 +02:00
MrTheMake
31e26364a6 Initial implementation of chat commands 2017-09-22 01:47:24 +02:00
Jorolf
72141935e8 make pagination work and remove duplication in RanksSection 2017-09-21 22:07:23 +02:00
Jorolf
5b90f45691 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-09-19 21:26:05 +02:00
TocoToucan
51a5e963bb Dispose IDisposable object before method returns 2017-09-16 15:10:24 +03:00
Dean Herbert
b72921b30e Ensure an OnlineBeatmapID is present before attempting API requests 2017-09-15 12:44:48 +09:00
Dean Herbert
98b847b025 Add API retrieval support 2017-09-14 20:08:07 +09:00
naoey
5f5dd54f9d Use a List instead of a Dictionary. 2017-09-09 09:56:01 +05:30
naoey
20becbe576 Use the specifically created progress action, add license header. 2017-09-09 01:53:42 +05:30
naoey
20f93c83d6
Make downloads happen in BeatmapManager. 2017-09-09 00:57:40 +05:30
MrTheMake
0b1403683b Moved OnlineScore inside GetScoresRequest.cs 2017-09-08 12:21:35 +02:00
MrTheMake
526ee107b8 Use a method to apply a beatmap, its ruleset and the mods. 2017-09-08 12:17:16 +02:00
MrTheMake
01553fc9ef Moved all online related score parsing to its class 2017-09-08 02:46:54 +02:00
MrTheMake
a7f874e5b6 Merge branch 'master' into leaderboard-scores 2017-09-07 18:25:33 +02:00
MrTheMake
709aa1ed3d Moved all online score related parsing to its own class 2017-09-07 18:20:14 +02:00
Dean Herbert
4f4b0a1f35 Allow posting to chat in all channels 2017-09-06 20:26:01 +09:00
Dean Herbert
3c10b2d3d9 Populate set IDs in GetBeatmapSetsResponse 2017-08-24 20:14:35 +09:00
Dean Herbert
314108146a Add a download API request 2017-08-24 20:14:17 +09:00
Dean Herbert
a9fe1d94f7 Remove unnecessary using 2017-08-21 23:41:51 +09:00
Dean Herbert
7d1c270126 Review fixes 2017-08-21 23:34:08 +09:00
Dean Herbert
1d0b89d592 Restore usage of AddRange 2017-08-21 18:51:14 +09:00
Dean Herbert
877c69d5fe Add local chat echo support 2017-08-21 17:43:26 +09:00
MrTheMake
105048500a Made modString private and moved the beatmap assignment inside GetScoresRequest 2017-08-15 15:30:53 +02:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
f705589bf2 Rename NotificationManager to NotificationOverlay 2017-07-28 15:03:42 +09:00
Dean Herbert
5f53426a9a *Database -> *Store
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Huo Yaoyuan
6cf36da389 Merge branch 'master' into profile 2017-07-14 22:52:19 +08:00
Dean Herbert
3a4150c6c3 Merge remote-tracking branch 'upstream/master' into profile
# Conflicts:
#	osu.Game/Graphics/Containers/SectionsContainer.cs
2017-07-13 13:44:21 +09:00
DrabWeb
dc5ec319a2 Merge https://github.com/ppy/osu into drawable-room-update 2017-07-13 01:00:32 -03:00
DrabWeb
fbe414d780 Cleanup. 2017-07-11 01:03:38 -03:00
DrabWeb
84701846ec Merge https://github.com/ppy/osu into osu-direct-search 2017-07-11 00:26:49 -03:00
DrabWeb
fe875957a7 Share ruleset and type displaying, fix tag team icon. 2017-06-24 05:43:52 -03:00
Dean Herbert
b90c9bcacf Merge branch 'master' into profile 2017-06-23 22:51:31 +09:00
Dean Herbert
81de1bd5a7 Merge branch 'master' into multiplayer-room-inspector 2017-06-23 21:55:18 +09:00
Huo Yaoyuan
273e2b4a3c Fill more json fields. 2017-06-15 22:09:53 +08:00
John Neijzen
4abad17b92 Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
DrabWeb
312fd16631 Ruleset filtering 2017-06-07 11:00:05 -03:00
DrabWeb
f7f4f5e155 Request sorting, fix VS Code's "refactoring" 2017-06-07 10:40:18 -03:00
DrabWeb
8006fab3c7 Merge https://github.com/ppy/osu into osu-direct-search 2017-06-07 09:56:13 -03:00
Dean Herbert
94c961ddb8 CI Fixes 2017-06-07 20:16:34 +09:00
Dean Herbert
6a12173175 Add very temporary data source for social browser 2017-06-07 20:05:43 +09:00
DrabWeb
a483422b44 CI fixes 2017-05-30 22:23:00 -03:00
DrabWeb
9e01074852 Add GameType and DrawableGameType 2017-05-30 21:41:20 -03:00
DrabWeb
3aa1f35127 Basic layout 2017-05-30 05:12:11 -03:00
DrabWeb
95cfce2950 Rank status filtering 2017-05-28 02:43:37 -03:00
DrabWeb
8745948a01 Basic searching in osu!direct, move BeatmapSetOnlineInfo covers into their own class 2017-05-28 02:26:25 -03:00
DrabWeb
d29ebb139f Cleanup 2017-05-26 03:38:52 -03:00
DrabWeb
fb0b54e66a Remove merge error 2017-05-26 03:28:09 -03:00
DrabWeb
64016f9466 Merge https://github.com/ppy/osu into channel-selection 2017-05-26 03:24:41 -03:00
DrabWeb
9798117d53 Move RoomStatus to a class instead of enum 2017-05-22 21:13:57 -03:00
DrabWeb
25b457e994 Proper Bindable usage 2017-05-22 13:05:18 -03:00
DrabWeb
65df2d2b70 MultiplayerRoomStatus -> RoomStatus 2017-05-22 12:46:41 -03:00
DrabWeb
2c16d9c3a7 CurrentBeatmap -> Beatmap 2017-05-22 12:45:40 -03:00
DrabWeb
03f6cded84 MultiplayerRoom -> Room 2017-05-22 12:44:58 -03:00
DrabWeb
0795089d86 Merge https://github.com/ppy/osu into drawable-multiplayer-room 2017-05-22 01:06:05 -03:00
DrabWeb
e5ee7096f8 Initial cleanup 2017-05-22 00:07:15 -03:00
DrabWeb
a60d1efc21 Basic channel joining (ignore layout in ChatOverlay, temporary) 2017-05-20 21:26:39 -03:00
DrabWeb
7eba619f80 Move Joined to Channel 2017-05-20 19:37:11 -03:00
Huo Yaoyuan
cd065b8ff3 Add back GetHashCode. 2017-05-18 05:27:20 +08:00
Huo Yaoyuan
88f8619e9a More missed exceptions. 2017-05-18 02:46:12 +08:00
Huo Yaoyuan
e2b1fcc088 Use string.Join in GetMessagesRequest. 2017-05-18 02:40:33 +08:00
Huo Yaoyuan
6c9505fa3a Handle possible nulls. 2017-05-17 18:11:38 +08:00
Huo Yaoyuan
b9b45493e6 Use generic IComparable together with IEqutable for Message. 2017-05-17 18:02:17 +08:00
Dean Herbert
78c1d4581f
Revert "Use generic IComparable for message."
This reverts commit aaaee5ed10.
2017-05-17 13:44:43 +09:00
Huo Yaoyuan
aaaee5ed10 Use generic IComparable for message. 2017-05-16 21:46:22 +08:00
Huo Yaoyuan
d213706d07 Use DateTimeOffset. 2017-05-16 21:14:50 +08:00
Dean Herbert
5a9745b492 Update API endpoint 2017-05-16 21:37:55 +09:00
Dean Herbert
041d4f93c0 Fix typo 2017-05-16 20:08:22 +09:00
Dean Herbert
23807aa3b9 Better handling of logged in state 2017-05-16 19:55:45 +09:00
Dean Herbert
2384f7b0c1 Ensure LocalUser is never null 2017-05-16 19:49:50 +09:00
Dean Herbert
dcd4b4450d Add error message in chat when attempting to use commands 2017-05-15 13:26:35 +09:00
Dean Herbert
c4a93cbc85 Move drawable chat related classes to better namespace 2017-05-12 15:38:51 +09:00
Dean Herbert
f248efb01f CI Fixes 2017-05-12 13:25:50 +09:00
Dean Herbert
ffa59c6cb3 Support read-only channels, post to correct channel.
Also cache drawable channels better.
2017-05-11 23:51:26 +09:00
Dean Herbert
a77049213d Add basic hard-coded inefficient multi-channel support. 2017-05-11 23:10:48 +09:00
Dean Herbert
c3d2cdd2f2 Fix typo 2017-05-11 19:49:28 +09:00
Dean Herbert
4e881644f6 Add thread-safety on access token validation logic. 2017-05-11 19:39:01 +09:00
Dean Herbert
7d221802a2 Fix refresh tokens not working correctly
Turns out there's plenty of slashes in refresh tokens.
2017-05-11 19:38:57 +09:00
Huo Yaoyuan
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
Jorolf
6b08f485b4 fix typo 2017-04-30 14:45:23 +02:00
Dean Herbert
9ecfb4e4bf Last CI fix. 2017-04-24 20:22:04 +09:00
Dean Herbert
9670ea9a2a CI fixes 2017-04-24 20:16:41 +09:00
Dean Herbert
8b048a6706 Fix typo. 2017-04-24 19:33:48 +09:00
Dean Herbert
e1a2f1bc7a Add beatmap metrics lookup. 2017-04-24 19:17:11 +09:00
Dean Herbert
9cb789f426
Use 24 hour display for chat times. 2017-04-20 17:10:05 +09:00
Dan Balasescu
7475b39dc1 Merge branch 'master' into chat-post-support 2017-04-19 21:29:07 +09:00
Dean Herbert
dda3fb85ee
Add user colour support. 2017-04-19 19:07:38 +09:00
Dean Herbert
3129708ccb
Add chat sending support. 2017-04-19 18:46:52 +09:00
Dean Herbert
325af333b9
Update API responses for chat. 2017-04-19 18:46:48 +09:00
Dean Herbert
83fa143e17
Bring API request structure up-to-date. 2017-04-19 16:05:06 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Dean Herbert
039f4a65dc
Combine user models. 2017-03-28 00:08:24 +09:00
Dean Herbert
55df07a872
Fix username being cleared when it shouldn't be. 2017-03-28 00:08:22 +09:00
smoogipooo
2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
Dean Herbert
2b82f256d2
More resilient API cancel/fail logic. 2017-03-15 20:08:12 +09:00
Dean Herbert
1855f48997
Add cancellation support for API requests. 2017-03-15 18:07:26 +09:00
Dean Herbert
08e93275fa
Styling fixes. 2017-03-15 17:50:52 +09:00
Dean Herbert
e3e19a156c
Rename incorrect class file. 2017-03-15 14:37:29 +09:00
Dean Herbert
8f5d262f30
Add GetScoresRequest API methods. 2017-03-15 14:06:05 +09:00
Dean Herbert
dad6060149
Fix warnings not covered by resharper locally. 2017-03-09 16:07:34 +09:00
Dean Herbert
da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dean Herbert
c24a4f57d9
Raise errors on unnecessary using statements. 2017-03-06 19:15:47 +09:00
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
Dean Herbert
4163569e57
Fix some license headers. 2017-03-02 18:45:20 +09:00
Thomas Müller
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
default0
03889e6ca6 Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
default0
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Thomas Müller
0d3cc39cbc Merge branch 'master' into general-fixes 2017-02-22 08:01:34 +01:00
Dean Herbert
d00ea4564f
Fix API coming online too early in race scenarios. 2017-02-22 14:09:48 +09:00
Dean Herbert
5f29b0dc4f
Update in line with framework changes. 2017-02-21 15:46:04 +09:00
Dean Herbert
6a83620589
Add better focus handling and padding/margin updates. 2017-02-20 21:11:09 +09:00
Dean Herbert
4afa434962
Maintain a scroll position when scrolled to the bottom of a chat channel. 2017-02-20 21:10:23 +09:00
Dean Herbert
75b66871dd
Add colourised usernames. 2017-02-20 21:09:56 +09:00
Dean Herbert
7a2eedbd7e
Add message batching per-channel. 2017-02-20 21:09:34 +09:00
Dean Herbert
729f2eec8d
Increase maximum chat history. 2017-02-20 21:07:44 +09:00
Dean Herbert
c6fa5cc803 Fix order of execution when populating initial messages. 2017-02-19 18:46:19 +09:00
Dean Herbert
cde660a8ef Scroll to bottom. 2017-02-19 18:07:35 +09:00
Dean Herbert
aac4ba2baa Add input box to ChatOverlay. 2017-02-19 18:02:25 +09:00
Dean Herbert
0da0ef5a1b Fix padding, fonts and alignment of chat display. 2017-02-19 17:06:41 +09:00
Thomas Müller
4b0d6cd26b Don't rely on default relative size of ScrollContainer. 2017-02-17 20:08:28 +01:00
Thomas Müller
aaaf7163e0
Update framework. 2017-02-13 17:46:50 +09:00
Andrey Zavadskiy
e06aa44c4c Warning Fixes 2017-02-09 16:18:08 +03:00
Dean Herbert
5757f844bf
Fix a potential crash due to API being too eager to declare online state. 2017-02-07 20:29:40 +09:00
Dean Herbert
6b011a50d2
Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
Drew DeVault
70ecf48ca7 Add central color class
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.

Closes #126
2017-01-09 17:20:31 -05:00
Dean Herbert
f356640cb7 Add missing licence headers. 2016-12-06 19:07:15 +09:00
Dean Herbert
6ccce88a0e Add proper user data retrieval on connect. 2016-12-01 16:44:24 +09:00
Dean Herbert
ed879f33df Add logout button and check for inputs before allowing login. 2016-11-30 19:43:03 +09:00
Dean Herbert
01dc7cb5c2 Thread safety, username saving correctly etc. 2016-11-30 19:22:36 +09:00
Dean Herbert
3fa80d2376 Update client id/secret and bring API endpoints up-to-date. 2016-11-30 18:30:24 +09:00
Dean Herbert
11f726ad45 Add basic login flow. 2016-11-30 18:30:15 +09:00
Dean Herbert
18509e6a60 ChatConsole -> ChatOverlay. Namespace tidying. 2016-11-30 18:30:06 +09:00
Dean Herbert
34e91c8474 Add the concept of IOnlineComponents, registered tot he API for handling state changes. 2016-11-30 18:30:01 +09:00
Huo Yaoyuan
53deaf2a00 Merge branch 'master' 2016-11-16 10:51:39 +08:00
Huo Yaoyuan
c8d23408d7 Fix ChatLine for now. 2016-11-15 01:49:05 +08:00
Dean Herbert
0f4538f69f Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
Thomas Müller
ac99e2d488 Avoid using load to construct the drawable hierarchy whereever possible. 2016-11-12 18:34:36 +01:00
Dean Herbert
cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
2016-11-12 20:18:26 +09:00
Drew DeVault
ee24cd310c Convert everything to DI pattern 2016-11-10 16:41:18 -05:00
Dean Herbert
b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
Dean Herbert
28a41dcca6 Fix FlowContainers. 2016-10-22 18:05:46 +09:00
Dean Herbert
cdef75c98b Fix AutoSize references. 2016-10-22 17:50:42 +09:00
Thomas Müller
7751a85e14 Update framework. 2016-10-16 14:10:06 +02:00
Huo Yaoyuan
aad5c6a44d Use DateTimeOffset for message timestamp. 2016-10-13 21:42:51 +08:00
Dean Herbert
2566d6bfe0 Fix regressions with HitRenderers, while also cleaning them up. 2016-10-13 10:10:15 +09:00
Dean Herbert
8707c7f746 Fix regression causing multi-line (wrapped) chat messages to overlap. 2016-10-13 03:06:06 +09:00
Dean Herbert
aa96d98822 Merge branch 'master' into limit-game-access
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
	osu.Game/GameModes/Menu/ButtonSystem.cs
	osu.Game/Online/Chat/Display/ChatLine.cs
	osu.Game/OsuGame.cs
	osu.Game/Overlays/ToolbarButton.cs
2016-10-12 20:44:33 +09:00
Dean Herbert
4052a665bf Remove all non-load Game access. 2016-10-12 15:47:08 +09:00
Dean Herbert
1c0b769451 Centralise the maximum chat history variable. 2016-10-12 15:25:07 +09:00
Dean Herbert
05031d18ef Fix some display regressions in ChatConsole. 2016-10-12 13:35:21 +09:00
Dean Herbert
c0ea061bd4 Update framework; amend ToolbarButton to use padding and Children initialiser. 2016-10-12 12:24:07 +09:00
Dean Herbert
97c2dcf590 Use PaddingContainer for better layout. 2016-10-08 23:25:38 +09:00
Dean Herbert
47faf8f40d Add in-game chat display, along with a global hotkey handling method. 2016-10-08 19:23:21 +09:00
Dean Herbert
3067c890ce General improvements to chat querying and logic organisation. 2016-10-08 19:23:21 +09:00
Dean Herbert
ac16bffe49 Bring framework and resources up-to-date. 2016-10-01 19:05:26 +09:00
Dean Herbert
b4c9dca54b Merge remote-tracking branch 'upstream/master' into api-channels-messages
Conflicts:
	osu.Game/Online/Chat/Message.cs
2016-09-29 23:54:33 +09:00
Dean Herbert
a69c5b4fc0 Fix a few warnings. 2016-09-29 23:46:27 +09:00
Dean Herbert
7c98ef1b3d Move initialisation of ChatLine to Load. 2016-09-28 16:33:20 +09:00
Dean Herbert
67652a6d8e Improve formatting of chat lines. 2016-09-27 20:45:26 +09:00
Dean Herbert
754d9c78bd Simple chat message display functionality. 2016-09-27 19:22:22 +09:00
Dean Herbert
154b914a3a Fix API scheduling. 2016-09-27 19:22:08 +09:00
Dean Herbert
28045b7136 Add back basic API support for channel/message retrieval. 2016-09-27 18:33:52 +09:00
Dean Herbert
997c6f45f6 Update framework again. 2016-09-21 17:37:33 +09:00
Dean Herbert
7d2f303e61 Update font logic to override framework default.
# Conflicts:
#	osu.Game/OsuGame.cs
2016-09-01 22:47:48 +09:00
Dean Herbert
013cf1cf3f Fix broken namespaces. 2016-08-31 20:16:05 +09:00
Dean Herbert
8870935a4b Add basic online API support. 2016-08-31 20:14:01 +09:00