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
|
0e9991b81a
|
Merge remote-tracking branch 'origin/master' into timeshift-wip
|
2018-12-22 15:36:36 +09:00 |
|
Dean Herbert
|
e3308010c0
|
Merge pull request #3898 from peppy/leaderboard-modularity
Leaderboard modularity
|
2018-12-22 15:36:12 +09:00 |
|
smoogipoo
|
e657f13c15
|
Separate out Leaderboard into BeatmapLeaderboard
|
2018-12-22 14:44:36 +09:00 |
|
Dean Herbert
|
870d843fff
|
Fix username not displaying correctly in overlay
|
2018-12-22 14:40:55 +09:00 |
|
smoogipoo
|
f47ac35522
|
Add click to avatar
|
2018-12-22 14:23:53 +09:00 |
|
smoogipoo
|
d93421b796
|
Merge remote-tracking branch 'Joehuu/master' into timeshift-wip
# Conflicts:
# osu.Game/Screens/Play/HUD/ModDisplay.cs
|
2018-12-22 14:02:45 +09:00 |
|
Dean Herbert
|
81104f4803
|
Make standalone chat reuse more code from main chat overlay
|
2018-12-21 17:54:12 +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
|
aaac45ab8c
|
Add ability to select chat tabs with alt-1-9
|
2018-12-20 21:50:47 +09:00 |
|
smoogipoo
|
104a3c8ffc
|
Add click to avatar
|
2018-12-20 20:08:22 +09:00 |
|
Styphix
|
bacc07f5ec
|
Changed OsuFocusedOverlayContainer to WaveOverlayContainer from ChannelSelectionOverlay
Not sure what colour i shouldve gone for but im certain that this should be fine
|
2018-12-18 19:44:31 -05:00 |
|
Dean Herbert
|
e9f661bbf5
|
Merge branch 'master' into user-registration
|
2018-12-17 05:05:06 +09:00 |
|
Dean Herbert
|
0b5f3c00bf
|
Revert "Fix WaveOverlayContainer always being present"
This reverts commit a6fc1280943dea4a38f1942b7234b65d31726238.
|
2018-12-14 20:50:27 +09:00 |
|
Dean Herbert
|
13cabac386
|
Update in line with framework changes
|
2018-12-14 19:56:21 +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
|
a6fc128094
|
Fix WaveOverlayContainer always being present
|
2018-12-14 15:41:05 +09:00 |
|
smoogipoo
|
2aafaf9ce2
|
Merge branch 'timeshift-api-integration'
|
2018-12-13 17:07:39 +09:00 |
|
smoogipoo
|
208273f16a
|
Merge branch 'timeshift'
# Conflicts:
# osu.Game/osu.Game.csproj
|
2018-12-13 17:06:20 +09:00 |
|
Dean Herbert
|
4fc9902cd2
|
Fix reverting to default skin via settings button causing a hard crash
|
2018-12-12 21:30:21 +09:00 |
|
smoogipoo
|
450e4cd223
|
Hook up API
|
2018-12-12 19:04:11 +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
|
41c7d10dff
|
Fix compilation issues (+ use updated framework)
|
2018-12-10 13:48:05 +09:00 |
|
Dean Herbert
|
2a2561e5c8
|
Update framework and otehr nuget packages
|
2018-12-07 19:39:54 +09:00 |
|
Dean Herbert
|
2122966cd4
|
Show channel selector when no channels are joined
|
2018-12-07 13:26:31 +09:00 |
|
Dean Herbert
|
b0e2b56e85
|
Don't show warning screen if no previous account is detected
|
2018-12-06 16:54:08 +09:00 |
|
Dean Herbert
|
de8c5a6df0
|
Block input and show loading when submitting registration
|
2018-12-06 16:29:41 +09:00 |
|
Dean Herbert
|
09f985c721
|
Add warning lines
|
2018-12-06 15:49:06 +09:00 |
|
Dean Herbert
|
d5de5d1cb7
|
Fix textbox focus issues
|
2018-12-06 14:57:00 +09:00 |
|
Dean Herbert
|
cc3ccc4c40
|
Affix logo in place better
|
2018-12-06 12:53:35 +09:00 |
|
Dean Herbert
|
88052dcea1
|
Reset to welcome screen on exiting mid-process
|
2018-12-06 12:38:11 +09:00 |
|
Dean Herbert
|
d3f5111fa1
|
Use relative URL
|
2018-12-06 12:18:21 +09:00 |
|
Dean Herbert
|
e56f4cc8a5
|
Add remaining steps to registration screen
|
2018-12-06 11:58:09 +09:00 |
|
Dean Herbert
|
4f46fa4798
|
Hide on connect
|
2018-12-05 17:30:16 +09:00 |
|
Dean Herbert
|
1ca00f6662
|
Add registration API call and related error handling
|
2018-12-05 17:13:22 +09:00 |
|
Dean Herbert
|
1a974f64de
|
Initial design for user registration dialog
|
2018-12-05 12:57:26 +09:00 |
|
Dan Balasescu
|
78d1a1c499
|
Merge branch 'master' into fix-async-profile-logic
|
2018-12-03 20:55:23 +09:00 |
|
Dan Balasescu
|
f278dff49c
|
Merge branch 'master' into fix-chat-crash
|
2018-12-03 19:17:05 +09:00 |
|
Dean Herbert
|
7e35afd178
|
Fix loading scores on profile pages potentially causing long blocking operations
|
2018-12-03 18:37:44 +09:00 |
|
Dean Herbert
|
14d9f1d8bb
|
Fix hard crash due to out-of-order chat sequencing
|
2018-12-03 18:13:10 +09:00 |
|
smoogipoo
|
814d401eb0
|
Make ChannelSelectorTabItem not switchable
|
2018-12-03 11:48:36 +09:00 |
|
smoogipoo
|
7255a01bf5
|
Remove ChatTabControl
|
2018-12-03 11:48:21 +09:00 |
|
smoogipoo
|
a8ad7d4670
|
Add silent import parameter
|
2018-11-30 18:27:13 +09:00 |
|
Dean Herbert
|
059e9e180b
|
Apply review
|
2018-11-30 18:07:15 +09:00 |
|
Dean Herbert
|
3727955911
|
Refactors/renames
|
2018-11-30 16:35:45 +09:00 |
|
Dean Herbert
|
831cd3ed59
|
ScoreInfo scoreInfo -> ScoreInfo score
|
2018-11-30 15:18:52 +09:00 |
|
smoogipoo
|
a88b69ec43
|
Notify of existing imports
|
2018-11-28 20:19:35 +09:00 |
|
smoogipoo
|
219929eb47
|
Score -> ScoreInfo
|
2018-11-28 18:33:01 +09:00 |
|