Dan Balasescu
|
d77ba64a73
|
Merge branch 'master' into fix-test-case-lounge
|
2018-06-22 17:36:40 +09:00 |
|
Dean Herbert
|
73e13e2d63
|
Rename Stop to StopAnyPlaying for clarity
|
2018-06-22 12:35:43 +09:00 |
|
smoogipoo
|
15bb301d14
|
Remove unused field
|
2018-06-21 19:37:45 +09:00 |
|
smoogipoo
|
1932399521
|
Add testcases
|
2018-06-21 19:31:07 +09:00 |
|
Dean Herbert
|
c60b8bba35
|
Fix race condition in TestCaseLounge
|
2018-06-21 17:04:57 +09:00 |
|
Dean Herbert
|
df0083e3d9
|
Add tests for ParallaxContainer
|
2018-06-21 12:48:57 +09:00 |
|
Dean Herbert
|
2697579448
|
Give TestLounge a background to make transitions work correctly
|
2018-06-21 09:54:13 +09:00 |
|
Dean Herbert
|
b8f9caf418
|
Merge branch 'master' into multiplayer-match
|
2018-06-19 17:18:33 +09:00 |
|
Dean Herbert
|
d58ef96a23
|
Merge branch 'master' into timeline-markers
|
2018-06-18 03:14:04 +09:00 |
|
Dean Herbert
|
ae160baa6e
|
Merge branch 'master' into timeline-input-adjustment
|
2018-06-18 02:54:25 +09:00 |
|
Dean Herbert
|
48613ea1f6
|
Merge branch 'master' into timeline-markers
|
2018-06-18 02:09:20 +09:00 |
|
Dean Herbert
|
a20ec0d4cc
|
Merge branch 'master' into timeline-audio-scrolling
|
2018-06-17 19:01:21 +09:00 |
|
smoogipoo
|
08f172ba98
|
Make testcase work on appveyor (no BASS)
|
2018-06-17 19:01:18 +09:00 |
|
smoogipoo
|
0695615c6a
|
Remove MusicController from compose timeline testcase
|
2018-06-17 19:01:14 +09:00 |
|
smoogipoo
|
6c100caba7
|
Use existing instance of beatmap rather than adding more resources
|
2018-06-17 19:00:58 +09:00 |
|
Dean Herbert
|
b318b770d4
|
Fix pixellation of volume meter progress bars
|
2018-06-13 19:22:39 +09:00 |
|
Dan Balasescu
|
ac1990c093
|
Remove unused using
|
2018-06-12 16:36:46 +09:00 |
|
smoogipoo
|
93d2b5c4de
|
Adjust precision for failing test
|
2018-06-12 16:20:38 +09:00 |
|
smoogipoo
|
34f23359bb
|
Fix unit tests
|
2018-06-12 16:20:31 +09:00 |
|
smoogipoo
|
7dfe171869
|
Fix rebase error
|
2018-06-12 14:34:28 +09:00 |
|
smoogipoo
|
6ceac8ab0a
|
Add a centre marker to the timeline
|
2018-06-12 14:34:28 +09:00 |
|
smoogipoo
|
b90cdfbfd1
|
Remove unused variable
|
2018-06-12 14:33:33 +09:00 |
|
Dan Balasescu
|
f71b0456e8
|
Merge branch 'master' into timeline-audio-scrolling
|
2018-06-12 14:23:05 +09:00 |
|
smoogipoo
|
30b7b7961f
|
Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling
# Conflicts:
# osu-framework
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
|
2018-06-12 14:22:27 +09:00 |
|
Dan Balasescu
|
0a35a81c2d
|
Merge branch 'master' into populate-missing-online-ids
|
2018-06-12 13:11:21 +09:00 |
|
Dean Herbert
|
37ea4c273b
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
|
2018-06-11 20:17:41 +09:00 |
|
Dean Herbert
|
8092d70402
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
|
2018-06-11 20:17:33 +09:00 |
|
Dean Herbert
|
955a78e76d
|
Remove OnlineBeatmapSetID from BeatmapInfo
It should now be retrieved via the linked BeatmapSetInfo
|
2018-06-08 15:26:27 +09:00 |
|
Dean Herbert
|
8220e0c79a
|
Remove OnlineBeatmapSetID from BeatmapMetadata
|
2018-06-08 12:46:34 +09:00 |
|
Dean Herbert
|
8cc31aca54
|
Reorganise API requests and response classes
They were previously breaking the two-class-per-file rule.
|
2018-06-08 11:42:35 +09:00 |
|
smoogipoo
|
ebcfe97ccf
|
Expose Dependencies from base OsuTestCase
|
2018-06-06 20:25:40 +09:00 |
|
smoogipoo
|
f2ac5b8b2d
|
CreatePlayer shouldn't receive a beatmap
|
2018-06-06 20:21:47 +09:00 |
|
smoogipoo
|
4086ff7313
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
|
2018-06-06 18:26:51 +09:00 |
|
Dan Balasescu
|
b2cc7b9a5c
|
Merge branch 'master' into fix-beatmap-info-wedge-async
|
2018-06-04 20:29:29 +09:00 |
|
Dan Balasescu
|
566470e852
|
Merge branch 'master' into better-loading-logo
|
2018-06-04 20:06:22 +09:00 |
|
Dean Herbert
|
4b604bf055
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-04 10:53:04 +09:00 |
|
ekrctb
|
ed1918cd43
|
Wait for loading beatmaps
|
2018-06-03 23:11:45 +09:00 |
|
Dean Herbert
|
5c2a2e394e
|
Fix incorrect async logic in BeatmapInfoWedge
Closes #2653.
Alternative to #2657.
|
2018-06-01 20:31:29 +09:00 |
|
DrabWeb
|
9989517ff0
|
Merge https://github.com/ppy/osu into multiplayer-match
|
2018-06-01 04:01:14 -03:00 |
|
Dean Herbert
|
a6f2561be8
|
Fix automated testing
|
2018-05-31 20:07:55 +09:00 |
|
Dean Herbert
|
dfbcf4d7b7
|
Add tests
|
2018-05-31 17:29:59 +09:00 |
|
Dean Herbert
|
319faf12f7
|
Fix incorrect naming of label
|
2018-05-31 12:39:56 +09:00 |
|
Dean Herbert
|
2f21b9c4ea
|
Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
|
2018-05-31 12:36:37 +09:00 |
|
DrabWeb
|
9a7e5a3e2c
|
Update TestCaseMatch.
|
2018-05-29 04:16:19 -03:00 |
|
DrabWeb
|
7edb82eb85
|
Add TestCaseMatchParticipants.
|
2018-05-29 03:53:30 -03:00 |
|
DrabWeb
|
8595c821b4
|
Add TestCaseMatchHeader.
|
2018-05-29 03:34:02 -03:00 |
|
DrabWeb
|
b4b4a8a157
|
Add TestCaseMatchInfo.
|
2018-05-29 03:24:38 -03:00 |
|
DrabWeb
|
3915cb7f2f
|
Add Match Participants, change Room.Users to IEnumerable.
|
2018-05-29 02:42:52 -03:00 |
|
DrabWeb
|
c8ce34b6d4
|
Add Match Info.
|
2018-05-29 01:51:04 -03:00 |
|
DrabWeb
|
98819880c4
|
Add match screen header.
|
2018-05-29 01:16:39 -03:00 |
|