1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 15:17:28 +08:00
Commit Graph

545 Commits

Author SHA1 Message Date
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
Dean Herbert
d340509b1d Move ArchiveReaders to a more global namespace
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
Dean Herbert
e0d28564d0 Move import logic to shared implementation 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
Dean Herbert
9ed05543d7 Fix post-test conditionals from being inverse of what we want to test 2018-02-12 15:39:00 +09:00
Dean Herbert
264a0f59e2 Fix duplicate test name 2018-02-12 12:22:13 +09:00
Dean Herbert
721bb7e4dd Add proper handling for OnlineBeatmapSetID conflicts
Not yet working
2018-02-09 21:31:33 +09:00
Dean Herbert
541068235d Test import twice in a row 2018-02-09 18:23:06 +09:00
Dean Herbert
623ba652ed Share more code between tests 2018-02-09 18:20:18 +09:00
Dean Herbert
981fa379b7 Count() -> Count 2018-02-09 18:02:28 +09:00
Dean Herbert
a771ca4077 Add try-finally to ensure host is exited 2018-02-09 18:02:06 +09:00
Dean Herbert
8140ffea15 Add test for deleting then reimporting 2018-02-09 17:59:27 +09:00
Dean Herbert
a166932468 Add deletion test 2018-02-09 17:51:29 +09:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Dean Herbert
d8da68c55f Disable test again (accidentally re-enabled) 2018-02-08 17:22:23 +09:00
Dean Herbert
789e25069f Fix non-visual tests not cleaning up previous executions 2018-02-08 17:07:59 +09:00
smoogipoo
86d63c014b Merge remote-tracking branch 'origin/master' into restore-ruleset-tests 2018-02-08 14:48:01 +09:00
smoogipoo
4f5bfdb888 Remove explicit .Exit on IPC test 2018-02-08 14:03:37 +09:00
smoogipoo
ccc948a0b9 Update framework (testing) 2018-02-08 12:45:51 +09:00
smoogipoo
93f1500278 Merge remote-tracking branch 'origin/master' into fix-import-tests 2018-02-08 12:40:05 +09:00
Dean Herbert
67bd375bfa Merge remote-tracking branch 'upstream/master' into raw-input-fixes 2018-02-07 22:05:44 +09:00
Dean Herbert
647cc4bdad Remove in-between properties 2018-02-07 18:04:32 +09:00
smoogipoo
74016a1482 Make sure the import tests exit their hosts 2018-02-07 15:57:16 +09:00
tgi74000
bcd568e607 Check for possible null ranks 2018-02-06 23:00:52 +01:00
Dean Herbert
dfc344b47a Update OpenTK version 2018-02-06 13:47:54 +09:00
smoogipoo
cf39236fc1 Make NUnit tests run locally again 2018-02-05 18:29:58 +09:00
Dean Herbert
6b35ef7063 Update OpenTK version 2018-02-05 16:13:30 +09: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
Dean Herbert
2ffe16d3d2 Improve clarity and coverage of unit tests 2018-01-30 18:57:42 +09:00
smoogipoo
58cdb59a27 Fix failing testcase 2018-01-30 18:22:40 +09:00
Dean Herbert
28b67e3d77
Merge branch 'master' into url-parsing-support 2018-01-30 17:47:55 +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
f996acd7e6 Add back old non-visual tests 2018-01-29 18:37:11 +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
FreezyLemon
cff3f25cd7 make all line endings CR LF (windows style) 2018-01-26 12:46:58 +01:00
FreezyLemon
8f0ab2040f Add Jetbrains.Annotations NuGet package 2018-01-26 12:46:28 +01:00
james58899
fa800f0977
fix storyboard path 2018-01-23 18:18:54 +08: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
smoogipoo
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +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
smoogipoo
823a430d30 Nothing to see here, move along 2018-01-03 22:02:54 +09:00
smoogipoo
da5bc959ad Fix testcase 2018-01-03 21:46:39 +09: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
Dean Herbert
2ca10b28c6 Use a non-broken opentk library 2017-12-29 15:42:51 +09: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
smoogipoo
6dfc596319 Post-merge fixes 2017-12-27 20:59:26 +09:00
smoogipoo
7a793eaded Merge master into netstandard 2017-12-27 20:48:53 +09:00
Dean Herbert
7d0c94fd01 Fix notification overlay layout and scheduled tasks being delayed
Closes #1295
2017-12-27 19:42:44 +09:00
Dan Balasescu
1af7f71c97
Merge branch 'master' into notification-verbosity 2017-12-27 15:01:28 +09:00
smoogipoo
5b529511ec Update OpenTK nuget package
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +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