1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 08:42:55 +08:00
Commit Graph

1860 Commits

Author SHA1 Message Date
Dean Herbert
a88f23e555 Convert remaining two flags to ctor parameters 2019-03-26 16:53:44 +09:00
Dean Herbert
4c77899738 Add storyboard ordering test 2019-03-26 16:37:52 +09:00
Dean Herbert
83863d35c3 Remove AllowLeadIn flag 2019-03-26 16:35:00 +09:00
Dean Herbert
8658de5108 Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
2019-03-26 13:52:48 +09:00
Dean Herbert
868367511e Add ManualInputManager to screen tests
Also sanitises content init order (ctor for content; bdl for other)
2019-03-26 13:26:55 +09:00
Dean Herbert
85c63f14f2 Add comprehensive player resume testing 2019-03-26 13:18:33 +09:00
Dean Herbert
c403dede20 Add ManualInputManager to screen tests
Also sanitises content init order (ctor for content; bdl for other)
2019-03-26 13:16:46 +09:00
Dean Herbert
4c0121a112 Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-26 11:31:23 +09:00
Dean Herbert
b75ea295db Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
2019-03-26 11:28:43 +09:00
David Zhao
be9ac39f54 Cleanup 2019-03-26 11:11:27 +09:00
David Zhao
35bf262d19 Merge remote-tracking branch 'upstream/master' into facade-container 2019-03-26 11:11:13 +09:00
David Zhao
a0f6718145 Better tests and implementation 2019-03-26 10:48:29 +09:00
smoogipoo
f4aeb390ef Initial re-layout of score table 2019-03-26 10:21:34 +09:00
smoogipoo
6a9f005ed4 Merge remote-tracking branch 'Joehuu/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
2019-03-25 15:21:29 +09:00
Dean Herbert
39df8cce19 Fix incorrect usage of InternalChildren
Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)
2019-03-25 13:48:55 +09:00
Dean Herbert
9a6576c0a1 Merge remote-tracking branch 'upstream/master' into multi-background-stack 2019-03-25 12:40:31 +09:00
Dean Herbert
371166955e Apply a few minor refactors 2019-03-25 12:39:40 +09:00
Dean Herbert
a1c5eda05b Add grouping of visual tests 2019-03-25 01:02:36 +09:00
David Zhao
d37968d88d Add better test for facade containers 2019-03-24 15:18:38 +09:00
Dean Herbert
1e0027e4f2 Fix test 2019-03-24 12:09:18 +09:00
David Zhao
6e98a8dd7c Initial implementation 2019-03-22 20:01:58 +09:00
Dean Herbert
db89796752 Merge remote-tracking branch 'upstream/master' into multi-background-stack 2019-03-22 16:05:39 +09:00
Dean Herbert
670c25d5e8 Refactor test 2019-03-22 16:03:08 +09:00
David Zhao
c43b1afa30 Use is loaded instead 2019-03-22 15:23:18 +09:00
David Zhao
8fb4de101f Wait for screen current 2019-03-22 15:20:06 +09:00
Dan Balasescu
b4954c5a7f
Merge branch 'master' into pause-logic-simplification 2019-03-22 15:11:34 +09:00
David Zhao
9a466d97ed Add texts to make test more visually confirmable, add no parallax screen. 2019-03-22 15:08:47 +09:00
Dan Balasescu
e09c107f38
Merge branch 'master' into better-dummy-api 2019-03-22 14:51:11 +09:00
David Zhao
dcae86e39a Add a new test for OsuScreenStack, fix parallax 2019-03-22 14:10:38 +09:00
Dean Herbert
dc004910d7 Fix AccountCreationOverlay tests and better complete dummy api's behaviour 2019-03-22 11:55:35 +09:00
Dean Herbert
d6f17a5ecd Bring nuget packages up to date 2019-03-22 02:41:21 +09:00
Dean Herbert
aa1dfdd663 Extract logic shared between tests 2019-03-21 16:33:34 +09:00
Dean Herbert
b17c5c0bb3 Add more tests for exitability 2019-03-21 16:12:14 +09:00
Dean Herbert
15f9a6b9df Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-21 16:04:18 +09:00
David Zhao
ee0d7b6c6d Merge remote-tracking branch 'upstream/master' into multi-background-stack 2019-03-21 15:35:14 +09:00
Dean Herbert
67a65b80fc
Merge branch 'master' into visual-settings-container 2019-03-20 20:48:30 +09:00
Dean Herbert
6a7ab6a001 Do less import work in [SetUp] step 2019-03-20 20:47:25 +09:00
Dean Herbert
01f795b046 Make restart public rather than reimplementing 2019-03-20 19:45:04 +09:00
Dean Herbert
acbcca4462
Merge branch 'master' into multi-background-stack 2019-03-20 19:11:27 +09:00
David Zhao
b5e8eb2a4a Wait for dim 2019-03-20 17:31:06 +09:00
David Zhao
fbfef844de Add test case for resuming PlayerLoader 2019-03-20 17:18:42 +09:00
smoogipoo
f7016e1d2c Rename DrawableScore 2019-03-20 17:15:38 +09:00
smoogipoo
ce57bdb8db Merge branch 'timed-difficulty-attributes' into update-beatmap-scores-design
# Conflicts:
#	osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
2019-03-20 17:12:34 +09:00
Dean Herbert
f43e7a880c Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-20 15:27:06 +09:00
Dean Herbert
6f1610be79
Merge branch 'master' into ruleset-container-refactor 2019-03-20 14:55:58 +09:00
Dan Balasescu
aca99c2c42
Merge branch 'master' into player-test-flexibility 2019-03-20 14:31:33 +09:00
David Zhao
2646126d86 Merge remote-tracking branch 'upstream/master' into visual-settings-container 2019-03-20 14:29:20 +09:00
David Zhao
15637f9c4a Rework instant blur logic such that updateVisuals doesn't need to be public 2019-03-20 14:17:35 +09:00
Dean Herbert
5b6ac7abdc Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-20 10:31:42 +09:00
Dean Herbert
461a0a5038
Merge branch 'master' into remove-unnecessary-code 2019-03-20 10:22:24 +09:00
Dean Herbert
baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert
9ca6699c64 Merge remote-tracking branch 'upstream/master' into player-test-flexibility 2019-03-19 20:33:39 +09:00
David Zhao
3af3baf5e6 Fix merge 2019-03-19 20:22:21 +09:00
David Zhao
a1000524ee
Merge branch 'master' into visual-settings-container 2019-03-19 20:17:12 +09:00
David Zhao
a8e2072286 Make blurtarget private, improve documentation 2019-03-19 20:15:28 +09:00
Dean Herbert
8f5e02cbe5 Fix a couple of missed cases 2019-03-19 17:41:22 +09:00
Dean Herbert
def15645f7 Update framework 2019-03-19 17:32:36 +09:00
Dean Herbert
83f3d3abde Merge remote-tracking branch 'upstream/master' into disclaimer-support-text 2019-03-19 16:02:34 +09:00
David Zhao
27a92e017c rename back to UserDimContainer 2019-03-19 13:06:14 +09:00
David Zhao
f1b2073bf6 Merge remote-tracking branch 'upstream/master' into visual-settings-container 2019-03-19 13:01:05 +09:00
Dean Herbert
f56e8d9bfe Make tests better 2019-03-18 20:33:56 +09:00
Dean Herbert
4f075f4740 Add more comprehensive testing 2019-03-18 20:33:43 +09:00
Dean Herbert
536b5e0dab Remove PausableGameplayContainer 2019-03-18 20:33:43 +09:00
Dean Herbert
bcaff9f7b4 Add basic pause tests 2019-03-18 20:33:43 +09:00
Dean Herbert
8df47bc23e Increase flexibility of player test cases 2019-03-18 17:09:48 +09:00
Dan Balasescu
e0b3149e32
Merge branch 'master' into api-testability 2019-03-18 10:59:06 +09:00
Dean Herbert
300cb70859
Merge branch 'master' into multi-background-stack 2019-03-18 09:54:27 +09:00
Dean Herbert
36e5c09710
Merge pull request #4433 from nekodex/prevent-null-lookup
Don't perform lookup of beatmap stats unless an online id is present
2019-03-15 10:39:39 +09:00
David Zhao
3208f1dde8 Fix potential transitiontest failure on local unit tests 2019-03-14 16:40:25 +09:00
David Zhao
8cdfb1fd61 Remove BlurrableBackgroundScreen, rework tests 2019-03-14 16:09:17 +09:00
David Zhao
de6d8fc637 Move user blurring into VIsualSettingsContainer 2019-03-13 18:25:22 +09:00
Jamie Taylor
7a2af5634c
Merge remote-tracking branch 'upstream/master' into prevent-null-lookup 2019-03-13 14:13:50 +09:00
Jamie Taylor
04b88cdd11
Add required types for BeatmapDetailArea test case 2019-03-13 14:13:42 +09:00
Dean Herbert
b1f18481e0 Show text to supporters telling them they're cool
Also adds better tests for disclaimer screen.
2019-03-13 12:58:42 +09:00
Dean Herbert
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
Dean Herbert
0241148385 Add extensive tests 2019-03-13 11:30:38 +09:00
David Zhao
e6a55cd674 Fix TestCaseEditor as well 2019-03-12 17:45:16 +09:00
David Zhao
921c4ce242 Make tests use new OsuScreenStack 2019-03-12 16:33:35 +09:00
smoogipoo
00191ca940 Actually set the beatmap difficulty 2019-03-12 15:24:35 +09:00
smoogipoo
059397ac50 Remove unnecessary early return for maching beatmap IDs 2019-03-12 14:40:13 +09:00
Dean Herbert
d0ae75af6e Add tests and fix scenario where all matching are contained by duplicate candidate 2019-03-11 18:13:33 +09:00
jorolf
2525f5bcb7 Apply most suggestions 2019-03-09 23:58:14 +01:00
jorolf
bb6e57169f Merge branch 'screen-title-class' of github.com:Jorolf/osu into profile-header-update 2019-03-09 20:22:33 +01:00
Dean Herbert
9df27f3a5f
Merge branch 'master' into prevent-null-lookup 2019-03-09 11:14:54 +09:00
Jamie Taylor
192c257aac
Add test steps for BeatmapDetailArea 2019-03-08 18:35:49 +09:00
smoogipoo
a40ffcc692 Apply formatting adjustments 2019-03-08 16:44:39 +09:00
smoogipoo
8c0e325d8b Reduce + make beatmap scores testcase work 2019-03-08 16:41:37 +09:00
smoogipoo
a7ad29ca9d Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design 2019-03-08 16:32:46 +09:00
smoogipoo
e00702f4e4 Merge remote-tracking branch 'origin/master' into fix-non-async-load 2019-03-08 15:14:14 +09:00
Dean Herbert
345c7f4fa8 Fix test regression 2019-03-08 12:30:52 +09:00
Dean Herbert
30a0bb4a25
Merge branch 'master' into fix-duplicate-bg-sprites 2019-03-08 12:25:23 +09:00
Dan Balasescu
101009c92e
Merge branch 'master' into fix-autoplay-tests 2019-03-08 12:14:40 +09:00
Dean Herbert
cfac47413c Disable failing tests temporarily 2019-03-08 10:42:25 +09:00
smoogipoo
30c6a7c3c5 Merge remote-tracking branch 'nekodex/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/ClickableUserContainer.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
#	osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
2019-03-07 18:48:23 +09:00
Dean Herbert
1f44dde96b Fix autoplay tests not working 2019-03-07 18:34:56 +09:00
Jamie Taylor
8a69fc5534
Use AddUntilStep instead of AddWaitStep 2019-03-06 19:57:09 +09:00
smoogipoo
22423f60d4 Fix DI not working 2019-03-06 19:27:42 +09:00
Jamie Taylor
b5e89e2f3b
Add additional testing to check for extra children in the future 2019-03-06 19:13:25 +09:00
smoogipoo
ee1f9d4981 Merge remote-tracking branch 'origin/master' into profile-header-update
# Conflicts:
#	osu-resources
#	osu.Game/Overlays/Profile/Components/GradeBadge.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/Header/RankGraph.cs
#	osu.Game/Overlays/Profile/Header/SupporterIcon.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
2019-03-06 15:53:30 +09:00
Dean Herbert
8a6fa0915e
Merge branch 'master' into simplify-gameplay-clock 2019-03-05 20:22:46 +09:00
Dean Herbert
76ce3954a0 Rename PauseContainer 2019-03-05 19:30:55 +09:00
Dean Herbert
424e02f165
Merge pull request #4411 from smoogipoo/fix-custom-sample-volume
Fix volume not being considered for file samples
2019-03-05 18:41:52 +09:00
Dean Herbert
5aaa2511eb
Merge pull request #4374 from Joehuu/status-direct-list
Add beatmap status on direct list panels
2019-03-05 18:22:56 +09:00
smoogipoo
a08086cc8a Fix volume not being considered for file samples 2019-03-05 18:21:29 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
smoogipoo
896088bc02 Remove using 2019-03-05 17:23:11 +09:00
smoogipoo
4764a771d0 Add testcase 2019-03-05 17:14:30 +09:00
Dean Herbert
01f1018d02 Tidy up clock logic using DI and a GameplayClock 2019-03-05 13:37:51 +09:00
Dean Herbert
ec7842dd5a Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-03-04 12:06:56 +09:00
Dean Herbert
5487b011d6 Fix some inspections rider isn't able to deal with automatically 2019-03-02 14:34:56 +09:00
Dean Herbert
796f6c3092 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-03-02 13:13:51 +09:00
David Zhao
e3338e94d1 Make test cases more compact, add two way toggles 2019-02-28 20:01:15 +09:00
David Zhao
19d529c1c8 Move test steps into setup 2019-02-28 18:26:41 +09:00
Dean Herbert
b2872b47d0
Merge branch 'master' into UserDimLogic 2019-02-28 17:18:04 +09:00
David Zhao
69b1c76dce Actually implement blurring fix 2019-02-28 16:51:17 +09:00
David Zhao
dbe5887f7e Fix issue for user hover blur for now by checking for current screen, fix test. 2019-02-28 16:18:46 +09:00
Dean Herbert
774116923b A few fixes 2019-02-28 14:45:59 +09:00
David Zhao
4ceafef79c Add missing reference 2019-02-28 14:40:31 +09:00
David Zhao
e5607d7711 Add back "THIS IS A STORYBOARD" storyboard 2019-02-28 14:33:29 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
3e1f283281 Merge remote-tracking branch 'upstream/master' into more-inspections 2019-02-28 13:09:18 +09:00
Dean Herbert
83e9dfda75
Merge branch 'master' into fix-osugame-test-case 2019-02-28 12:33:00 +09:00
Dean Herbert
5f6ad51e7e
Merge branch 'master' into fix-osugame-test-case 2019-02-27 22:36:13 +09:00
Dean Herbert
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
Dean Herbert
9f8d03e1b6 Remove excess newlines 2019-02-27 21:03:35 +09:00
Dean Herbert
5c6db17865 Merge remote-tracking branch 'upstream/master' into fix-square-graph-overhead 2019-02-27 21:02:28 +09:00
Dean Herbert
3af7d4939c Add debounce testing 2019-02-27 19:11:09 +09:00
Dean Herbert
f942515fcd Add licence header 2019-02-27 18:59:45 +09:00
Dean Herbert
b555f793d9 Fix whitespace 2019-02-27 18:57:27 +09:00
Dean Herbert
a8bc87f5d8 Add basic skin tests
Should be expanded in the future. Bare minimum for now to test fail case.
2019-02-27 18:52:39 +09:00
David Zhao
246240e936 Remove unused includes 2019-02-27 18:04:33 +09:00
David Zhao
882fff1631 Assert storyboard visibilty at both steps of toggle 2019-02-27 17:56:44 +09:00
David Zhao
14ffd9efe8 Add fake storyboard to visually assess storyboard dim 2019-02-27 17:02:04 +09:00
David Zhao
ebec944bb8 Use actual song select for test case with beatmap import 2019-02-27 14:15:45 +09:00
Dean Herbert
56697339b3
Merge branch 'master' into fix-disabled-set-crash 2019-02-27 11:14:42 +09:00
Dean Herbert
bf6815b2a7 Fix OsuGame test case not working 2019-02-26 18:02:24 +09:00
David Zhao
59fca568c9 Remove null checks for synchronous loads 2019-02-26 17:56:42 +09:00
David Zhao
d23f399375 Add back song select wait 2019-02-26 17:43:42 +09:00
David Zhao
60ecb99dfb Have test cases create a new screen stack each time 2019-02-26 17:31:21 +09:00
Dean Herbert
5b88c2ea0f Add visual test 2019-02-26 16:12:40 +09:00
Dean Herbert
3549369822 Restore previous wait time
For whatever reason, this is required?
2019-02-26 10:27:54 +09:00
Dean Herbert
217f692798 Extract wait logic into separate method
Also reduces the required wait time.
2019-02-26 10:11:36 +09:00
Dean Herbert
c58d305fc6 private goes after public 2019-02-26 09:56:22 +09:00
Dean Herbert
14e427fed7 Rename some methods (they weren't Asserting) 2019-02-26 09:54:28 +09:00
David Zhao
a7585dea21
Make screen stack readonly 2019-02-25 22:17:51 +09:00
David Zhao
d750023c52 Fix TestCasePlayerLoader not having a background stack 2019-02-25 22:05:49 +09:00
Dean Herbert
80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
David Zhao
af4606f3d2 Create new test for StoryboardReplacesBackground 2019-02-25 12:35:01 +09:00
David Zhao
24f5bc7a75 Add documentation and move storyboard init logic 2019-02-24 20:03:24 +09:00
David Zhao
f4acd6e48f Move PlayerLoader tests out of constructor, Improve Documentation 2019-02-24 18:10:59 +09:00
David Zhao
f56f1fc4f7 Clean up left over test code 2019-02-23 15:06:04 +09:00
David Zhao
bb01948283 Use .Value with new bindable changes 2019-02-22 20:44:02 +09:00
David Zhao
ab3fa91a2f
Merge branch 'master' into UserDimLogic 2019-02-22 20:38:10 +09:00
David Zhao
76de39a344 Put user dim logic in yet another container inside UserDimContainer 2019-02-22 20:34:51 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
David Zhao
a4162a69fb Remove leftover usage of dimlevel in BackgroundScreenBeatmap 2019-02-22 18:01:50 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
David Zhao
6bf831b96f Fix TransitiouOutTest getting stuck on pause 2019-02-22 17:15:05 +09:00
Dean Herbert
2c9e6adfd4
Merge branch 'master' into bindable-valuechanged 2019-02-22 17:14:05 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
smoogipoo
d4bdae4b04 Disable TestInstantPolling 2019-02-22 16:59:52 +09:00
David Zhao
918a60ebbf Create a new player every time a test is performed. 2019-02-22 16:56:03 +09:00
David Zhao
65cdac60c3 Add tests to make sure the background is always the same through screen transitions 2019-02-22 14:43:05 +09:00
David Zhao
94bc552282 Fix backgrounds not fading out when replaced by storyboard, add test for this 2019-02-22 11:41:28 +09:00
smoogipoo
d99eaa3fce Simplify expression 2019-02-21 19:25:08 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
David Zhao
bf06674e87 Clean up test case 2019-02-21 18:19:50 +09:00
David Zhao
ad5e81f0cd Add test case for background preview, fix unit tests 2019-02-21 15:24:26 +09:00
smoogipoo
7e41fbc29b Remove LegacyDifficultyCalculator 2019-02-21 13:12:37 +09:00
smoogipoo
cc33f230b4 Merge remote-tracking branch 'origin/master' into osu-fontusage 2019-02-20 20:37:48 +09:00
David Zhao
49c5a9fc30
Merge branch 'master' into UserDimLogic 2019-02-20 17:30:34 +09:00
David Zhao
5bf405f949 Fix bindable name in tests 2019-02-20 16:56:57 +09:00
David Zhao
1bd1b6b099 Move user dim logic into UserDimContainer instead 2019-02-20 16:53:57 +09:00
smoogipoo
0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
f2ad2931c7 Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock 2019-02-20 11:37:33 +09:00
David Zhao
87717dcf9e Remove redundant constructors 2019-02-19 19:57:55 +09:00
David Zhao
2e375a9186 Add test cases for upwards traversal of screen stack 2019-02-19 19:44:26 +09:00
Dean Herbert
2bf5534bf1
Merge pull request #4292 from peppy/fix-multi-screen-test
Fix TestCaseMultiScreen intermittent failures
2019-02-19 17:08:59 +09:00
Dean Herbert
4504aee089 Unnecessary using 2019-02-19 16:50:56 +09:00
Dean Herbert
618455f7ba Remove exit step (needs login to show properly) 2019-02-19 16:47:59 +09:00
Dean Herbert
0609fcf7d4 Fix TestCaseMultiScreen intermittent failures 2019-02-19 15:52:53 +09:00
smoogipoo
93b7b51d0a timeRate -> clockRate 2019-02-19 14:29:23 +09:00
smoogipoo
9d8ba4073c Add tests for LimitedCapacityStack 2019-02-19 14:18:49 +09:00
Dean Herbert
0fce23a36b Fix test regression 2019-02-19 12:38:45 +09:00
Dean Herbert
f8033a3b35 Give TestWorkingBeatmap a reference clock 2019-02-19 12:27:30 +09:00
David Zhao
af049004dd Add test cases for transitioning into pause overlay and into results 2019-02-18 19:53:55 +09:00
David Zhao
b353b69587 Use a bindable for updating dim status instead 2019-02-18 18:58:34 +09:00
David Zhao
4e07aba548 Make it so visual tests only load the osu ruleset 2019-02-18 18:12:45 +09:00
David Zhao
af30aefe77
Merge branch 'master' into UserDimLogic 2019-02-18 16:56:16 +09:00
David Zhao
79b12ef085 Fix test build failure 2019-02-18 15:29:39 +09:00
smoogipoo
a8faa942a6 Implement new difficulty calculator structure 2019-02-18 14:49:43 +09:00
David Zhao
df148f8787 Fix background dim not being disabled on playerloader exit 2019-02-18 12:55:42 +09:00
Dean Herbert
f0743ebecf Merge remote-tracking branch 'upstream/master' into tournament-tools
# Conflicts:
#	osu.Game.Tournament.Tests/TestCaseDrawings.cs
#	osu.Game/osu.Game.csproj
2019-02-17 17:25:09 +09:00
Dean Herbert
aceb8c4cb0 Fix TestCasePlaySongSelect 2019-02-15 21:50:40 +09:00
Dean Herbert
fc583590d3 Fix OsuGame testcase 2019-02-15 17:40:49 +09:00
David Zhao
8693d6a76b
Merge branch 'master' into UserDimLogic 2019-02-15 17:11:21 +09:00
Dean Herbert
65721a01ab Fix regressed screen test cases 2019-02-15 17:01:06 +09:00
David Zhao
0a60f6dacd Documentation for tests and changes 2019-02-15 16:50:37 +09:00
David Zhao
ad9dae975d Add visual test for background dimming 2019-02-15 16:46:29 +09:00
David Zhao
6da9f94ae3 Fix regression with background dim 2019-02-15 16:17:01 +09:00
Dean Herbert
b967b93b88 Fix regressions in tests 2019-02-12 19:53:08 +09:00
Dean Herbert
88ffc78103 Restructure 2019-02-11 19:11:34 +09:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work 2019-02-11 16:30:12 +09:00
EVAST9919
0bd8fdb56d Merge remote-tracking branch 'refs/remotes/ppy/master' into update-beatmap-scores-design 2019-02-10 04:46:11 +03:00
EVAST9919
105053e91b TestCase fix 2019-02-09 00:56:41 +03:00
EVAST9919
4b7b174f75 Merge remote-tracking branch 'refs/remotes/ppy/master' into update-beatmap-scores-design 2019-02-08 18:35:18 +03:00
smoogipoo
7aca0f4a1d Fix failing test cases 2019-02-08 16:08:23 +09:00
smoogipoo
ee5ff283d1 Remove compiler warnings 2019-02-08 16:02:00 +09:00
smoogipoo
fdd37dbc4b Merge remote-tracking branch 'origin/master' into cmc-rooms 2019-02-08 15:44:33 +09:00
EVAST9919
c85dc1a236 update another scores design 2019-02-05 19:32:33 +03:00
smoogipoo
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
Dean Herbert
8ae2861ed6 Fix class name 2019-02-05 18:09:15 +09:00
Dean Herbert
a6b2e9eb0b Remove unused pieces of ini 2019-02-05 18:08:27 +09:00
Dean Herbert
2f8f4fac64 Fix combo colour fallbacks when skin is not providing any 2019-02-05 17:54:14 +09:00
Dean Herbert
482a01e7ba Merge branch 'master' into tournament-tools
# Conflicts:
#	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/Overlays/ChatOverlay.cs
#	osu.Game/Screens/Menu/MainMenu.cs
#	osu.Game/Screens/Tournament/Drawings.cs
#	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-02-02 19:09:48 +09:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
Dean Herbert
09056fd0d8
Merge branch 'master' into resources-via-nuget 2019-01-31 18:40:45 +09:00
smoogipoo
91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-01-29 21:21:36 +09:00
Dean Herbert
bbc24bbfdd Merge remote-tracking branch 'upstream/master' into resources-via-nuget
# Conflicts:
#	osu-resources
#	osu.sln
2019-01-29 12:19:35 +09:00
Dean Herbert
8d4faafdbe Rename file to match class 2019-01-28 18:41:57 +09:00
Dean Herbert
628b3e1119 Move osu-resources to nuget 2019-01-28 18:33:39 +09:00
Dean Herbert
1404ba6625 Remove unnecessary changes 2019-01-28 15:56:55 +09:00
jorolf
648ed0e467 update license headers 2019-01-27 23:45:00 +01:00
jorolf
54d8e4043f Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2019-01-27 23:32:48 +01:00
Dean Herbert
014ea972d9 Merge remote-tracking branch 'origin/master' into samah-ios 2019-01-25 11:51:44 +09:00
smoogipoo
8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Shane Woolcock
728c744e4d Merge branch 'master' into samah-ios 2019-01-23 22:19:49 +10:30
Dean Herbert
f107a922b4 Add tests for key counter inside player heirarchy 2019-01-23 14:51:25 +09:00
Shane Woolcock
fbed8c3242 Pass GameHost to BeatmapManager in visual tests 2019-01-22 22:07:41 +10:30
Shane Woolcock
10b91e18bd Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
Shane Woolcock
f26a551e95 Revert audio changes 2019-01-19 17:40:37 +10:30
Dean Herbert
7bcf056872
Merge branch 'master' into update-framework 2019-01-16 19:16:53 +09:00
Dan Balasescu
75113db438
Merge branch 'master' into fix-skip-button-scaling 2019-01-16 16:37:37 +09:00
Dean Herbert
bfb18b4ffb Update framework and other nuget packages 2019-01-16 10:14:37 +09:00
Shane Woolcock
a6c54a9675 Merge branch 'master' into samah-ios 2019-01-12 00:16:09 +10:30
Unknown
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
Dean Herbert
e2dd025225 Fix scaling of SkipOverlay when UI scale is adjusted
Closes #4040.
2019-01-11 16:54:42 +09:00
jorolf
6ba7e2b670 split the profile header into several components 2019-01-11 01:12:19 +01:00
Dean Herbert
2c2ed1ae47
Merge branch 'master' into profile-header-update 2019-01-10 18:34:39 +09:00
Dean Herbert
aa68bbc1d9
Merge branch 'master' into fix-match-select-crash 2019-01-10 15:40:03 +09:00
smoogipoo
3dc3d4cb40 Add test 2019-01-10 15:25:12 +09:00
smoogipoo
122fc2de58 Show room leaderboard instead in the lounge 2019-01-08 19:24:55 +09:00
Shane Woolcock
19693c3e51 Use TrackManager CreateWaveform to fix editor crashes 2019-01-08 17:10:31 +10:30
Dean Herbert
49ba4e5a14
Merge branch 'master' into update-framework 2019-01-07 18:51:54 +09:00
Dean Herbert
f6018294b5 Update framework 2019-01-07 18:50:27 +09:00
Roman Kapustin
469a64a7cd The code must not contain multiple blank lines in a row 2019-01-05 21:03:03 +03:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
Dean Herbert
01f6199c49
Merge branch 'master' into profile-header-update 2019-01-04 16:38:42 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score 2019-01-04 13:11:17 +09:00
smoogipoo
a7db0bbb91 Sort rooms based on their API position 2018-12-28 01:45:19 +09:00
smoogipoo
c614505b7c Revert unnecessary change to testcase 2018-12-27 16:20:37 +09:00
Dean Herbert
67e200e1b2 Leaderboard design updates 2018-12-27 15:52:40 +09:00
smoogipoo
1e71c5c9c4 Add + set ended room status 2018-12-27 13:32:44 +09:00
Dean Herbert
8cf30bdb6a Play with delegate 2018-12-26 22:16:35 +09:00
Dean Herbert
bf9954aede Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs
#	osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs
#	osu.Game/Screens/Multi/IRoomManager.cs
#	osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
#	osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
#	osu.Game/Screens/Multi/RoomManager.cs
2018-12-26 21:32:12 +09:00
smoogipoo
152f3b1da3 Add processing overlay to lounge screen 2018-12-26 21:20:53 +09:00
smoogipoo
0c384417f1 Add processing overlay to room creation process 2018-12-26 21:19:02 +09:00
smoogipoo
2e5cd8b4e3 Fix post-rebase errors 2018-12-26 21:18:44 +09:00
smoogipoo
940d4a16bb Add error message when creation fails 2018-12-26 21:18:44 +09:00
Dean Herbert
171287591c Merge branch 'updateable-beatmap-sprite' into timeshift-wip
# Conflicts:
#	osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
#	osu.Game/Graphics/Containers/LinkFlowContainer.cs
2018-12-26 20:52:36 +09:00
Dean Herbert
ae47eb61ca Fix test not working when not logged in 2018-12-26 20:42:47 +09:00
smoogipoo
23d412e3ff Fix post-rebase errors 2018-12-26 20:33:49 +09:00
smoogipoo
be9ba78d47 Add error message when creation fails 2018-12-26 20:33:19 +09:00
Dean Herbert
2353c204ee Renaming 2018-12-26 20:05:57 +09:00
Dean Herbert
c6c8c472bb Split class out 2018-12-26 16:50:50 +09:00
Dean Herbert
9b2575cc20 RoomSettingsOverlay -> MatchSettingOverlay 2018-12-26 16:50:50 +09:00
smoogipoo
a8d0ff67a9 Add automated match settings overlay tests 2018-12-26 16:34:38 +09:00
Dean Herbert
b2fb027097 Remove old testcase 2018-12-26 15:26:46 +09:00
Dean Herbert
c902c1587a Add tests and modify fallback logic 2018-12-25 19:17:32 +09:00
Dean Herbert
c45c34d400 Make beatmap importing possible elsewhere in tests 2018-12-25 19:17:21 +09:00
smoogipoo
96c9e5f209 Make DefaultBeatmap readonly 2018-12-25 18:34:45 +09:00
smoogipoo
1dd2a4e368 Fix host info not working 2018-12-25 18:07:19 +09:00
smoogipoo
23d21a45e5 More automated tests 2018-12-25 11:59:08 +09:00
smoogipoo
6712a68797 Create IRoomManager interface, add test for RoomsContainer 2018-12-25 11:45:50 +09:00
jorolf
2fe80d5568 Update ProfileHeader to the new design 2018-12-22 21:50:25 +01:00
jorolf
15ae0cd70a Merge branch 'master' of git://github.com/ppy/osu into profile-header-update 2018-12-22 16:54:39 +01:00
jorolf
b4fa2d9049 WIP 2018-12-22 16:51:24 +01:00
smoogipoo
02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00
smoogipoo
d9b8df1595 Merge remote-tracking branch 'origin/master' into user-registration 2018-12-22 17:19:28 +09:00
smoogipoo
bb08bf10a0 Fix post-merge issues 2018-12-22 16:26:27 +09:00
smoogipoo
c2a00b84c7 Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Multi/IMultiplayerScreen.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/SoloResults.cs
#	osu.Game/Screens/Ranking/IResultPageInfo.cs
#	osu.Game/Screens/Ranking/ResultMode.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/ResultModeTabControl.cs
#	osu.Game/Screens/Ranking/Results.cs
2018-12-22 16:22:02 +09:00
Dean Herbert
7e97d37df5 Merge remote-tracking branch 'upstream/master' into modular-results-screen 2018-12-22 16:20:39 +09:00
Dan Balasescu
2c97409e2e
Merge branch 'master' into rewrite-standalone-chat 2018-12-22 16:07:27 +09:00
smoogipoo
baed0ef3ba Rename variable 2018-12-22 15:46:04 +09:00
smoogipoo
b9ec179713 Split out more requests + responses 2018-12-22 15:45:16 +09:00
smoogipoo
daa6292e08 Split results screen to allow for extensibility 2018-12-22 15:39:06 +09:00
smoogipoo
0e9991b81a Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 15:36:36 +09:00
Dean Herbert
e3308010c0
Merge pull request #3898 from peppy/leaderboard-modularity
Leaderboard modularity
2018-12-22 15:36:12 +09:00
smoogipoo
6afd2f7263 Adjust styling of disabled settings 2018-12-22 15:00:35 +09:00
smoogipoo
34fc740e1f Implement testcase for room settings 2018-12-22 14:48:15 +09:00
smoogipoo
e657f13c15 Separate out Leaderboard into BeatmapLeaderboard 2018-12-22 14:44:36 +09:00
smoogipoo
dbd391825a Rework+fix TestCaseMultiHeader 2018-12-22 14:30:08 +09:00
Dean Herbert
621480af02 Add simple (non-automated) test 2018-12-22 14:21:21 +09:00
smoogipoo
21cfe5a3e6 Decouple header from matchscreen 2018-12-22 14:12:27 +09:00
smoogipoo
f1a9a352fc Cleanup bindable handling 2018-12-22 14:01:06 +09:00
smoogipoo
7e9cc4e876 Seed the results screen 2018-12-21 18:37:33 +09:00
smoogipoo
4149734f89 Add room leaderboard to results 2018-12-21 18:22:13 +09:00
Dean Herbert
81104f4803 Make standalone chat reuse more code from main chat overlay 2018-12-21 17:54:12 +09:00
smoogipoo
8a2cc64bfa Split results screen to allow for extensibility 2018-12-21 16:34:03 +09:00
smoogipoo
5d59a1ffca Merge remote-tracking branch 'origin/master' into timeshift-wip
# Conflicts:
#	osu.Game.Tests/Visual/TestCasePollingComponent.cs
#	osu.Game/Online/API/APIRequest.cs
#	osu.Game/osu.Game.csproj
2018-12-21 12:51:31 +09:00
Dean Herbert
bc8b0485d8 Add textbox/posting support 2018-12-20 18:49:03 +09:00
smoogipoo
1701af61d6 Add host avatar+username to match screen 2018-12-20 18:04:22 +09:00
Dean Herbert
3a13899ce1 Add stand-alone chat component 2018-12-20 16:54:49 +09:00
Dean Herbert
bb4b54799f Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-12-20 15:57:20 +09:00
smoogipoo
2e28f378de Move beatmap + mod info to header 2018-12-20 15:17:33 +09:00
smoogipoo
2c000a9a1d Disallow starting gameplay if there's not enough time in the room 2018-12-19 10:52:15 +09:00
smoogipoo
8d640cdc25 Fix leaderboard not being refreshed when finishing gameplay 2018-12-18 12:56:16 +09:00
smoogipoo
cc68cf2f95 Implement duration 2018-12-17 14:44:54 +09:00
smoogipoo
e8007ac37f Implement multiplayer room leaderboard 2018-12-14 21:08:55 +09:00
smoogipoo
d9fc7c7d66 Separate out Leaderboard into BeatmapLeaderboard 2018-12-14 19:51:27 +09:00
Dean Herbert
fc5d5a7752
Merge branch 'master' into user-registration 2018-12-14 19:45:27 +09:00
Dean Herbert
dfe60f6318
Merge pull request #3823 from peppy/netcoreapp22
Update projects to target .NET core 2.2
2018-12-14 19:41:52 +09:00
Dean Herbert
3fda40c4ac Ignore annoying tests for now 2018-12-14 17:42:47 +09:00
smoogipoo
b83f99d90a Fix up header sizing + styling 2018-12-14 14:30:39 +09:00
Dean Herbert
4e9f727759
Merge branch 'master' into netcoreapp22 2018-12-14 11:33:41 +09:00
Dean Herbert
ebd9375780 Add more tests 2018-12-12 20:31:58 +09:00
smoogipoo
450e4cd223 Hook up API 2018-12-12 19:04:11 +09:00
smoogipoo
9af2b49c01 Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-12-12 16:22:14 +09:00
Dean Herbert
7dc1f5b771 Add more tests 2018-12-11 20:12:30 +09:00
smoogipoo
497f431366 Implement RoomManager and RoomsContainer
Reduces logic from LoungeScreen
2018-12-11 19:07:40 +09:00
Dean Herbert
ea4dce8454 Add a polling component model 2018-12-10 21:08:14 +09:00
smoogipoo
1ac615b490 Renamespace 2018-12-10 19:27:25 +09:00
smoogipoo
77193eeea4 Move from lobby into match for creation process 2018-12-10 18:00:57 +09:00
Roman Kapustin
2d0fdc8204 Create ReplayPlayer using Score from the dummy RulesetContainer 2018-12-09 17:39:35 +03:00
Dean Herbert
2a2561e5c8 Update framework and otehr nuget packages 2018-12-07 19:39:54 +09:00
smoogipoo
29263d7154 Refactor bindable shenanigans in Match 2018-12-07 16:20:05 +09:00
Dean Herbert
d42c45c87e Add full tests 2018-12-07 14:01:51 +09:00
smoogipoo
c02150a19b Make match header not fade when beatmap changes 2018-12-06 18:31:12 +09:00
smoogipoo
42817b98f9 Hide max participants box 2018-12-06 18:16:17 +09:00
Dean Herbert
9689c4fa17
Merge branch 'master' into user-registration 2018-12-06 17:06:43 +09:00
smoogipoo
eadbe4c470 Make beatmap selection work 2018-12-06 12:21:30 +09:00
Dean Herbert
e56f4cc8a5 Add remaining steps to registration screen 2018-12-06 11:58:09 +09:00
Dean Herbert
dbc33c45a6 Update nuget packages 2018-12-06 00:14:21 +09:00
Dean Herbert
68745b221e Update projects to target .NET core 2.2 2018-12-05 19:46:07 +09:00
Dean Herbert
94045413ce Change statistics to be int for now 2018-12-05 19:44:01 +09:00
Dean Herbert
1a974f64de Initial design for user registration dialog 2018-12-05 12:57:26 +09:00
smoogipoo
ec83790734 Add timeshift game type 2018-12-04 18:58:45 +09:00
smoogipoo
f2a57ce270 Fix room host not being set 2018-12-04 17:23:58 +09:00
smoogipoo
6e5716c3f3 Adjust transition 2018-12-04 15:32:12 +09:00
smoogipoo
d8739d9dee Fix creating a new room re-using the existing model 2018-12-04 15:25:48 +09:00
Roman Kapustin
c6c255718b Handle ModAutoplay during score construction in the Player 2018-12-03 22:37:26 +03:00
Dean Herbert
bc9290bfcb Schedule cross thread access in test case 2018-12-03 18:43:51 +09:00
smoogipoo
53a54f8634 Renamespace room settings 2018-12-03 17:54:10 +09:00
smoogipoo
51c16867d5 Remove type conversion from LoungeTab to RoomAvailability 2018-12-03 17:50:39 +09:00
smoogipoo
eb88768bd0 Fix incorrect controlpoint being applied to samples 2018-12-03 17:21:27 +09:00
Dean Herbert
03e416cda9 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-12-01 10:03:31 +09:00
Dean Herbert
f9fb6dc39b Remove health from ScoreInfo 2018-12-01 00:17:05 +09:00
smoogipoo
a8ad7d4670 Add silent import parameter 2018-11-30 18:27:13 +09:00
smoogipoo
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
Dean Herbert
66e43e6ed9 Update hashing method in line with master 2018-11-30 17:36:06 +09:00
Dean Herbert
be37f3c328 Rename NoModMod 2018-11-30 17:35:13 +09:00
Dean Herbert
d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
Dean Herbert
10095d09c3 Fix test namespace 2018-11-30 17:02:01 +09:00
Dean Herbert
3727955911 Refactors/renames 2018-11-30 16:35:45 +09:00
Dean Herbert
831cd3ed59 ScoreInfo scoreInfo -> ScoreInfo score 2018-11-30 15:18:52 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
smoogipoo
2bedffc00f Add tests 2018-11-30 14:27:34 +09:00
Dean Herbert
5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
smoogipoo
a88b69ec43 Notify of existing imports 2018-11-28 20:19:35 +09:00
smoogipoo
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
Dean Herbert
da79292250
Merge branch 'master' into fix_idle_tracker 2018-11-26 17:41:45 +09:00
Dean Herbert
77090500e8 Merge branch 'fix_idle_tracker' of https://github.com/UselessToucan/osu into fix_idle_tracker 2018-11-26 17:41:22 +09:00
Dean Herbert
bf2ecef6d8 Add comprehensive tests 2018-11-26 17:40:25 +09:00
Dan Balasescu
38ef1d1f03
Merge branch 'master' into multiplayer-room-settings 2018-11-26 16:46:27 +09:00
smoogipoo
dea387c31e Fix post-merge issues 2018-11-26 16:29:56 +09:00
smoogipoo
dcf740e5d3 Merge remote-tracking branch 'origin/master' into multiplayer-room-settings 2018-11-26 16:27:22 +09:00
smoogipoo
efdad3a3a7 Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection 2018-11-26 16:12:55 +09:00
smoogipoo
56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
Dean Herbert
0bc4a01a6b Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-24 20:03:25 +09:00
smoogipoo
cadfe41f83 Merge remote-tracking branch 'origin/master' into external_link_warning 2018-11-23 15:19:52 +09:00
Dean Herbert
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
miterosan
7f1f7300d3 Add channels to chatManager.AvailableChannels by using a hack. 2018-11-21 23:15:44 +01:00
smoogipoo
39e9c61e24 OpenTK -> osuTK 2018-11-21 23:11:08 +01:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo
55edeb095d SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
Roman Kapustin
376e76e00d Resolve merge conflicts 2018-11-18 16:10:36 +03:00
Dean Herbert
b574a07f23 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-15 13:31:34 +09:00
Dan Balasescu
e9b47c6233
Merge branch 'master' into hold-for-menu-back 2018-11-14 18:22:34 +09:00
Dean Herbert
a1dd1057ce
Merge branch 'master' into more-global-scrollalgo 2018-11-14 17:15:24 +09:00
Dean Herbert
fb22fc11f6 Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-14 13:59:17 +09:00
Dean Herbert
2ae139d260
Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:54:53 +09:00
Dean Herbert
34973a3e9f
Merge branch 'master' into scrollalgorithm-timeat 2018-11-14 13:32:16 +09:00
Dean Herbert
8b190edde0
Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:32:14 +09:00
Dean Herbert
396a5b3cd0
Merge branch 'master' into Private_Messages 2018-11-14 12:49:54 +09:00
Dean Herbert
3caf0cb0d9
Merge branch 'master' into no-drawable-speedchangevis 2018-11-13 19:42:04 +09:00
Dean Herbert
82ebc74eee Fix testcase 2018-11-13 15:36:36 +09:00
Dean Herbert
f241fcdba1 Add back support for new API and private messages 2018-11-13 15:20:59 +09:00
Dean Herbert
4b1282235a Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-12 20:41:10 +09:00
smoogipoo
b9b20607af Add IScrollAlgorithm.TimeAt() 2018-11-12 17:43:22 +09:00
smoogipoo
d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
smoogipoo
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo
7f0f143a1b Move IScrollAlgorithm to ScrollingRulesetContainer + use DI 2018-11-12 17:34:35 +09:00
smoogipoo
54ab256c8e Instantiate a new path rather than setting properties on it
# Conflicts:
#	osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
#	osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
#	osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 13:50:19 +09:00
smoogipoo
8583fd1380 Fix testcase never working 2018-11-08 14:04:20 +09:00
Dean Herbert
a8b1e509e7 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-07 17:30:52 +09:00
smoogipoo
2612fd3099 Adjust ruleset-specific namespaces 2018-11-07 16:10:21 +09:00
smoogipoo
e9e50f41fb Use Name/NameScreen format 2018-11-07 13:04:17 +09:00
Dean Herbert
7f73fc2d39 Require holding back button to quit gameplay
Avoids accidental presses and streamlines logic with on-screen element.
2018-11-07 01:49:21 +09:00
smoogipoo
52f4923c8e Remove intermediate Screens namespace 2018-11-06 18:28:22 +09:00
smoogipoo
ac25718c5a Renamespace compose-mode components 2018-11-06 18:14:46 +09:00
smoogipoo
bd775af274 PlacementMask -> PlacementBlueprint 2018-11-06 18:04:03 +09:00
smoogipoo
f2a5f28ea2 SelectionMask -> SelectionBlueprint 2018-11-06 17:56:04 +09:00
smoogipoo
ad2836a61e MaskSelection -> SelectionBox 2018-11-06 17:52:47 +09:00
smoogipoo
26c9390c16 HitObjectMaskLayer -> BlueprintContainer 2018-11-06 17:36:10 +09:00
smoogipoo
faab744cbd DragLayer -> DragBox 2018-11-06 17:24:57 +09:00
Dean Herbert
43c70d354d Merge tag '2018.1105.0' into tournament-tools 2018-11-06 00:35:21 +09:00
Dean Herbert
4554fc2c7b Update framework and other dependencies 2018-11-05 18:22:16 +09:00
smoogipoo
ace1dce281 Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
2018-11-05 18:10:22 +09:00
smoogipoo
92d570342c Fix sample additions not falling back to non-addition bank 2018-11-05 17:35:24 +09:00
smoogipoo
a4caaf56ef Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2018-11-05 16:38:28 +09:00
Dean Herbert
0f1ffe392f Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-01 17:52:24 +09:00
smoogipoo
f674fcf2c8 Merge branch 'mask-separation' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
#	osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
2018-10-26 14:05:30 +09:00
smoogipoo
e14719e440 Mask -> Piece for non-mask components 2018-10-25 18:28:10 +09:00
smoogipoo
d19f80835b Adjust namespaces 2018-10-25 18:26:28 +09:00
smoogipoo
8a2a6a3ecb Preserve the beatmap's version 2018-10-23 14:59:21 +09:00
Roman Kapustin
b4c68f4cf7 Show a warning prior to opening external links 2018-10-22 23:16:57 +03:00
Hōtarō Oreki
b8ac328ae9 Rename APIChangelog to APIChangelogBuild 2018-10-18 21:04:21 +02:00
Jarosław Zgierski
7cc5128353
Merge branch 'master' into changelog-overlay 2018-10-18 20:26:56 +02:00
smoogipoo
0e841628b6 Implement hitobject deletion 2018-10-18 16:36:06 +09:00
Dean Herbert
cd718812b2
Merge branch 'master' into tighten-diffcalc-tolerances 2018-10-18 14:01:47 +09:00
Dean Herbert
1a62283cb4 Merge branch 'master' into tournament-tools 2018-10-18 00:29:29 +09:00
smoogipoo
969477dadd Remove placement events, make everything pass top-down 2018-10-17 17:43:16 +09:00
smoogipoo
4ea4ec0d25 Move placement handling events to a higher level 2018-10-17 15:46:30 +09:00
smoogipoo
70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
#	osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs
2018-10-16 17:28:16 +09:00
smoogipoo
47be95ce0b Fix slider nodes using the wrong samples 2018-10-16 17:10:24 +09:00
smoogipoo
5095fbcdf7 Merge remote-tracking branch 'origin/master' into optimise-diffcalc 2018-10-16 10:27:18 +09:00
smoogipoo
2f943e77aa Make Velocity and TickDistance private set 2018-10-15 12:31:52 +09:00
Dean Herbert
a314a561d0
Merge branch 'master' into playfield-scaling-rework 2018-10-12 19:32:43 +09:00
Dean Herbert
468f7fd1ea Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework 2018-10-12 19:25:08 +09:00
Dean Herbert
4a64cb7f85 Remove nuget includes im props 2018-10-12 18:56:18 +09:00
Dean Herbert
15dae9b2e4 Update nuget dependencies (version mismatches) 2018-10-12 18:51:51 +09:00
Dean Herbert
77055f6d5c Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-10-12 18:49:47 +09:00
Dean Herbert
182aa63cc8 Update nuget dependencies 2018-10-12 17:08:59 +09:00
smoogipoo
83fd251c7b Pass sub-controlpoints as span slices 2018-10-11 17:44:25 +09:00
smoogipoo
cb1703c6e2 Fix colours with alpha components not being parsed 2018-10-05 11:19:01 +09:00
smoogipoo
ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
smoogipoo
e931aa3d9e Move positional modifications to HitCirclePlacementMask 2018-10-04 13:43:50 +09:00
smoogipoo
10d0e2fef1 Fix up testcase 2018-10-03 14:35:32 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
51dcfeee92 Move existing tournament resources to new project 2018-09-21 18:18:28 +09:00
smoogipoo
368ceec47c Simplify creation of a playfield 2018-09-21 14:35:50 +09:00
ekrctb
b790e16217 Use Click instead of now removed TriggerOnClick 2018-09-19 11:42:32 +09:00
ekrctb
a3e6973b41 Replace usage of now removed TriggerKeyPress and similar methods. 2018-09-19 11:36:55 +09:00
Dean Herbert
7b57439976 Add proper testing 2018-09-15 16:25:37 +09:00
Dean Herbert
e636cfe79e Fix dynamic compilation not working 2018-09-15 16:24:06 +09:00
Dean Herbert
3c8c7a0459 Move ChannelManager to OsuGame
There's no reason for it to exist at OsuGameBase
2018-09-14 13:31:25 +09:00
Dean Herbert
e6d5bbd886
Merge branch 'master' into multiplayer-room-settings 2018-09-09 22:40:08 +09:00
Dean Herbert
93e2d8f309 Allow testing of all chat-related classes dynamically 2018-09-06 15:56:27 +09:00
Dean Herbert
5aff19eaea
Merge branch 'master' into replay_keycounter 2018-09-05 08:53:02 +09:00
Dean Herbert
4376ad107e
Merge branch 'master' into Private_Messages 2018-08-24 17:26:33 +09:00
smoogipoo
1a2c3715c7 Fix testcase dodginess 2018-08-24 15:50:39 +09:00
Jarosław Zgierski
5256f3ed31
Merge branch 'master' into changelog-overlay 2018-08-21 13:55:02 +02:00
smoogipoo
557a2ee39d Add more comprehensive tests 2018-08-17 10:04:00 +09:00
ekrctb
cf4cb934cf
Merge branch 'master' into fix-combo-colours 2018-08-16 10:45:54 +09:00
Dean Herbert
ed2a642666 Fix info wedge test case failing randomly 2018-08-16 10:05:34 +09:00
smoogipoo
05b5144dac Add parsing test 2018-08-15 13:36:22 +09:00
DrabWeb
e65bb5b54b Remove unused usings, remove unused icon variable. 2018-08-14 12:34:05 -03:00
DrabWeb
7d8c0aca72 Order usings, use inline out variable declaration. 2018-08-14 12:25:35 -03:00
DrabWeb
af31845c83 Fix naming conflicts in RoomSettingsOverlay. 2018-08-14 11:31:20 -03:00
DrabWeb
52b157d072 Merge https://github.com/ppy/osu into multiplayer-room-settings 2018-08-14 11:16:25 -03:00
smoogipoo
e360985d73 Replace variables into the entire line 2018-08-14 18:15:09 +09:00
smoogipoo
78258e2fe2 Prefix some methods with "Test" 2018-08-14 14:19:26 +09:00
smoogipoo
15bd7e4f1f Test that changing ruleset resets mods 2018-08-14 14:18:46 +09:00
Dean Herbert
4cb7063801 Add automated testing of mod preservation/removal 2018-08-07 16:45:18 +09:00
Dean Herbert
7b8bd7f21c Fix mod selection not restoring when re-entering song select 2018-08-07 14:49:44 +09:00
miterosan
b414bff864 Fix the testcase 2018-08-04 01:00:46 +02:00
miterosan
358c346923 Use TabItem.Items.Count 2018-08-04 00:44:16 +02:00
miterosan
cc640893c2
Merge branch 'master' into Private_Messages 2018-08-04 00:33:46 +02:00
Dean Herbert
042e4e3966
Merge branch 'master' into add-loading-animation 2018-08-03 21:50:02 +09:00
Dan Balasescu
3460fd6e71
Merge branch 'master' into split-mod-sections 2018-08-03 18:48:31 +09:00
Dean Herbert
b1afcf0e5d Add loading animation to player loader to make it more obvious when loading is complete 2018-08-02 19:47:50 +09:00
Dean Herbert
6ce32bd431 Update remaining nuget deps 2018-08-01 19:17:16 +09:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
Dean Herbert
49b2d8c355
Merge branch 'master' into open-downloaded-beatmas 2018-07-31 16:41:09 +09:00
smoogipoo
ae8bf34fd1 Fix breadcrumb testcase failures 2018-07-31 13:48:21 +09:00
Dean Herbert
ddecf59cfd
Merge branch 'master' into open-downloaded-beatmas 2018-07-31 13:21:14 +09:00
Dean Herbert
6bb7f9ce9c
Merge branch 'master' into Private_Messages 2018-07-31 11:45:06 +09:00
Dean Herbert
338496452d Move testing package references to somewhere appveyor will find them 2018-07-30 15:15:51 +09:00
Dean Herbert
3cf906042e
Merge branch 'master' into remove-net471-target 2018-07-30 11:28:06 +09:00
miterosan
8bccecc2e5 Add some more testing. 2018-07-30 00:13:32 +02:00
miterosan
b1e9a4fd24 Merge branch 'master' of https://github.com/ppy/osu into Private_Messages 2018-07-29 23:28:34 +02:00
miterosan
95cb21299a Remove chatTabControl and transfer the logic into ChannelTabControl. 2018-07-29 21:18:37 +02:00
Roman Kapustin
3134e14b37 Test KeyCounter.RestoreState 2018-07-28 23:24:03 +03:00
Dean Herbert
b7de922896
Merge branch 'master' into open-downloaded-beatmas 2018-07-28 12:44:34 +09:00
HoutarouOreki
a8b0e23ed6 Merge remote-tracking branch 'upstream/master' into changelog-overlay 2018-07-26 15:41:33 +02:00
HoutarouOreki
0f263e2cca Delete ClickableText class, use OsuHoverContainer instead 2018-07-26 14:19:58 +02:00
Dean Herbert
ee0522ad84 Ignore failing test 2018-07-25 16:45:07 +02:00
HoutarouOreki
2906f4b401 Change initial chart colour 2018-07-25 14:31:41 +02:00
AlFasGD
c4b1ba2979 Remove padding, fix corner radiuses 2018-07-25 15:14:40 +03:00
Dean Herbert
95cca046fb Merge branch 'master' into open-downloaded-beatmas 2018-07-25 12:38:49 +02:00
HoutarouOreki
3b36288185 Rename TestCaseChangelog to TestCaseChangelogOverlay 2018-07-24 20:13:53 +02:00
HoutarouOreki
fa6074925e Remove unused variable 2018-07-24 17:02:24 +02:00
AlFasGD
cd37b0df23 Merge branch 'master' into labelled-text-box 2018-07-24 09:19:22 +03:00
HoutarouOreki
24bb44a152 Add TextBadgePair test case 2018-07-24 04:04:18 +02:00
Dean Herbert
0aacde836a Move private channel constructor to own class 2018-07-23 20:46:44 +02:00
HoutarouOreki
f685c5ba58 Fix typos; remove outdated comments; minor order changes 2018-07-23 18:38:20 +02:00
HoutarouOreki
e27292fef8 Rewrite LineBadge.cs
+ update all its references
2018-07-23 17:49:42 +02:00
miterosan
9f43e0c900 Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
# Conflicts:
#	osu.Game/Overlays/Chat/ChatTabControl.cs
#	osu.Game/Overlays/ChatOverlay.cs
2018-07-23 15:45:54 +02:00
AlFasGD
dd56a2d95f Apply proposed changes (untested) 2018-07-23 15:44:10 +03:00
Dean Herbert
82ea4456e4 Fix testing regression 2018-07-23 10:33:10 +02:00
Jarosław Zgierski
f26c2f6123
Merge branch 'master' into changelog-overlay 2018-07-23 09:47:04 +02:00
HoutarouOreki
24abec43c1 Show on test case 2018-07-22 21:00:29 +02:00
HoutarouOreki
23309b3b00 Strip test case 2018-07-22 20:27:20 +02:00
Dean Herbert
d561f54282
Merge branch 'master' into per-object-css 2018-07-23 03:01:17 +09:00
HoutarouOreki
421c95156b Fix ClickableText test case 2018-07-22 15:16:42 +02:00
HoutarouOreki
2b7f657f2c Place HTML messages in a TextFlowContainer
Add missing accessibility modifier in ClickableText test case and fix disposal
2018-07-22 14:44:11 +02:00
HoutarouOreki
7e327fd084 Use using 2018-07-22 12:02:45 +02:00
HoutarouOreki
50b6f88a4e Merge branch 'changelog-overlay' of https://github.com/HoutarouOreki/osu into changelog-overlay 2018-07-22 10:58:47 +02:00
Jarosław Zgierski
44bdd0dbb6
Merge branch 'master' into changelog-overlay 2018-07-22 10:57:30 +02:00
HoutarouOreki
2ea5a97784 Fix ClickableText test case 2018-07-22 09:31:51 +02:00
HoutarouOreki
2982fe3587 Compress Test Case; Remove empty summary 2018-07-22 09:19:26 +02:00
HoutarouOreki
9586ef7b0a ClickableText changes 2018-07-22 08:28:12 +02:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
a2f744b05e Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas 2018-07-21 00:03:17 +09:00
AlFasGD
6dd5c7e5ab Add test case 2018-07-20 14:28:39 +03:00
Dean Herbert
7cc999027d
Merge branch 'master' into pause-input-fixes 2018-07-20 17:20:19 +09:00
Dean Herbert
241437c819 Remove unnecessary counting change logic 2018-07-20 17:08:25 +09:00
smoogipoo
c087a73f40 Implement per-hitobject custom sample banks 2018-07-20 15:12:44 +09:00
smoogipoo
967d0c3c72 Adjust testcase 2018-07-20 15:12:04 +09:00
Dean Herbert
64ead0fdf7 Add more tests and fix one remaining issue case 2018-07-20 11:55:17 +09:00
HoutarouOreki
a857999950 Refactor3 2018-07-20 00:52:50 +02:00
HoutarouOreki
bcd132e87f API1 2018-07-19 19:07:24 +02:00
Dean Herbert
d7f1766ee2 wip 2018-07-19 18:51:08 +09:00
Dean Herbert
7be3a5d466 Centralise test storage logic 2018-07-19 14:07:55 +09:00
Dean Herbert
3e738c607a Add more song select tests 2018-07-19 13:39:42 +09:00
HoutarouOreki
11e0732a27 Refactor1, UX1 2018-07-18 19:32:15 +02:00
HoutarouOreki
837747e35f Streams3 2018-07-18 15:17:20 +02:00
Dean Herbert
0c24244340 Remove SingletonContextFactory
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.

# Conflicts:
#	osu.Game/Database/SingletonContextFactory.cs
2018-07-18 16:50:56 +09:00
Dean Herbert
1d52231d4f Remove SingletonContextFactory
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
2018-07-18 16:44:47 +09:00
Dean Herbert
9611292f4e FilterTask -> PendingFilter 2018-07-18 13:18:50 +09:00
Dean Herbert
fb09385f51 Remove net471 targeting 2018-07-18 11:01:08 +09:00
HoutarouOreki
6baa761b9c Streams2 2018-07-18 03:26:08 +02:00
HoutarouOreki
523d47e815 Streams1 2018-07-18 01:35:06 +02:00
HoutarouOreki
3c1e445fdf Header3 2018-07-17 18:32:11 +02:00
HoutarouOreki
b4bb97fba8 Header2 2018-07-17 15:01:53 +02:00
smoogipoo
827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +09:00
HoutarouOreki
be977e2541 Header1 2018-07-16 23:50:22 +02:00
Dean Herbert
ee2c7c50ad Tidy up button hierarchy 2018-07-13 16:28:18 +09:00
Dan Balasescu
e20cdccf05
Merge branch 'master' into update-disclaimer 2018-07-12 23:41:55 +09:00