jorolf
|
6ba7e2b670
|
split the profile header into several components
|
2019-01-11 01:12:19 +01:00 |
|
Dean Herbert
|
2c2ed1ae47
|
Merge branch 'master' into profile-header-update
|
2019-01-10 18:34:39 +09:00 |
|
Dean Herbert
|
aa68bbc1d9
|
Merge branch 'master' into fix-match-select-crash
|
2019-01-10 15:40:03 +09:00 |
|
smoogipoo
|
3dc3d4cb40
|
Add test
|
2019-01-10 15:25:12 +09:00 |
|
smoogipoo
|
122fc2de58
|
Show room leaderboard instead in the lounge
|
2019-01-08 19:24:55 +09:00 |
|
Dean Herbert
|
49ba4e5a14
|
Merge branch 'master' into update-framework
|
2019-01-07 18:51:54 +09:00 |
|
Dean Herbert
|
f6018294b5
|
Update framework
|
2019-01-07 18:50:27 +09:00 |
|
Roman Kapustin
|
469a64a7cd
|
The code must not contain multiple blank lines in a row
|
2019-01-05 21:03:03 +03:00 |
|
Roman Kapustin
|
4b5fc85875
|
Use Find instead of FirstOrDefault
|
2019-01-05 19:35:33 +03:00 |
|
Dean Herbert
|
01f6199c49
|
Merge branch 'master' into profile-header-update
|
2019-01-04 16:38:42 +09:00 |
|
Dean Herbert
|
b6dc6c4a74
|
Merge branch 'master' into do_not_use_local_user_for_autoplay_score
|
2019-01-04 13:11:17 +09:00 |
|
smoogipoo
|
a7db0bbb91
|
Sort rooms based on their API position
|
2018-12-28 01:45:19 +09:00 |
|
smoogipoo
|
c614505b7c
|
Revert unnecessary change to testcase
|
2018-12-27 16:20:37 +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
|
8cf30bdb6a
|
Play with delegate
|
2018-12-26 22:16:35 +09:00 |
|
Dean Herbert
|
bf9954aede
|
Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip
# Conflicts:
# osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs
# osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs
# osu.Game/Screens/Multi/IRoomManager.cs
# osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
# osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
# osu.Game/Screens/Multi/RoomManager.cs
|
2018-12-26 21:32:12 +09:00 |
|
smoogipoo
|
152f3b1da3
|
Add processing overlay to lounge screen
|
2018-12-26 21:20:53 +09:00 |
|
smoogipoo
|
0c384417f1
|
Add processing overlay to room creation process
|
2018-12-26 21:19:02 +09:00 |
|
smoogipoo
|
2e5cd8b4e3
|
Fix post-rebase errors
|
2018-12-26 21:18:44 +09:00 |
|
smoogipoo
|
940d4a16bb
|
Add error message when creation fails
|
2018-12-26 21:18:44 +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 |
|
Dean Herbert
|
ae47eb61ca
|
Fix test not working when not logged in
|
2018-12-26 20:42:47 +09:00 |
|
smoogipoo
|
23d412e3ff
|
Fix post-rebase errors
|
2018-12-26 20:33:49 +09:00 |
|
smoogipoo
|
be9ba78d47
|
Add error message when creation fails
|
2018-12-26 20:33:19 +09:00 |
|
Dean Herbert
|
2353c204ee
|
Renaming
|
2018-12-26 20:05:57 +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
|
a8d0ff67a9
|
Add automated match settings overlay tests
|
2018-12-26 16:34:38 +09:00 |
|
Dean Herbert
|
b2fb027097
|
Remove old testcase
|
2018-12-26 15:26:46 +09:00 |
|
Dean Herbert
|
c902c1587a
|
Add tests and modify fallback logic
|
2018-12-25 19:17:32 +09:00 |
|
smoogipoo
|
96c9e5f209
|
Make DefaultBeatmap readonly
|
2018-12-25 18:34:45 +09:00 |
|
smoogipoo
|
1dd2a4e368
|
Fix host info not working
|
2018-12-25 18:07:19 +09:00 |
|
smoogipoo
|
23d21a45e5
|
More automated tests
|
2018-12-25 11:59:08 +09:00 |
|
smoogipoo
|
6712a68797
|
Create IRoomManager interface, add test for RoomsContainer
|
2018-12-25 11:45:50 +09:00 |
|
jorolf
|
2fe80d5568
|
Update ProfileHeader to the new design
|
2018-12-22 21:50:25 +01:00 |
|
jorolf
|
15ae0cd70a
|
Merge branch 'master' of git://github.com/ppy/osu into profile-header-update
|
2018-12-22 16:54:39 +01:00 |
|
jorolf
|
b4fa2d9049
|
WIP
|
2018-12-22 16:51:24 +01:00 |
|
smoogipoo
|
02365ee5ba
|
Merge remote-tracking branch 'origin/master' into timeshift-wip
|
2018-12-22 23:23:21 +09:00 |
|
smoogipoo
|
d9b8df1595
|
Merge remote-tracking branch 'origin/master' into user-registration
|
2018-12-22 17:19:28 +09:00 |
|
smoogipoo
|
bb08bf10a0
|
Fix post-merge issues
|
2018-12-22 16:26:27 +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 |
|
Dean Herbert
|
7e97d37df5
|
Merge remote-tracking branch 'upstream/master' into modular-results-screen
|
2018-12-22 16:20:39 +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
|
daa6292e08
|
Split results screen to allow for extensibility
|
2018-12-22 15:39:06 +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
|
6afd2f7263
|
Adjust styling of disabled settings
|
2018-12-22 15:00:35 +09:00 |
|