Dean Herbert
|
3c3412791c
|
Merge remote-tracking branch 'upstream/release' into multiplayer-lounge
|
2018-05-28 13:30:04 +09:00 |
|
smoogipoo
|
b267ec3178
|
Fix failing test
|
2018-05-28 03:48:09 +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 |
|
Dean Herbert
|
e39af1c906
|
Merge branch 'master' into convert-object-hitwindows
|
2018-05-15 17:33:27 +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 |
|
smoogipoo
|
6e1d651087
|
Merge remote-tracking branch 'origin/master' into convert-object-hitwindows
|
2018-05-14 11:17:39 +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
|
3e7fa45ad1
|
Fix tests
|
2018-05-11 16:13:00 +09: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 |
|
smoogipoo
|
1aefd71b65
|
Merge remote-tracking branch 'origin/master' into i-beatmap
|
2018-05-07 09:58:53 +09:00 |
|
miterosan
|
ba5861b527
|
Merge remote-tracking branch 'origin/master' into Private_Messages
# Conflicts:
# osu.Game/Online/API/Requests/GetMessagesRequest.cs
# osu.Game/Overlays/Chat/ChatTabControl.cs
|
2018-05-06 19:45:33 +02:00 |
|
Roman Kapustin
|
b0e556d83f
|
Actualize QuitButton visual test
|
2018-05-04 00:01:00 +03:00 |
|
Roman Kapustin
|
39db1e8cbb
|
Rename HoldToQuit to QuitButton
|
2018-05-03 23:50:30 +03:00 |
|
Roman Kapustin
|
f8630115d6
|
Do not expose HoldToQuit.HoldToQuitButton
|
2018-05-03 23:29:58 +03:00 |
|
TocoToucan
|
3b84ce7c9f
|
Remove redundant test step
|
2018-05-01 03:56:01 +03:00 |
|
UselessToucan
|
d18a8ec9f5
|
Merge branch 'master' into exit_replay_button
|
2018-04-28 20:48:16 +03:00 |
|
TocoToucan
|
b3cf381c5d
|
Add TestCaseHoldToQuit
|
2018-04-28 19:24:49 +03:00 |
|
Dean Herbert
|
57219ae9c6
|
Fix clashing variable name
|
2018-04-24 02:07:16 +09:00 |
|
Dean Herbert
|
f4c2d6b1a3
|
Fix wedge load test again
Initial load was not being waited on for long enough.
|
2018-04-24 00:51:33 +09:00 |
|
Dean Herbert
|
843385af0d
|
Merge remote-tracking branch 'upstream/master' into net471
|
2018-04-23 22:00:11 +09:00 |
|
Dean Herbert
|
9551b6914b
|
Fix UserProfile test failing when not logged in
|
2018-04-23 21:41:51 +09:00 |
|
Dean Herbert
|
7d09a39262
|
Fix remaining broken test
|
2018-04-23 20:50:16 +09:00 |
|
Dean Herbert
|
8bf25542cb
|
Add PlayerLoader TestCase and fix dummy beatmap load procedure
|
2018-04-20 17:30:27 +09:00 |
|
Dean Herbert
|
de424648d2
|
Update to .NET 4.7.1
Resolves #2368.
|
2018-04-20 14:46:52 +09:00 |
|
smoogipoo
|
03a5df84c6
|
Initial rework of beatmap conversion process
|
2018-04-19 22:04:12 +09:00 |
|
Dean Herbert
|
77af8ce556
|
Add back online load test for BeatmapScoresContainer
|
2018-04-19 21:11:16 +09:00 |
|
smoogipoo
|
66b3b295e7
|
Use IBeatmap wherever possible
|
2018-04-19 20:44:38 +09:00 |
|
miterosan
|
3b68dda23e
|
Merge remote-tracking branch 'origin/master' into Private_Messages
|
2018-04-18 20:55:12 +02:00 |
|
miterosan
|
29e8c70ed7
|
Only use one tabControl (channeltabcontrol). Fix that the Channel messages did not refresh.
|
2018-04-18 20:46:42 +02:00 |
|
Dean Herbert
|
1be2571d33
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:08:45 +09:00 |
|
jorolf
|
de9f15f620
|
add new test case and fix rotation not working
|
2018-04-16 19:22:11 +02:00 |
|
jorolf
|
2a18b4c3f8
|
add a DRAWABLE_BADGE_SIZE const and center badges
|
2018-04-16 18:51:35 +02:00 |
|
jorolf
|
6ca714d93b
|
add badges to ProfileHeader
|
2018-04-15 23:49:45 +02:00 |
|
Dean Herbert
|
ae77c010e2
|
Merge remote-tracking branch 'upstream/master' into wave-container
|
2018-04-15 21:03:18 +09:00 |
|
miterosan
|
142e1b8587
|
update the line endings
|
2018-04-14 13:32:48 +02:00 |
|
miterosan
|
5bfb386226
|
Merge remote-tracking branch 'origin/master' into Private_Messages
|
2018-04-14 13:31:03 +02:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
Endrik Tombak
|
d9f587edff
|
Merge remote-tracking branch 'upstream/master' into alt-eagerselect
|
2018-04-13 11:55:35 +03:00 |
|
miterosan
|
e39f5a1adf
|
Rename var chatmanager -> channelManager
Apply requested changes
|
2018-04-12 23:19:13 +02:00 |
|
Dean Herbert
|
1e6244afe1
|
Merge branch 'master' into remove-gamefield-test
|
2018-04-12 21:37:04 +09:00 |
|
smoogipoo
|
a2484fbf56
|
Move back to DI-ing adjustable clock into SummaryTimeline
|
2018-04-12 13:37:02 +09:00 |
|
smoogipoo
|
fbc50d6030
|
Merge master into editor-clock
|
2018-04-12 13:35:53 +09:00 |
|
DrabWeb
|
0bede52381
|
Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places.
|
2018-04-11 16:22:27 -03:00 |
|
miterosan
|
b997f0f3fa
|
Remove not needed using
|
2018-04-11 21:09:38 +02:00 |
|