1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 06:23:20 +08:00
Commit Graph

1376 Commits

Author SHA1 Message Date
David Zhao
e6a55cd674 Fix TestCaseEditor as well 2019-03-12 17:45:16 +09:00
David Zhao
921c4ce242 Make tests use new OsuScreenStack 2019-03-12 16:33:35 +09:00
smoogipoo
00191ca940 Actually set the beatmap difficulty 2019-03-12 15:24:35 +09:00
smoogipoo
059397ac50 Remove unnecessary early return for maching beatmap IDs 2019-03-12 14:40:13 +09:00
Dean Herbert
d0ae75af6e Add tests and fix scenario where all matching are contained by duplicate candidate 2019-03-11 18:13:33 +09:00
Dean Herbert
9df27f3a5f
Merge branch 'master' into prevent-null-lookup 2019-03-09 11:14:54 +09:00
Jamie Taylor
192c257aac
Add test steps for BeatmapDetailArea 2019-03-08 18:35:49 +09:00
smoogipoo
a40ffcc692 Apply formatting adjustments 2019-03-08 16:44:39 +09:00
smoogipoo
8c0e325d8b Reduce + make beatmap scores testcase work 2019-03-08 16:41:37 +09:00
smoogipoo
a7ad29ca9d Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design 2019-03-08 16:32:46 +09:00
smoogipoo
e00702f4e4 Merge remote-tracking branch 'origin/master' into fix-non-async-load 2019-03-08 15:14:14 +09:00
Dean Herbert
345c7f4fa8 Fix test regression 2019-03-08 12:30:52 +09:00
Dean Herbert
30a0bb4a25
Merge branch 'master' into fix-duplicate-bg-sprites 2019-03-08 12:25:23 +09:00
Dan Balasescu
101009c92e
Merge branch 'master' into fix-autoplay-tests 2019-03-08 12:14:40 +09:00
Dean Herbert
cfac47413c Disable failing tests temporarily 2019-03-08 10:42:25 +09:00
smoogipoo
30c6a7c3c5 Merge remote-tracking branch 'nekodex/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/ClickableUserContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
2019-03-07 18:48:23 +09:00
Dean Herbert
1f44dde96b Fix autoplay tests not working 2019-03-07 18:34:56 +09:00
Jamie Taylor
8a69fc5534
Use AddUntilStep instead of AddWaitStep 2019-03-06 19:57:09 +09:00
Jamie Taylor
b5e89e2f3b
Add additional testing to check for extra children in the future 2019-03-06 19:13:25 +09:00
Dean Herbert
8a6fa0915e
Merge branch 'master' into simplify-gameplay-clock 2019-03-05 20:22:46 +09:00
Dean Herbert
76ce3954a0 Rename PauseContainer 2019-03-05 19:30:55 +09:00
Dean Herbert
424e02f165
Merge pull request #4411 from smoogipoo/fix-custom-sample-volume
Fix volume not being considered for file samples
2019-03-05 18:41:52 +09:00
Dean Herbert
5aaa2511eb
Merge pull request #4374 from Joehuu/status-direct-list
Add beatmap status on direct list panels
2019-03-05 18:22:56 +09:00
smoogipoo
a08086cc8a Fix volume not being considered for file samples 2019-03-05 18:21:29 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
smoogipoo
896088bc02 Remove using 2019-03-05 17:23:11 +09:00
smoogipoo
4764a771d0 Add testcase 2019-03-05 17:14:30 +09:00
Dean Herbert
01f1018d02 Tidy up clock logic using DI and a GameplayClock 2019-03-05 13:37:51 +09:00
Dean Herbert
5487b011d6 Fix some inspections rider isn't able to deal with automatically 2019-03-02 14:34:56 +09:00
David Zhao
e3338e94d1 Make test cases more compact, add two way toggles 2019-02-28 20:01:15 +09:00
David Zhao
19d529c1c8 Move test steps into setup 2019-02-28 18:26:41 +09:00
Dean Herbert
b2872b47d0
Merge branch 'master' into UserDimLogic 2019-02-28 17:18:04 +09:00
David Zhao
69b1c76dce Actually implement blurring fix 2019-02-28 16:51:17 +09:00
David Zhao
dbe5887f7e Fix issue for user hover blur for now by checking for current screen, fix test. 2019-02-28 16:18:46 +09:00
Dean Herbert
774116923b A few fixes 2019-02-28 14:45:59 +09:00
David Zhao
4ceafef79c Add missing reference 2019-02-28 14:40:31 +09:00
David Zhao
e5607d7711 Add back "THIS IS A STORYBOARD" storyboard 2019-02-28 14:33:29 +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
3e1f283281 Merge remote-tracking branch 'upstream/master' into more-inspections 2019-02-28 13:09:18 +09:00
Dean Herbert
83e9dfda75
Merge branch 'master' into fix-osugame-test-case 2019-02-28 12:33:00 +09:00
Dean Herbert
5f6ad51e7e
Merge branch 'master' into fix-osugame-test-case 2019-02-27 22:36:13 +09:00
Dean Herbert
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
Dean Herbert
9f8d03e1b6 Remove excess newlines 2019-02-27 21:03:35 +09:00
Dean Herbert
5c6db17865 Merge remote-tracking branch 'upstream/master' into fix-square-graph-overhead 2019-02-27 21:02:28 +09:00
Dean Herbert
3af7d4939c Add debounce testing 2019-02-27 19:11:09 +09:00
Dean Herbert
f942515fcd Add licence header 2019-02-27 18:59:45 +09:00
Dean Herbert
b555f793d9 Fix whitespace 2019-02-27 18:57:27 +09:00
Dean Herbert
a8bc87f5d8 Add basic skin tests
Should be expanded in the future. Bare minimum for now to test fail case.
2019-02-27 18:52:39 +09:00
David Zhao
246240e936 Remove unused includes 2019-02-27 18:04:33 +09:00
David Zhao
882fff1631 Assert storyboard visibilty at both steps of toggle 2019-02-27 17:56:44 +09:00
David Zhao
14ffd9efe8 Add fake storyboard to visually assess storyboard dim 2019-02-27 17:02:04 +09:00
David Zhao
ebec944bb8 Use actual song select for test case with beatmap import 2019-02-27 14:15:45 +09:00
Dean Herbert
56697339b3
Merge branch 'master' into fix-disabled-set-crash 2019-02-27 11:14:42 +09:00
Dean Herbert
bf6815b2a7 Fix OsuGame test case not working 2019-02-26 18:02:24 +09:00
David Zhao
59fca568c9 Remove null checks for synchronous loads 2019-02-26 17:56:42 +09:00
David Zhao
d23f399375 Add back song select wait 2019-02-26 17:43:42 +09:00
David Zhao
60ecb99dfb Have test cases create a new screen stack each time 2019-02-26 17:31:21 +09:00
Dean Herbert
5b88c2ea0f Add visual test 2019-02-26 16:12:40 +09:00
Dean Herbert
3549369822 Restore previous wait time
For whatever reason, this is required?
2019-02-26 10:27:54 +09:00
Dean Herbert
217f692798 Extract wait logic into separate method
Also reduces the required wait time.
2019-02-26 10:11:36 +09:00
Dean Herbert
c58d305fc6 private goes after public 2019-02-26 09:56:22 +09:00
Dean Herbert
14e427fed7 Rename some methods (they weren't Asserting) 2019-02-26 09:54:28 +09:00
David Zhao
a7585dea21
Make screen stack readonly 2019-02-25 22:17:51 +09:00
David Zhao
d750023c52 Fix TestCasePlayerLoader not having a background stack 2019-02-25 22:05:49 +09:00
Dean Herbert
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
David Zhao
af4606f3d2 Create new test for StoryboardReplacesBackground 2019-02-25 12:35:01 +09:00
David Zhao
24f5bc7a75 Add documentation and move storyboard init logic 2019-02-24 20:03:24 +09:00
David Zhao
f4acd6e48f Move PlayerLoader tests out of constructor, Improve Documentation 2019-02-24 18:10:59 +09:00
David Zhao
f56f1fc4f7 Clean up left over test code 2019-02-23 15:06:04 +09:00
David Zhao
bb01948283 Use .Value with new bindable changes 2019-02-22 20:44:02 +09:00
David Zhao
ab3fa91a2f
Merge branch 'master' into UserDimLogic 2019-02-22 20:38:10 +09:00
David Zhao
76de39a344 Put user dim logic in yet another container inside UserDimContainer 2019-02-22 20:34:51 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
David Zhao
a4162a69fb Remove leftover usage of dimlevel in BackgroundScreenBeatmap 2019-02-22 18:01:50 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
David Zhao
6bf831b96f Fix TransitiouOutTest getting stuck on pause 2019-02-22 17:15:05 +09:00
Dean Herbert
2c9e6adfd4
Merge branch 'master' into bindable-valuechanged 2019-02-22 17:14:05 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
smoogipoo
d4bdae4b04 Disable TestInstantPolling 2019-02-22 16:59:52 +09:00
David Zhao
918a60ebbf Create a new player every time a test is performed. 2019-02-22 16:56:03 +09:00
David Zhao
65cdac60c3 Add tests to make sure the background is always the same through screen transitions 2019-02-22 14:43:05 +09:00
David Zhao
94bc552282 Fix backgrounds not fading out when replaced by storyboard, add test for this 2019-02-22 11:41:28 +09:00
smoogipoo
d99eaa3fce Simplify expression 2019-02-21 19:25:08 +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
David Zhao
bf06674e87 Clean up test case 2019-02-21 18:19:50 +09:00
David Zhao
ad5e81f0cd Add test case for background preview, fix unit tests 2019-02-21 15:24:26 +09:00
smoogipoo
7e41fbc29b Remove LegacyDifficultyCalculator 2019-02-21 13:12:37 +09:00
smoogipoo
cc33f230b4 Merge remote-tracking branch 'origin/master' into osu-fontusage 2019-02-20 20:37:48 +09:00
David Zhao
49c5a9fc30
Merge branch 'master' into UserDimLogic 2019-02-20 17:30:34 +09:00
David Zhao
5bf405f949 Fix bindable name in tests 2019-02-20 16:56:57 +09:00
David Zhao
1bd1b6b099 Move user dim logic into UserDimContainer instead 2019-02-20 16:53:57 +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
f2ad2931c7 Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock 2019-02-20 11:37:33 +09:00
David Zhao
87717dcf9e Remove redundant constructors 2019-02-19 19:57:55 +09:00
David Zhao
2e375a9186 Add test cases for upwards traversal of screen stack 2019-02-19 19:44:26 +09:00
Dean Herbert
2bf5534bf1
Merge pull request #4292 from peppy/fix-multi-screen-test
Fix TestCaseMultiScreen intermittent failures
2019-02-19 17:08:59 +09:00
Dean Herbert
4504aee089 Unnecessary using 2019-02-19 16:50:56 +09:00
Dean Herbert
618455f7ba Remove exit step (needs login to show properly) 2019-02-19 16:47:59 +09:00
Dean Herbert
0609fcf7d4 Fix TestCaseMultiScreen intermittent failures 2019-02-19 15:52:53 +09:00
smoogipoo
93b7b51d0a timeRate -> clockRate 2019-02-19 14:29:23 +09:00
smoogipoo
9d8ba4073c Add tests for LimitedCapacityStack 2019-02-19 14:18:49 +09:00
Dean Herbert
0fce23a36b Fix test regression 2019-02-19 12:38:45 +09:00
Dean Herbert
f8033a3b35 Give TestWorkingBeatmap a reference clock 2019-02-19 12:27:30 +09:00
David Zhao
af049004dd Add test cases for transitioning into pause overlay and into results 2019-02-18 19:53:55 +09:00
David Zhao
b353b69587 Use a bindable for updating dim status instead 2019-02-18 18:58:34 +09:00
David Zhao
4e07aba548 Make it so visual tests only load the osu ruleset 2019-02-18 18:12:45 +09:00
David Zhao
af30aefe77
Merge branch 'master' into UserDimLogic 2019-02-18 16:56:16 +09:00
David Zhao
79b12ef085 Fix test build failure 2019-02-18 15:29:39 +09:00
smoogipoo
a8faa942a6 Implement new difficulty calculator structure 2019-02-18 14:49:43 +09:00
David Zhao
df148f8787 Fix background dim not being disabled on playerloader exit 2019-02-18 12:55:42 +09:00
Dean Herbert
aceb8c4cb0 Fix TestCasePlaySongSelect 2019-02-15 21:50:40 +09:00
Dean Herbert
fc583590d3 Fix OsuGame testcase 2019-02-15 17:40:49 +09:00
David Zhao
8693d6a76b
Merge branch 'master' into UserDimLogic 2019-02-15 17:11:21 +09:00
Dean Herbert
65721a01ab Fix regressed screen test cases 2019-02-15 17:01:06 +09:00
David Zhao
0a60f6dacd Documentation for tests and changes 2019-02-15 16:50:37 +09:00
David Zhao
ad9dae975d Add visual test for background dimming 2019-02-15 16:46:29 +09:00
David Zhao
6da9f94ae3 Fix regression with background dim 2019-02-15 16:17:01 +09:00
Dean Herbert
b967b93b88 Fix regressions in tests 2019-02-12 19:53:08 +09:00
Dean Herbert
88ffc78103 Restructure 2019-02-11 19:11:34 +09:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
EVAST9919
0bd8fdb56d Merge remote-tracking branch 'refs/remotes/ppy/master' into update-beatmap-scores-design 2019-02-10 04:46:11 +03:00
EVAST9919
105053e91b TestCase fix 2019-02-09 00:56:41 +03:00
EVAST9919
4b7b174f75 Merge remote-tracking branch 'refs/remotes/ppy/master' into update-beatmap-scores-design 2019-02-08 18:35:18 +03:00
smoogipoo
7aca0f4a1d Fix failing test cases 2019-02-08 16:08:23 +09:00
smoogipoo
ee5ff283d1 Remove compiler warnings 2019-02-08 16:02:00 +09:00
smoogipoo
fdd37dbc4b Merge remote-tracking branch 'origin/master' into cmc-rooms 2019-02-08 15:44:33 +09:00
EVAST9919
c85dc1a236 update another scores design 2019-02-05 19:32:33 +03:00
smoogipoo
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
Dean Herbert
8ae2861ed6 Fix class name 2019-02-05 18:09:15 +09:00
Dean Herbert
a6b2e9eb0b Remove unused pieces of ini 2019-02-05 18:08:27 +09:00
Dean Herbert
2f8f4fac64 Fix combo colour fallbacks when skin is not providing any 2019-02-05 17:54:14 +09:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +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
Dean Herbert
c45c34d400 Make beatmap importing possible elsewhere in tests 2018-12-25 19:17:21 +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
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