Commit Graph

551 Commits

Author SHA1 Message Date
566470e852 Merge branch 'master' into better-loading-logo 2018-06-04 20:06:22 +09:00
4b604bf055 Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
ed1918cd43 Wait for loading beatmaps 2018-06-03 23:11:45 +09:00
5c2a2e394e Fix incorrect async logic in BeatmapInfoWedge
Closes #2653.
Alternative to #2657.
2018-06-01 20:31:29 +09:00
9989517ff0 Merge https://github.com/ppy/osu into multiplayer-match 2018-06-01 04:01:14 -03:00
a6f2561be8 Fix automated testing 2018-05-31 20:07:55 +09:00
dfbcf4d7b7 Add tests 2018-05-31 17:29:59 +09:00
319faf12f7 Fix incorrect naming of label 2018-05-31 12:39:56 +09:00
2f21b9c4ea Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits 2018-05-31 12:36:37 +09:00
9a7e5a3e2c Update TestCaseMatch. 2018-05-29 04:16:19 -03:00
7edb82eb85 Add TestCaseMatchParticipants. 2018-05-29 03:53:30 -03:00
8595c821b4 Add TestCaseMatchHeader. 2018-05-29 03:34:02 -03:00
b4b4a8a157 Add TestCaseMatchInfo. 2018-05-29 03:24:38 -03:00
3915cb7f2f Add Match Participants, change Room.Users to IEnumerable. 2018-05-29 02:42:52 -03:00
c8ce34b6d4 Add Match Info. 2018-05-29 01:51:04 -03:00
98819880c4 Add match screen header. 2018-05-29 01:16:39 -03:00
ab3ac49a2d Add empty Match screen. 2018-05-29 01:16:39 -03:00
a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game/Overlays/Music/PlaylistOverlay.cs
#	osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
02c37ebc1f Move screen titles to OsuScreen 2018-05-28 13:30:24 +09:00
3c3412791c Merge remote-tracking branch 'upstream/release' into multiplayer-lounge 2018-05-28 13:30:04 +09:00
12b5ca1b0d Merge branch 'master' into multiplayer-lounge 2018-05-27 11:15:03 +09:00
975ce82177 Ensure autoplay tests actually increase score above zero 2018-05-26 14:46:05 +09:00
79442ad238 Merge branch 'master' into CursorOverrideContainer-rename 2018-05-26 12:19:47 +09:00
e2d840c2de Rename CursorOverrideContainer to MenuCursorContainer 2018-05-25 21:13:40 +02:00
adeb23d54b Merge branch 'master' into fix-failing-tests 2018-05-25 19:36:05 +09:00
8977670088 Update framework 2018-05-25 19:21:49 +09:00
7d06a08c3a Fix quit button test occasionally failing 2018-05-25 17:44:56 +09:00
f1ac84d95b Fix base.CreateLocalDependencies sometimes not being called 2018-05-24 13:03:25 +09:00
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
49f893d5e4 Couple the timeline to the audio 2018-05-23 12:00:11 +09:00
8fbda5bc59 add license header 2018-05-22 15:41:10 +02:00
b324337fa1 Add icon next to beatmap title/username to open in browser 2018-05-22 15:29:52 +02:00
1dfa3ff995 Merge remote-tracking branch 'origin/master' into editor-timeline-rework 2018-05-22 18:30:29 +09:00
0b19b7d9e5 Fix test case. 2018-05-22 02:08:50 -03:00
fba79a4de6 Test typo. 2018-05-22 01:31:01 -03:00
662559d3c9 More test steps. 2018-05-22 01:22:23 -03:00
f7a4a4eeef Add Lounge FilterControl. 2018-05-22 00:24:39 -03:00
cae09492c3 Basic Lounge functionality. 2018-05-22 00:07:04 -03:00
ebda287e81 Share code with HoldToConfirm implementations elsewhere 2018-05-22 01:44:06 +09:00
841336a181 Merge branch 'master' into exit_replay_button 2018-05-21 23:45:06 +09:00
92668f07e0 Merge branch 'master' into drawable-room-improvements 2018-05-21 11:09:12 +09:00
136c57b824 Don't set size in ctor. 2018-05-19 02:27:33 -03:00
ad878003f7 Add null room support to RoomInspector. 2018-05-19 02:23:09 -03:00
757f898718 Add testcase for zoomable scroll container 2018-05-18 17:53:19 +09:00
3f365c6621 Merge branch 'master' into editor-timeline-rework
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
#	osu.Game/Screens/Edit/Screens/Compose/Compose.cs
#	osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs
#	osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
2018-05-16 18:04:24 +09:00
8e053f2166 Add multiplayer screen test steps. 2018-05-15 21:20:34 -03:00
1a78ac3d10 Add Multiplayer screen. 2018-05-15 21:14:10 -03:00
1450bf64f5 Add multiplayer screen header. 2018-05-15 20:34:14 -03:00
dda253758b Cleanup test step wording. 2018-05-15 19:56:47 -03:00
f67ad7b8e8 Add exit test. 2018-05-15 19:52:28 -03:00