Dan Balasescu
|
40ec486152
|
Merge branch 'master' into improve-button-system
|
2018-07-10 16:44:55 +09:00 |
|
Dan Balasescu
|
282a99fb88
|
Merge branch 'master' into fix-spelling
|
2018-07-10 16:32:14 +09:00 |
|
miterosan
|
ad96338af7
|
Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages
|
2018-07-09 22:47:34 +02:00 |
|
miterosan
|
ea597916ca
|
Code cleanups
|
2018-07-09 22:41:53 +02:00 |
|
miterosan
|
ae093d2619
|
Merge branch 'master' into Private_Messages
|
2018-07-09 22:15:36 +02:00 |
|
miterosan
|
290b6e5f1d
|
Fix the crash in the visual testcase
|
2018-07-09 22:09:27 +02:00 |
|
Dean Herbert
|
974c4f5185
|
ToolbarMode* -> ToolbarRuleset*
|
2018-07-10 01:20:21 +09:00 |
|
Dean Herbert
|
1670f4fe31
|
Merge branch 'master' into fix-osd-fade-in
|
2018-07-09 19:10:57 +09:00 |
|
Dean Herbert
|
df67c0498d
|
Fix OSD fade-in not correctly debouncing
It could potentially never fade in on quick presses.
|
2018-07-09 17:53:39 +09:00 |
|
HoutarouOreki
|
10aae3b0ee
|
Remove age from User class
|
2018-07-09 10:33:46 +02:00 |
|
Dean Herbert
|
1d6609d9f3
|
Add common custom words to dotsettings dictionary
Also fixes some typos and reduces spelling suggestions to hints.
|
2018-07-05 15:54:41 +09:00 |
|
Dean Herbert
|
2aae528e1c
|
Improve code quality of main menu button system
|
2018-07-03 18:23:41 +09:00 |
|
miterosan
|
d791216505
|
Merge branch 'master' into Private_Messages
|
2018-07-03 07:58:15 +02:00 |
|
smoogipoo
|
90d90370c2
|
Use testcase ruleset
|
2018-07-02 15:25:37 +09:00 |
|
smoogipoo
|
4070c1a888
|
Merge remote-tracking branch 'origin/master' into non-null-ruleset
# Conflicts:
# osu.Game/Screens/Select/FilterControl.cs
|
2018-07-02 15:05:34 +09:00 |
|
miterosan
|
884ac71874
|
Merge branch 'master' into Private_Messages
|
2018-06-28 21:04:02 +02:00 |
|
Dean Herbert
|
c44a81bdf5
|
Add word wrap support
|
2018-06-28 13:04:39 +09:00 |
|
smoogipoo
|
ede59f63f6
|
Merge remote-tracking branch 'origin/master' into make-loading-more-visible
|
2018-06-27 12:52:06 +09:00 |
|
Dean Herbert
|
ac1bf3b092
|
Merge branch 'master' into editor-seek-snapping-fix
|
2018-06-27 11:08:19 +09:00 |
|
Dean Herbert
|
018dcc98b4
|
Fix failing tests
|
2018-06-26 19:17:34 +09:00 |
|
Dean Herbert
|
594cc0d21d
|
Merge branch 'master' into mania-playfield-inversions
|
2018-06-25 18:36:23 +09:00 |
|
Dean Herbert
|
e75ff1145c
|
Merge branch 'master' into editor-seek-snapping-fix
|
2018-06-25 18:27:03 +09:00 |
|
Dean Herbert
|
b0cd227e81
|
Fix race condition in TestCaseLounge (attempt 2)
|
2018-06-25 14:10:54 +09:00 |
|
miterosan
|
6049303c40
|
Merge branch 'master' into Private_Messages
|
2018-06-23 20:44:43 +02:00 |
|
Dan Balasescu
|
d77ba64a73
|
Merge branch 'master' into fix-test-case-lounge
|
2018-06-22 17:36:40 +09:00 |
|
Dean Herbert
|
fccd4f965c
|
Merge remote-tracking branch 'upstream/master' into make-loading-more-visible
|
2018-06-22 14:21:01 +09:00 |
|
Dean Herbert
|
eb6d6dc2de
|
Improve the visibility of the global loading animation
Updates design to match new `osu-web` design.
Adds TestCase for visual testing.
|
2018-06-22 13:14:43 +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
|
5157a069bc
|
Merge branch 'master' into Private_Messages
|
2018-06-21 11:37:19 +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 |
|
smoogipoo
|
01b909eaa7
|
Add testfixture annotation
|
2018-06-18 17:06:21 +09:00 |
|
smoogipoo
|
ffc5d7bd43
|
Fix some incorrect test case values
|
2018-06-18 17:05:04 +09:00 |
|
smoogipoo
|
0d154621b6
|
Cleanup testcase
|
2018-06-18 16:09:38 +09:00 |
|
Dean Herbert
|
1d9d240454
|
Merge branch 'master' into mania-playfield-inversions
|
2018-06-18 04:41:17 +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 |
|
miterosan
|
1f04dd9ada
|
Cache the dependencies using the static method of the class Dependencies.
|
2018-06-17 15:08:13 +02:00 |
|
miterosan
|
cd0fe6a09e
|
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
# Conflicts:
# osu.Game.Tests/Visual/TestCaseChatLink.cs
|
2018-06-17 14:15:14 +02: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 |
|
smoogipoo
|
4eda017fa5
|
Fix CI error
|
2018-06-17 17:54:05 +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 |
|
miterosan
|
6e0099d2b1
|
Fix webexception due to invalid user ids
|
2018-05-31 22:56:12 +02: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
|
49a683e386
|
Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages
|
2018-05-31 14:50:20 +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 |
|
DrabWeb
|
ab3ac49a2d
|
Add empty Match screen.
|
2018-05-29 01:16:39 -03: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 |
|
Dean Herbert
|
ebda287e81
|
Share code with HoldToConfirm implementations elsewhere
|
2018-05-22 01:44:06 +09:00 |
|
Dean Herbert
|
841336a181
|
Merge branch 'master' into exit_replay_button
|
2018-05-21 23:45:06 +09:00 |
|
Dean Herbert
|
92668f07e0
|
Merge branch 'master' into drawable-room-improvements
|
2018-05-21 11:09:12 +09:00 |
|
DrabWeb
|
136c57b824
|
Don't set size in ctor.
|
2018-05-19 02:27:33 -03:00 |
|
DrabWeb
|
ad878003f7
|
Add null room support to RoomInspector.
|
2018-05-19 02:23:09 -03:00 |
|
smoogipoo
|
757f898718
|
Add testcase for zoomable scroll container
|
2018-05-18 17:53:19 +09:00 |
|
smoogipoo
|
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 |
|
DrabWeb
|
8e053f2166
|
Add multiplayer screen test steps.
|
2018-05-15 21:20:34 -03:00 |
|
DrabWeb
|
1a78ac3d10
|
Add Multiplayer screen.
|
2018-05-15 21:14:10 -03:00 |
|
DrabWeb
|
1450bf64f5
|
Add multiplayer screen header.
|
2018-05-15 20:34:14 -03:00 |
|
DrabWeb
|
dda253758b
|
Cleanup test step wording.
|
2018-05-15 19:56:47 -03:00 |
|
DrabWeb
|
f67ad7b8e8
|
Add exit test.
|
2018-05-15 19:52:28 -03:00 |
|
Dean Herbert
|
28df77e838
|
Simplify code and remove generic
|
2018-05-15 21:10:26 +09:00 |
|
Dean Herbert
|
0def847f60
|
Merge branch 'master' into screen-breadcrumbs
|
2018-05-15 19:39:03 +09:00 |
|
Dean Herbert
|
fc192c8998
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-disable-mouse-buttons
|
2018-05-15 19:23:51 +09:00 |
|
smoogipoo
|
9536c324fa
|
Rename aborted -> fired
|
2018-05-14 19:08:00 +09:00 |
|
Dean Herbert
|
f14948c022
|
Merge branch 'master' into exit-hold-confirmation
|
2018-05-14 18:13:40 +09:00 |
|
DrabWeb
|
518dec0c68
|
Merge https://github.com/ppy/osu into drawable-room-improvements
|
2018-05-11 13:41:50 -03:00 |
|
Dean Herbert
|
f1fd2ae7be
|
Merge branch 'master' into modmouseup
|
2018-05-11 21:41:14 +09:00 |
|
Dean Herbert
|
7cb0d328e6
|
Make mods screen dynamically testable
|
2018-05-11 21:40:48 +09:00 |
|
Dean Herbert
|
c19432dc6d
|
Merge branch 'master' into ruleset-beatmap-statistics
|
2018-05-11 17:37:50 +09:00 |
|
DrabWeb
|
fa403e4e2a
|
Add test step to test pushing after a previous screen is made current.
|
2018-05-11 04:49:40 -03:00 |
|
smoogipoo
|
73465c35fa
|
Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics
# Conflicts:
# osu.Game/Beatmaps/Beatmap.cs
|
2018-05-11 14:05:40 +09:00 |
|
DrabWeb
|
ec53927d8e
|
Add selection to DrawableRoom.
|
2018-05-10 22:48:07 -03:00 |
|
DrabWeb
|
6f7d0c19ef
|
Remove redundant default value.
|
2018-05-10 22:02:27 -03:00 |
|
DrabWeb
|
a294f187ee
|
Add steps and asserts to TestCaseScreenBreadcrumbs.
|
2018-05-10 21:52:26 -03:00 |
|
DrabWeb
|
b9adeeb063
|
Add ScreenBreadcrumbControl.
|
2018-05-10 21:35:26 -03:00 |
|
DrabWeb
|
a86843ccc9
|
Remove unused usings caused by multiplayer folder restructuring.
|
2018-05-10 20:49:42 -03:00 |
|
DrabWeb
|
2d206d258a
|
Move multiplayer screen components to osu.Game/Screens/Multi/Components
|
2018-05-10 20:44:24 -03:00 |
|
DrabWeb
|
c35760fdef
|
Rename osu.Game/Screens/Multiplayer to Multi.
|
2018-05-10 20:39:05 -03:00 |
|
Dean Herbert
|
8a6ef0dabb
|
Merge branch 'master' into beatmap-conversion-rework
|
2018-05-10 19:10:07 +08:00 |
|
Dean Herbert
|
9e26bcd571
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap
|
2018-05-10 19:51:52 +09:00 |
|
smoogipoo
|
c03ab9014f
|
Improve TestCaseOnScreenDisplay
Now doesn't rely on framesync.
|
2018-05-10 18:48:48 +09:00 |
|
Dean Herbert
|
fadb1a5e0b
|
Add tests and expand functionality to ensure single fire
|
2018-05-10 17:31:16 +09:00 |
|
smoogipoo
|
c7bc79bce3
|
Remove explicit clock in TestCaseBreakOverlay
|
2018-05-09 12:40:04 +09:00 |
|
smoogipoo
|
09c70a9362
|
Add info label tests to TestCaseBeatmapInfoWedge
|
2018-05-07 15:51:08 +09:00 |
|
smoogipoo
|
6a9f139d9b
|
Instantiate convertible hitobjects for beatmap info wedge
|
2018-05-07 15:51:08 +09:00 |
|
smoogipoo
|
9128e64c9a
|
Rename OriginalBeatmap back to Beatmap
|
2018-05-07 10:29:38 +09:00 |
|
smoogipoo
|
4ecdea8b2e
|
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
|
2018-05-07 10:17:54 +09:00 |
|
smoogipoo
|
27c8591d48
|
Fix reference to old name
|
2018-05-07 10:07:50 +09:00 |
|
smoogipoo
|
77e661489d
|
Merge branch 'i-beatmap' into beatmap-conversion-rework
|
2018-05-07 10:00:24 +09:00 |
|
smoogipoo
|
20509b1cc2
|
Fix non-IBeatmap usage
|
2018-05-07 09:59:45 +09:00 |
|