Commit Graph

954 Commits

Author SHA1 Message Date
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
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
f2ad2931c7 Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock 2019-02-20 11:37:33 +09:00
87717dcf9e Remove redundant constructors 2019-02-19 19:57:55 +09:00
2e375a9186 Add test cases for upwards traversal of screen stack 2019-02-19 19:44:26 +09:00
4504aee089 Unnecessary using 2019-02-19 16:50:56 +09:00
618455f7ba Remove exit step (needs login to show properly) 2019-02-19 16:47:59 +09:00
0609fcf7d4 Fix TestCaseMultiScreen intermittent failures 2019-02-19 15:52:53 +09:00
0fce23a36b Fix test regression 2019-02-19 12:38:45 +09:00
f8033a3b35 Give TestWorkingBeatmap a reference clock 2019-02-19 12:27:30 +09:00
af049004dd Add test cases for transitioning into pause overlay and into results 2019-02-18 19:53:55 +09:00
b353b69587 Use a bindable for updating dim status instead 2019-02-18 18:58:34 +09:00
4e07aba548 Make it so visual tests only load the osu ruleset 2019-02-18 18:12:45 +09:00
af30aefe77 Merge branch 'master' into UserDimLogic 2019-02-18 16:56:16 +09:00
79b12ef085 Fix test build failure 2019-02-18 15:29:39 +09:00
df148f8787 Fix background dim not being disabled on playerloader exit 2019-02-18 12:55:42 +09:00
aceb8c4cb0 Fix TestCasePlaySongSelect 2019-02-15 21:50:40 +09:00
fc583590d3 Fix OsuGame testcase 2019-02-15 17:40:49 +09:00
8693d6a76b Merge branch 'master' into UserDimLogic 2019-02-15 17:11:21 +09:00
65721a01ab Fix regressed screen test cases 2019-02-15 17:01:06 +09:00
0a60f6dacd Documentation for tests and changes 2019-02-15 16:50:37 +09:00
ad9dae975d Add visual test for background dimming 2019-02-15 16:46:29 +09:00
6da9f94ae3 Fix regression with background dim 2019-02-15 16:17:01 +09:00
b967b93b88 Fix regressions in tests 2019-02-12 19:53:08 +09:00
88ffc78103 Restructure 2019-02-11 19:11:34 +09:00
e2e615cc5c Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
7aca0f4a1d Fix failing test cases 2019-02-08 16:08:23 +09:00
ee5ff283d1 Remove compiler warnings 2019-02-08 16:02:00 +09:00
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
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
1404ba6625 Remove unnecessary changes 2019-01-28 15:56:55 +09:00
014ea972d9 Merge remote-tracking branch 'origin/master' into samah-ios 2019-01-25 11:51:44 +09:00
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
728c744e4d Merge branch 'master' into samah-ios 2019-01-23 22:19:49 +10:30
f107a922b4 Add tests for key counter inside player heirarchy 2019-01-23 14:51:25 +09:00
fbed8c3242 Pass GameHost to BeatmapManager in visual tests 2019-01-22 22:07:41 +10:30
10b91e18bd Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
f26a551e95 Revert audio changes 2019-01-19 17:40:37 +10:30
75113db438 Merge branch 'master' into fix-skip-button-scaling 2019-01-16 16:37:37 +09:00
a6c54a9675 Merge branch 'master' into samah-ios 2019-01-12 00:16:09 +10:30
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
e2dd025225 Fix scaling of SkipOverlay when UI scale is adjusted
Closes #4040.
2019-01-11 16:54:42 +09:00
aa68bbc1d9 Merge branch 'master' into fix-match-select-crash 2019-01-10 15:40:03 +09:00
3dc3d4cb40 Add test 2019-01-10 15:25:12 +09:00
122fc2de58 Show room leaderboard instead in the lounge 2019-01-08 19:24:55 +09:00
19693c3e51 Use TrackManager CreateWaveform to fix editor crashes 2019-01-08 17:10:31 +10:30
49ba4e5a14 Merge branch 'master' into update-framework 2019-01-07 18:51:54 +09:00
f6018294b5 Update framework 2019-01-07 18:50:27 +09:00