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 |
|
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 |
|
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 |
|
smoogipoo
|
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 |
|
Dean Herbert
|
02c37ebc1f
|
Move screen titles to OsuScreen
|
2018-05-28 13:30:24 +09:00 |
|
Dean Herbert
|
3c3412791c
|
Merge remote-tracking branch 'upstream/release' into multiplayer-lounge
|
2018-05-28 13:30:04 +09:00 |
|
Dean Herbert
|
12b5ca1b0d
|
Merge branch 'master' into multiplayer-lounge
|
2018-05-27 11:15:03 +09:00 |
|
Dean Herbert
|
975ce82177
|
Ensure autoplay tests actually increase score above zero
|
2018-05-26 14:46:05 +09:00 |
|
Dean Herbert
|
79442ad238
|
Merge branch 'master' into CursorOverrideContainer-rename
|
2018-05-26 12:19:47 +09:00 |
|
HoutarouOreki
|
e2d840c2de
|
Rename CursorOverrideContainer to MenuCursorContainer
|
2018-05-25 21:13:40 +02:00 |
|
Dean Herbert
|
adeb23d54b
|
Merge branch 'master' into fix-failing-tests
|
2018-05-25 19:36:05 +09:00 |
|
Dean Herbert
|
8977670088
|
Update framework
|
2018-05-25 19:21:49 +09:00 |
|
Dean Herbert
|
7d06a08c3a
|
Fix quit button test occasionally failing
|
2018-05-25 17:44:56 +09:00 |
|
smoogipoo
|
f1ac84d95b
|
Fix base.CreateLocalDependencies sometimes not being called
|
2018-05-24 13:03:25 +09:00 |
|
smoogipoo
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +09:00 |
|
smoogipoo
|
49f893d5e4
|
Couple the timeline to the audio
|
2018-05-23 12:00:11 +09:00 |
|
jorolf
|
8fbda5bc59
|
add license header
|
2018-05-22 15:41:10 +02:00 |
|
jorolf
|
b324337fa1
|
Add icon next to beatmap title/username to open in browser
|
2018-05-22 15:29:52 +02:00 |
|
smoogipoo
|
1dfa3ff995
|
Merge remote-tracking branch 'origin/master' into editor-timeline-rework
|
2018-05-22 18:30:29 +09:00 |
|
DrabWeb
|
0b19b7d9e5
|
Fix test case.
|
2018-05-22 02:08:50 -03:00 |
|
DrabWeb
|
fba79a4de6
|
Test typo.
|
2018-05-22 01:31:01 -03:00 |
|
DrabWeb
|
662559d3c9
|
More test steps.
|
2018-05-22 01:22:23 -03:00 |
|
DrabWeb
|
f7a4a4eeef
|
Add Lounge FilterControl.
|
2018-05-22 00:24:39 -03:00 |
|
DrabWeb
|
cae09492c3
|
Basic Lounge functionality.
|
2018-05-22 00:07:04 -03:00 |
|