1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-28 13:23:22 +08:00
Commit Graph

775 Commits

Author SHA1 Message Date
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
DrabWeb
d6e3dc10e9 Fix RoomSettingsOverlay not being updated when the rooms values are. 2018-06-06 05:38:43 -03:00
DrabWeb
8c97999de9 Add empty RoomSettingsOverlay. 2018-06-06 00:29:52 -03:00
DrabWeb
b8e403f38a Merge https://github.com/ppy/osu into multiplayer-room-settings 2018-06-06 00:19:23 -03: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
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
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
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
miterosan
a5e0311253 Trim whitespaces 2018-04-11 20:53:35 +02:00
miterosan
499ecd3843 Fix the warnings 2018-04-11 20:44:35 +02:00
miterosan
2056258def Fix code sanity 2018-04-11 20:31:16 +02:00
miterosan
3860594f40 Rename everything into channel and remove everything chat 2018-04-11 20:01:57 +02:00
miterosan
39ecc3d31d Add Test Case, improve displaying the avatar, use a chatTabControl instead of putting both in ChatOverlay, readd shadow.
Requires osu-framework for a fix
2018-04-11 18:23:09 +02:00
miterosan
96bacaf13f Allow the ChatLinkTestcase to work again 2018-04-09 21:06:28 +02:00
smoogipoo
7e78b2e54e Remove TestCaseGamefield
Unused. Unneeded. We already have TestCaseAllPlayers and individual tests in all rulesets. Eventually we probably also want osu.Game.Tests to not reference ruleset projects anyway.
2018-04-09 11:37:03 +09:00
miterosan
a70b329155 Split drawing and business logic of ChatOverlay 2018-04-08 18:21:48 +02:00
miterosan
525e50e8dd Merge remote-tracking branch 'origin/master' into Private_Messages 2018-04-08 15:23:09 +02:00
Dean Herbert
6bc319caae
Merge branch 'master' into manual-input-test-case 2018-04-06 20:07:07 +09:00
Dean Herbert
ae2dce254a Rename TestCase 2018-04-06 19:53:34 +09:00
Endrik
8ef5855e84
Fix typo 2018-04-06 12:38:17 +03:00
Endrik
c7440201fb
Merge branch 'master' into alt-eagerselect 2018-04-06 12:37:16 +03:00
smoogipoo
fdb3227fd7 Fix + cleanup testcases 2018-04-06 18:12:44 +09:00
smoogipoo
c7abd56fc4 Give editor a custom clock to handle seeking 2018-04-06 18:11:37 +09:00
Dean Herbert
768a5e5383 Create ManualInputManagerTestCase
A base class for running more input-driven tests.
2018-04-06 15:23:30 +09:00
Dean Herbert
714326b606 Fix TestCase not working with dynamic compilation 2018-04-06 13:16:27 +09:00
smoogipoo
d9e795fb9f TimelineContainer -> TimelineArea 2018-04-05 19:40:03 +09:00
smoogipoo
f41d31e1db ScrollableTimeline -> TimelineContainer 2018-04-05 19:33:25 +09:00
smoogipoo
870ce8868c Make scrollabletimeline use gridcontainer 2018-04-05 16:07:33 +09:00
Dean Herbert
4d71f2084c Move individual mask selection logic out of MaskSelection 2018-04-04 18:29:53 +09:00
Dean Herbert
788bfde002
Merge branch 'master' into selectionlayer-rewrite 2018-04-04 15:38:27 +09:00
Dan Balasescu
6dfca4b2fa
Merge branch 'master' into osu-tab-strip 2018-04-04 14:20:06 +09:00
Joseph Madamba
ee7db92e6b Simplify negative equality expression 2018-04-03 21:01:02 -07:00
Dean Herbert
d40ccbd70a
Merge branch 'master' into selectionlayer-rewrite 2018-04-03 12:03:11 +09:00
Dean Herbert
57b4cdaf85
Merge branch 'master' into selectionlayer-rewrite 2018-04-03 03:05:42 +09:00
Endrik Tombak
75f7d43d9d Testcases for CarouselRoot 2018-04-02 11:56:35 +03:00
smoogipoo
551ba6ac4b Fix ScalableContainer irrepairably altering content size 2018-04-02 13:06:06 +09:00
Joseph Madamba
1bebda61f8 Use "==" instead of "equals" 2018-03-31 10:51:44 -07:00
Joseph Madamba
ee14ca7cc5
Merge branch 'master' into score-multiplier-edits 2018-03-31 10:43:58 -07:00
DrabWeb
e3218250d5 Fix tab strip in BreadcrumbControl, allow strip height to be overriden. 2018-03-29 15:41:27 -03:00
smoogipoo
6d4f94756e Rewrite the way drag + click selections happen
The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately).

I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways.

1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`.
2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally.
3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario.
4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to.
5. `SelectionBox` handles the display of itself locally.
6. `SelectionBox` handles movement of groups of masks locally.
7. `HitObjectMasks` handles movement of itself locally.
2018-03-29 22:07:23 +09:00
smoogipoo
4bdfc9dca9 Fix testcase 2018-03-29 17:19:14 +09:00
Joseph Madamba
5457f17e79 Clean up code from reviews 2018-03-28 19:53:15 -07:00
miterosan
56de6c1067 Rename Channel to ChannelChat 2018-03-28 21:11:06 +02:00
DrabWeb
eb374c5774 Add beatmap set online status and display it in direct panels and the beatmap set overlay. 2018-03-26 21:04:45 -03:00
Joseph Madamba
90d763fda5 Apply review changes and suggestions 2018-03-25 10:00:30 -07:00
Joseph Madamba
78a7564acd Score multiplier edits 2018-03-24 16:00:18 -07:00
Dean Herbert
92d8781bf0
Merge branch 'master' into beat-snap-divisor 2018-03-22 20:14:50 +09:00
Dean Herbert
1b116dd04e Adjust testcase sizing to match editor 2018-03-22 16:11:56 +09:00
Dean Herbert
c2eb32c0e9 DrawableBeatDivisor -> BeatDivisorControl 2018-03-20 20:10:27 +09:00
Dean Herbert
6fd650777c Move value change logic to bindable
Also add drag support
2018-03-20 20:09:55 +09:00
Dean Herbert
d1c2aa71d0 Add beatmap sample override support 2018-03-20 16:24:06 +09:00
smoogipoo
786e6242e1 Make bdl beat divisor nullable 2018-03-20 14:01:06 +09:00
smoogipoo
50192b21e3 Give DrawableBeatDivisor a ctor 2018-03-20 13:57:25 +09:00
smoogipoo
fa5fd46f85 Clean up + rename testcase 2018-03-19 20:42:42 +09:00
smoogipoo
b1d09500f2 Integrate beat snap divisor into editor seeking 2018-03-19 20:42:06 +09:00
smoogipoo
c5eab7a227 Actually rename to DrawableBeatDivisor... 2018-03-19 20:34:24 +09:00
smoogipoo
5ecbc5612c Integrate with dependency injection 2018-03-19 20:33:58 +09:00
smoogipoo
46f10b392d Fix merge errors 2018-03-19 20:23:31 +09:00
smoogipoo
4c0ccffe08 Merge remote-tracking branch 'origin/master' into beat-snap-divisor 2018-03-19 20:23:15 +09:00
smoogipoo
df0b8a24c5 Rename + renamespace 2018-03-19 20:21:19 +09:00
smoogipoo
b25c564ecb Integrate into editor's compose screen 2018-03-19 20:14:58 +09:00
smoogipoo
070db63157 Privatise tick to TickContainer 2018-03-19 19:52:22 +09:00
smoogipoo
66e4e45882 Offset test case a little bit for dynamic compilation message 2018-03-19 19:49:46 +09:00
smoogipoo
6b035e8c53 Add basic structure/layout for the beat snap visualiser 2018-03-19 19:46:26 +09:00
smoogipoo
193142e901 Fix missed BDL case 2018-03-19 16:44:46 +09:00
smoogipoo
e25d1f6982 Pass down editor clocks through DI 2018-03-19 16:27:52 +09:00
smoogipoo
abb5dcf678 Fix null-refing testcase
This would also be fixed with BDL loading children after we're fully loaded ;).
2018-03-16 23:53:55 +09:00
Dean Herbert
4b83278cf4
Merge branch 'master' into fix-editor-clocks 2018-03-16 23:32:54 +09:00
Dean Herbert
e8f7f2c8ab
Merge branch 'master' into editor-wheel-movement 2018-03-16 18:19:42 +09:00
Dean Herbert
bca4b620b6
Merge branch 'master' into editor-wheel-movement 2018-03-16 15:56:51 +09:00
Dean Herbert
23ffee3d38
Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:38:52 +09:00
smoogipoo
8fbaa86e64 Fix testcases 2018-03-15 18:24:57 +09:00
smoogipoo
50f9d810dd Add more testcases + fix up seeking a bit more 2018-03-15 15:40:52 +09:00
Dean Herbert
a42035f494 Make DrawableHitObject a CompositeDrawable
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Dean Herbert
8d433cb4bf
Merge branch 'master' into cursor-trail 2018-03-15 11:14:21 +09:00
smoogipoo
f693fbf92d Add forward snapping from inbetween beat test 2018-03-14 23:08:43 +09:00
smoogipoo
0da3ae0944 Add some basic tests + fixes to seek/seekforward functionality 2018-03-14 20:52:48 +09:00
Dean Herbert
a0691168cb Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement 2018-03-14 15:35:24 +09:00
Dean Herbert
81f82d98a1 Rework a lot of naming and structure 2018-03-14 15:18:21 +09:00
Dean Herbert
13f64a1d12
Merge branch 'master' into cursor-trail 2018-03-14 11:42:40 +09:00
smoogipoo
d2859d779d Create a base TestCaseEditor for rulests to derive 2018-03-12 19:43:52 +09:00
Dean Herbert
1d0a44a0bb
Merge branch 'master' into fix-login-failure 2018-03-12 12:41:45 +09:00
smoogipoo
6e51b74890 Merge remote-tracking branch 'origin/master' into rewrite-break-overlay 2018-03-12 09:47:05 +09:00
Dean Herbert
487a03d0d7
Merge branch 'master' into cursor-trail 2018-03-11 02:07:05 +09:00
Dean Herbert
9233266fe1 Fix login failure for users with no country rank
Closes #2148.
2018-03-11 00:44:16 +09:00
smoogipoo
4103c66cff Move selection overlay to HitObjectOverlayLayer for extensibility 2018-03-10 00:48:57 +09:00
naoey
2c0488b1f1
Invert bool, add test, and handle ruleset change. 2018-03-09 19:39:28 +05:30
naoey
d04f47718f
Make song select choose random when initial selection fails.
- Revert TestCasePlaySongSelect to master
2018-03-09 17:36:55 +05:30
Dean Herbert
81c1ec2005
Merge branch 'master' into fix-unplayable-beatmaps 2018-03-08 13:02:57 +09:00
Dean Herbert
91c984ed97
Merge branch 'master' into rewrite-break-overlay 2018-03-08 09:31:59 +09:00
Dean Herbert
81b778fdcf
Merge branch 'master' into cursor-trail 2018-03-08 09:31:42 +09:00
Dean Herbert
e55a503f79 Tidy up test case 2018-03-08 00:58:16 +09:00
naoey
983cefbe40
Add VisualTest. 2018-03-07 19:08:26 +05:30
Dean Herbert
6a768e378a
Merge branch 'master' into rewrite-break-overlay 2018-03-07 17:00:34 +09:00
Dean Herbert
792a3ac469 SkipButton -> SkipOverlay 2018-03-06 00:10:53 +09:00
jorolf
0a571278c9 change TestCase to OsuTestCase 2018-03-04 14:03:53 +01:00
jorolf
ec013dbee8 remove blank line and try to get test case working 2018-03-03 21:55:19 +01:00
jorolf
bafcab1349 redo the test case 2018-03-03 20:20:07 +01:00
jorolf
033d066520 blank line 2018-03-03 20:03:24 +01:00
jorolf
ba80cd5f34 OsuColour can't be used in TestCases..? 2018-03-03 20:01:39 +01:00
jorolf
9293ec635a add license headers and remove blank line 2018-03-03 19:49:38 +01:00
jorolf
9a29c53c5e Merge branch 'master' of git://github.com/ppy/osu into volume-control 2018-03-03 19:09:08 +01:00
jorolf
3a420ba826 add the volume overlay 2018-03-03 19:08:35 +01:00
Dean Herbert
0e928429d4
Merge branch 'master' into ruleset-replayframes 2018-03-04 01:57:43 +09:00
Dean Herbert
c6c55c40ed Rewrite BreakOverlay
No longer relies on Schedule calls (could not be rewound).
Also no longer sucks.
2018-03-04 00:51:24 +09:00
naoey
a57dc154f9
More specific tests. 2018-03-03 20:34:29 +05:30
jorolf
bd75422d88 Merge branch 'master' of git://github.com/ppy/osu into volume-control 2018-03-03 14:10:50 +01:00
naoey
307147a8a3
Merge remote-tracking branch 'upstream/master' into fix-unplayable-beatmaps 2018-03-03 16:10:22 +05:30
naoey
fb724ca8a7
Make song select ensure current beatmap is always playable in the active ruleset.
- Add a to TestCasePlaySongSelect testing this scenario
2018-03-03 16:09:24 +05:30
smoogipoo
3d5fefae8c Add TestFixtureAttribute to all tests 2018-03-02 15:34:31 +09:00
Dean Herbert
c54c1699bf
Merge branch 'master' into ruleset-replayframes 2018-03-01 22:26:16 +09:00
smoogipoo
91460f27da Fix incorrect isForCurrentRuleset value 2018-03-01 02:28:14 +09:00
jorolf
46dfb761c5 basic volume meter and testcase 2018-02-28 16:14:52 +01:00
Dean Herbert
36beaffa7a
Merge branch 'master' into editor-hitobject-overlays 2018-02-28 23:48:54 +09:00
Dean Herbert
9b44f447ca Fix song select iteration when all panels are filtered
Resolves #2069.
2018-02-27 17:52:12 +09:00
Dean Herbert
bdd88303b3
Merge branch 'master' into editor-hitobject-overlays 2018-02-26 17:53:50 +09:00
smoogipoo
1e1df2aaff Fix up testcases 2018-02-23 21:04:19 +09:00
smoogipoo
07252254eb Fix post-merge issues 2018-02-22 14:22:04 +09:00
smoogipoo
99e9eb81f2 Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays 2018-02-22 14:16:01 +09:00
smoogipoo
ded2644df8 Merge branch 'master' into editor-hitobject-overlays 2018-02-22 14:08:36 +09:00
Dean Herbert
b74cfffc6f
Merge branch 'master' into editor-hitobject-movement 2018-02-22 13:19:39 +09:00
Dean Herbert
31edcfa35c Attempt to fix beatmap carousel test failures
As seen here: https://ci.appveyor.com/project/peppy/osu/build/master-7260#L1164

Potentially was continuing operation too early.
2018-02-21 16:14:45 +09:00
smoogipoo
6b8b39abc5 Rewrite SelectionLayer testcase to construct an entire HitObjectComposer 2018-02-21 11:07:42 +09:00
smoogipoo
ad2f556133 Add hitobject overlays to selected hitobjects 2018-02-20 18:01:45 +09:00
smoogipoo
2c37a7e19f Rewrite SelectionLayer testcase to construct an entire HitObjectComposer 2018-02-20 13:50:55 +09:00
Dean Herbert
f41a40be15
Merge branch 'master' into editor-hitobject-movement 2018-02-19 17:59:50 +09:00
smoogipoo
4898c321f8 Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement 2018-02-19 17:07:03 +09:00
Dean Herbert
58af66bfc0 Merge branch 'master' into editor-hitobject-movement 2018-02-16 13:59:11 +09:00
Dean Herbert
d3dd31dadb Make deletion and purging logic even more global 2018-02-15 14:22:39 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests 2018-02-14 22:48:29 +09:00
Dean Herbert
58f20c3723
Merge branch 'master' into editor-hitobject-movement 2018-02-13 18:56:16 +09:00
Dean Herbert
a738664167 Add interface for database context factory 2018-02-12 23:10:05 +09:00
smoogipoo
e10bb2db05 Unify SelectionLayer and HitObjectCapturer, rename SelectionBox 2018-02-12 18:35:01 +09:00
smoogipoo
ee168f9a77 Split out drag selection box from post-capture box
Cleans up a lot of code, removes handles for now.
2018-02-12 18:20:05 +09:00
Dean Herbert
edc3638175 DatabaseWriteUsage 2018-02-12 17:55:11 +09:00
smoogipoo
1adbe3585c HitObjectSelectionBox -> SelectionDragger 2018-02-12 16:03:59 +09:00
smoogipoo
cfb2b3f1e8 Rework SelctionLayer to support click-selections 2018-02-12 16:02:42 +09:00
smoogipoo
ccc948a0b9 Update framework (testing) 2018-02-08 12:45:51 +09:00
Dean Herbert
647cc4bdad Remove in-between properties 2018-02-07 18:04:32 +09:00
tgi74000
bcd568e607 Check for possible null ranks 2018-02-06 23:00:52 +01:00
Dan Balasescu
c1d5a68e4d
Merge branch 'master' into VisualSettingsOverlay 2018-02-01 16:37:04 +09:00
Dan Balasescu
d332a2dddd
Merge branch 'master' into url-parsing-support 2018-02-01 16:13:32 +09:00
smoogipoo
58cdb59a27 Fix failing testcase 2018-01-30 18:22:40 +09:00
Dean Herbert
e5188fd151 Add better channel test cases (testing non-existent channels) 2018-01-30 17:43:19 +09:00
Dean Herbert
1dbaf9b7a7 Add many more tests 2018-01-30 16:38:18 +09:00
Dean Herbert
1920a4e029 Prepare tests for fixing 2018-01-29 18:47:14 +09:00
Dean Herbert
c07a31a484 Add new (failing) tests 2018-01-29 17:45:39 +09:00
Dean Herbert
df221b6786 Remove usage of ValueTuple to allow for dynamic recompilation 2018-01-29 17:45:23 +09:00
Dean Herbert
a5b0d51205 Merge remote-tracking branch 'upstream/master' into url-parsing-support
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-01-27 14:06:58 +09:00
TocoToucan
615c831069 Merge from ppy/master 2018-01-26 21:56:17 +03:00
smoogipoo
4780c3f8c6 Disable TestCaseWaveform 2018-01-22 13:41:47 +09:00
TocoToucan
e88f514cf4 Resolve merge conflicts 2018-01-21 18:32:21 +03:00
Dan Balasescu
be225eff90
Merge branch 'master' into fix-replays 2018-01-17 18:01:41 +09:00
smoogipoo
da793d91ea Make a testcase for replay vs autoplay 2018-01-17 17:35:27 +09:00
Dean Herbert
54b0f4b912 Merge branch 'master' into url-parsing-support 2018-01-17 16:16:55 +09:00
smoogipoo
06f0f2093c Add a sample way to have local cursors move beyond their bounds 2018-01-16 20:35:39 +09:00
smoogipoo
a5415b99ae Visualise the hovered drawabe 2018-01-16 20:35:13 +09:00
Dean Herbert
5edff5c5fc
Merge branch 'master' into fix-cursor-hiding 2018-01-16 18:15:22 +09:00
smoogipoo
d230fd486e Add automated cursor testcase 2018-01-16 15:28:00 +09:00
TocoToucan
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
TocoToucan
a81f32a388 PlayerGroup -> PlayerSettingsGroup 2018-01-15 20:52:52 +03:00
TocoToucan
d3afbdaac6 Resolve merge conflict 2018-01-13 22:32:56 +03:00
TocoToucan
43d2ae348a Rename ReplaySomething -> PlayerSomething 2018-01-13 22:25:09 +03:00
Dean Herbert
45301d07fd
Merge branch 'master' into url-parsing-support 2018-01-12 19:34:44 +09:00
Dean Herbert
29c8400ec7
Merge branch 'master' into scrolling-hitobjects-rewrite 2018-01-12 17:35:24 +09:00
Dean Herbert
8f7c048c4e
Merge branch 'master' into expand-social-tab 2018-01-12 15:54:42 +09:00
smoogipoo
ab762045d6 Move back to using load(), fix testcase 2018-01-11 16:51:46 +09:00
smoogipoo
428f8b6670 Fix up license header 2018-01-11 15:08:56 +09:00
smoogipoo
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09:00
Dean Herbert
58626e3b30 Allow rulesets to create their own instantiation info 2018-01-10 17:04:07 +09:00
FreezyLemon
3bf9901dd2 Fixed bugs and added tests 2018-01-09 16:11:45 +01:00
Dean Herbert
1c9e9cb8af
Merge branch 'master' into expand-social-tab 2018-01-09 21:08:26 +09:00
Dean Herbert
72624aea18 Use a better method of link compilation
Adds word wrap back, simplifies a lot.
2018-01-09 20:33:20 +09:00
Dean Herbert
1be0569743 Update licence headers 2018-01-09 14:34:52 +09:00
Dean Herbert
b035a92bda
Merge branch 'master' into url-parsing-support 2018-01-09 14:28:20 +09:00
Dean Herbert
722eb2515f Improve variable names 2018-01-09 12:44:52 +09:00
Dean Herbert
b90b1e326e
Merge branch 'master' into fix-randomizer 2018-01-09 12:00:21 +09:00
smoogipoo
117ab8a26d Split out scrolling algorithm 2018-01-07 13:23:16 +09:00
Aergwyn
e6b581e259 Merge branch 'master' into expand-social-tab 2018-01-06 10:48:27 +01:00
smoogipoo
7526225282 Use DP for most of the code to avoid unnecessary computations 2018-01-05 20:56:21 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Aergwyn
038fa682f7 Merge branch 'master' into expand-social-tab 2018-01-04 11:49:35 +01:00
Aergwyn
bf64b8fc69 added hover effects to panels in social
at least partially QQ
2018-01-04 11:42:50 +01:00
smoogipoo
a7aab21a29 Re-namespace files 2018-01-04 19:22:15 +09:00
smoogipoo
e0c921ff5c Split out ScrollingHitObjectContainer into new file 2018-01-04 19:20:43 +09:00
smoogipoo
651e24e3cc Implement proper scrolling directions 2018-01-04 19:17:40 +09:00
smoogipoo
f34131f8f4 Initial game-wide replacement of scrolling playfields 2018-01-04 18:50:17 +09:00
smoogipoo
b11f4ab834 Implement control points 2018-01-04 18:35:48 +09:00
smoogipoo
90839e6d56 Test case improvements with TimeRange testing 2018-01-04 17:07:33 +09:00
smoogipoo
c067ee5fbe Move position calculation to UpdateAfterChildren
Because we want this to occur after lifetimes have been evaluated.
2018-01-04 16:38:43 +09:00
smoogipoo
210fd290e5 Use the new AliveObjects 2018-01-04 16:38:20 +09:00
smoogipoo
b968040963 General improvements to testcase 2018-01-04 16:38:07 +09:00
smoogipoo
7beb4c3507 Initial implementation of a new scrolling hitobject container 2018-01-04 16:21:15 +09:00
Aergwyn
988f6ac901 fix SortDirection default to descending when retrieved data is ascending 2018-01-03 17:53:50 +01:00
Endrik Tombak
1a8471bc37 Replace not Filtered with Visible 2018-01-03 15:58:09 +02:00
Endrik Tombak
843e9c53c0 Add test cases for new randomizer behaviour 2018-01-03 15:38:43 +02:00
Dan Balasescu
2a6068f8e7
Merge branch 'master' into fix-play-song-select-tests 2018-01-03 14:12:49 +09:00
Dean Herbert
31b875b7cd Add test for unranked mod using mania random 2018-01-03 13:42:09 +09:00
Dean Herbert
faf1181fc3
Merge branch 'master' into url-parsing-support 2018-01-02 17:51:50 +09:00
Dean Herbert
3a7098340a Add test for unimplemented mod 2018-01-02 16:58:22 +09:00
Dean Herbert
f10a19ada1 Update tests to only use implemented mods 2018-01-02 16:55:15 +09:00
Dean Herbert
2079b7239c
Merge branch 'master' into result-page-date-order 2017-12-31 13:11:55 +09:00
Dean Herbert
02514d4228 Update tests to account for correct beatmap displaying on details area 2017-12-31 12:54:27 +09:00
FreezyLemon
e7721d71f3 Changed chat link implementation according to review 2017-12-31 00:51:47 +01:00
Aergwyn
301efb948e add required types to TestCase 2017-12-30 22:45:02 +01:00
Aergwyn
ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
Aergwyn
138d78309f add HitCount enum and replace string usage with enum 2017-12-30 18:07:30 +01:00
FreezyLemon
ae79be7b51 small style fixes plus new assert in test 2017-12-28 21:45:58 +01:00
FreezyLemon
7454633f63 Refactor and general tidying up 2017-12-28 20:11:21 +01:00
FreezyLemon
64d99a7560 Fix tests 2017-12-28 02:29:58 +01:00
FreezyLemon
128603a99f Added more and fixed the old automated tests 2017-12-28 01:12:13 +01:00
FreezyLemon
d21ef14f75 Better style; removed initial sprites 2017-12-27 17:14:08 +01:00
Dean Herbert
3428cf6501 Decrease speed of progress notifications 2017-12-27 21:11:20 +09:00
Dean Herbert
7d0c94fd01 Fix notification overlay layout and scheduled tasks being delayed
Closes #1295
2017-12-27 19:42:44 +09:00
Dean Herbert
94449ed597
Merge branch 'master' into notification-verbosity 2017-12-26 20:48:59 +09:00
Dean Herbert
3182c22c7d Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info 2017-12-26 20:36:22 +09:00
Dean Herbert
7504cd589d Move alpha handling to state 2017-12-26 20:18:47 +09:00
Dean Herbert
1c4bcdda96 Fix test race condition
async loads
2017-12-26 20:13:55 +09:00
Dean Herbert
ee67e7119d Merge remote-tracking branch 'upstream/master' into fix-info-wedge 2017-12-26 19:44:28 +09:00
Dean Herbert
ab6c93fba4
Merge branch 'master' into notification-verbosity 2017-12-26 16:14:24 +09:00
Dan Balasescu
ef0031a719
Merge branch 'master' into popup-word-wrap 2017-12-26 15:47:58 +09:00
Dean Herbert
024d9a6850 Remove unnecessary null check 2017-12-26 15:33:02 +09:00
Dean Herbert
e14ad31a07 Increase wait durations for test stability 2017-12-26 15:32:53 +09:00
Dan Balasescu
ad811961a7
Merge branch 'master' into quieter-notifications 2017-12-26 15:30:12 +09:00
Dean Herbert
ed7ae4e956
Merge branch 'master' into fix-info-wedge 2017-12-26 15:08:52 +09:00
FreezyLemon
c822735724 Added tests for hiding diffs (and especially the last visible diff) 2017-12-26 03:57:18 +01:00
FreezyLemon
025d3941a2 Fixed problems introduced by the merge 2017-12-25 19:43:35 +01:00
FreezyLemon
a30448095e Merge branch 'master' into url-parsing-support 2017-12-25 19:12:23 +01:00
Dean Herbert
1fc240f6c5 Expose unread notification count 2017-12-26 01:50:05 +09:00
Dean Herbert
bb33d0211a Add a count of unread notifications to the toolbar 2017-12-26 01:36:58 +09:00
Dean Herbert
dff082ed94 Make toolbar testable and add the most basic of visual tests 2017-12-26 01:12:46 +09:00
Aergwyn
48e55a0686 fix formatting and test
add missing line
2017-12-25 16:52:17 +01:00
Dean Herbert
f76878e2fe Add a very basic popup testcase 2017-12-26 00:38:30 +09:00
Aergwyn
bb4b5bebf9 fix supporter icon in profile missing its background
also it doesn't show up on profiles without supporter anymore
2017-12-25 15:30:42 +01:00
Dean Herbert
40dd66cb97 Make TestCaseNotificationOverlay dynamically testable 2017-12-25 18:31:19 +09:00
Dean Herbert
fa95612fb7 Merge remote-tracking branch 'upstream/master' into fix-info-wedge 2017-12-25 01:06:56 +09:00
Dean Herbert
a7ee6985b0 Add wait step 2017-12-25 01:06:33 +09:00