smoogipoo
|
aac371ba6e
|
Use CMC for all of multiplayer
|
2019-02-05 19:00:08 +09:00 |
|
Dean Herbert
|
09056fd0d8
|
Merge branch 'master' into resources-via-nuget
|
2019-01-31 18:40:45 +09:00 |
|
smoogipoo
|
91302ea0bc
|
Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
|
2019-01-29 21:21:36 +09:00 |
|
Dean Herbert
|
bbc24bbfdd
|
Merge remote-tracking branch 'upstream/master' into resources-via-nuget
# Conflicts:
# osu-resources
# osu.sln
|
2019-01-29 12:19:35 +09:00 |
|
Dean Herbert
|
8d4faafdbe
|
Rename file to match class
|
2019-01-28 18:41:57 +09:00 |
|
Dean Herbert
|
628b3e1119
|
Move osu-resources to nuget
|
2019-01-28 18:33:39 +09:00 |
|
Dean Herbert
|
1404ba6625
|
Remove unnecessary changes
|
2019-01-28 15:56:55 +09:00 |
|
Dean Herbert
|
014ea972d9
|
Merge remote-tracking branch 'origin/master' into samah-ios
|
2019-01-25 11:51:44 +09:00 |
|
smoogipoo
|
8ea7ec6445
|
Convert everything to use IScreen
|
2019-01-24 19:47:44 +09:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
Shane Woolcock
|
728c744e4d
|
Merge branch 'master' into samah-ios
|
2019-01-23 22:19:49 +10:30 |
|
Dean Herbert
|
f107a922b4
|
Add tests for key counter inside player heirarchy
|
2019-01-23 14:51:25 +09:00 |
|
Shane Woolcock
|
fbed8c3242
|
Pass GameHost to BeatmapManager in visual tests
|
2019-01-22 22:07:41 +10:30 |
|
Shane Woolcock
|
10b91e18bd
|
Merge branch 'master' into samah-ios
# Conflicts:
# osu.Game/osu.Game.csproj
|
2019-01-19 18:03:58 +10:30 |
|
Shane Woolcock
|
f26a551e95
|
Revert audio changes
|
2019-01-19 17:40:37 +10:30 |
|
Dean Herbert
|
7bcf056872
|
Merge branch 'master' into update-framework
|
2019-01-16 19:16:53 +09:00 |
|
Dan Balasescu
|
75113db438
|
Merge branch 'master' into fix-skip-button-scaling
|
2019-01-16 16:37:37 +09:00 |
|
Dean Herbert
|
bfb18b4ffb
|
Update framework and other nuget packages
|
2019-01-16 10:14:37 +09:00 |
|
Shane Woolcock
|
a6c54a9675
|
Merge branch 'master' into samah-ios
|
2019-01-12 00:16:09 +10:30 |
|
Unknown
|
6eff79913b
|
remove blank lines
|
2019-01-11 10:34:56 +01:00 |
|
Dean Herbert
|
e2dd025225
|
Fix scaling of SkipOverlay when UI scale is adjusted
Closes #4040.
|
2019-01-11 16:54:42 +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 |
|
Shane Woolcock
|
19693c3e51
|
Use TrackManager CreateWaveform to fix editor crashes
|
2019-01-08 17:10:31 +10:30 |
|
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
|
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 |
|