1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 23:07:26 +08:00
Commit Graph

241 Commits

Author SHA1 Message Date
Bartłomiej Dach
77e5e131c9 Merge branch 'master' into catch-hyperdash-catcher-colouring 2020-05-10 16:49:44 +02:00
Bartłomiej Dach
ed83ac188e Remove special case for moving catcher sprite 2020-05-06 23:25:25 +02:00
smoogipoo
62d433c9c5 Adjust diffcalc test value 2020-05-04 17:01:07 +09:00
dependabot-preview[bot]
03863d901b
Bump Microsoft.NET.Test.Sdk from 16.5.0 to 16.6.1
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.5.0 to 16.6.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.5.0...v16.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-27 08:59:09 +00:00
Salman Ahmed
227503c0af
Merge remote-tracking branch 'upstream/master' into test-scene-create-ruleset 2020-04-23 16:25:33 +03:00
Salman Ahmed
2fa47992dc
Seal the ruleset creation methods and let abstract method take their place
Also makes `CreatePlayerRuleset()` and `CreateRulesetForSkinProvider()` not-null to avoid unwanted behaviour with their derivers
2020-04-23 13:27:12 +03:00
Salman Ahmed
bffe6742e0
Replace finishing catcher transforms with until-true step 2020-04-22 10:43:49 +03:00
Salman Ahmed
730b5ea1a9
Make the Catcher.Colour assertion read better 2020-04-22 10:40:21 +03:00
Salman Ahmed
5d3475a5ed
Retrieve CatcherTrailDisplay for asserting colours set correctly 2020-04-22 05:12:51 +03:00
Salman Ahmed
95de2c6f7f
Mark Catcher.additiveTarget to never be null
And provide empty containers instead.
2020-04-22 05:04:07 +03:00
Salman Ahmed
e17a44c99b Merge branch 'master' of github.com:ppy/osu into catch-hyperdash-catcher-colouring 2020-04-21 05:58:56 +03:00
Bartłomiej Dach
e3e0cd149f Refactor test code to eliminate boolean flags 2020-04-19 12:46:28 +02:00
Salman Ahmed
155bc8b49a Remove ModTestScene ruleset parameter on constructor and use CreateRuleset instead 2020-04-17 11:17:59 +03:00
Salman Ahmed
92df4e3a9e Remove PlayerTestScene constructor and use CreateRuleset method instead 2020-04-17 11:17:51 +03:00
Salman Ahmed
5fa6bcb5a3 Move SkinnableTestScene into using the global CreateRuleset method 2020-04-17 11:17:44 +03:00
Dean Herbert
081a02f748
Merge branch 'master' into catch-hyperdash-fruit-colouring 2020-04-14 10:01:15 +09:00
Salman Ahmed
d27d8671ab Convert all static getter-only properties to static readonly fields 2020-04-08 14:23:29 +03:00
Dean Herbert
0a340bac5a Ensure the correct (up-to-date) ruleset is retrieved 2020-04-07 16:20:13 +09:00
Dean Herbert
2c840c52a3 Add skinnable test scene per ruleset to better allow dynamic compilation 2020-04-07 16:20:13 +09:00
Salman Ahmed
b8327ed877 Add test for osu!catch skin colour decoding
Tests the skin configuration CatchTheBeat section's colours decoding part
2020-04-05 00:30:10 +03:00
Salman Ahmed
f6bbec72bf Revert "Add custom-coloured osu!catch skin configuration to 'Resources/special-skin'"
This reverts commit dfd86e643b.
2020-04-05 00:20:21 +03:00
Salman Ahmed
dfd86e643b Add custom-coloured osu!catch skin configuration to 'Resources/special-skin' 2020-04-05 00:14:07 +03:00
Salman Ahmed
b100230538 Test CatchSkinColour transformation on colour retrieval implicitly 2020-04-05 00:13:23 +03:00
Salman Ahmed
c4f7b45768 Revert "Add support for custom hyper-dash fruit colouring"
This reverts commit 6f2cc5471a and also its testing cases.

This became dead code after actual correct osu!catch skin colouring, we don't support modern skinning (non-legacy skinning) at the moment, so for what it's worth this can be reverted to default red-coloured
2020-04-05 00:07:25 +03:00
Salman Ahmed
ee247e58c8 Merge branch 'catch-hyperdash-fruit-colouring' into catch-hyperdash-catcher-colouring 2020-04-04 18:07:29 +03:00
Salman Ahmed
f67a62699b Merge remote-tracking branch 'upstream/master' into catch-hyperdash-fruit-colouring 2020-04-03 19:57:52 +03:00
Salman Ahmed
dd684b68d9 Make parameters required 2020-04-03 19:53:38 +03:00
Salman Ahmed
0340b6db51 Describe step names more 2020-04-03 19:50:32 +03:00
Dean Herbert
89d8bf9780 Fix catcher test resources being at wrong dpi definition 2020-03-31 13:46:20 +09:00
Salman Ahmed
16a4525a9c CatchSkinConfiguration -> CatchSkinColour 2020-03-30 09:33:47 +03:00
Salman Ahmed
e51097da9e Add a legacy skin provider above the test skin 2020-03-30 09:29:00 +03:00
Salman Ahmed
45eb03bfe2 Apply review suggestions 2020-03-28 07:43:47 +03:00
Salman Ahmed
77b3011394 Add hyper-dash catcher & trails colouring test cases 2020-03-26 09:19:00 +03:00
Salman Ahmed
29274b004c Add hyper-dash fruit colouring test cases 2020-03-26 05:42:13 +03:00
Salman Ahmed
aa162b1033 Setup hyper-dash colouring test scene 2020-03-26 05:42:11 +03:00
Dean Herbert
1733519c3a Split out CatcherArea nested classes and reorder methods 2020-03-13 12:59:30 +09:00
Andrei Zavatski
e46c070d95 Add test scene 2020-03-11 23:09:29 +03:00
Dan Balasescu
42bc8bc50d
Merge pull request #8199 from peppy/add-banana-scale-rotate
Add random rotation and scale factors to osu!catch bananas
2020-03-11 16:31:18 +09:00
Dan Balasescu
03c8140d3c
Merge branch 'master' into add-catcher-animation-states 2020-03-11 14:53:14 +09:00
Dan Balasescu
affb227b38
Merge pull request #8200 from peppy/add-hyperdash-afterimage
Add afterimage glow when entering hyperdash
2020-03-11 13:56:19 +09:00
Dan Balasescu
460f564b2b
Merge branch 'master' into add-hyperdash-afterimage 2020-03-11 12:58:24 +09:00
Dan Balasescu
ba98155832
Merge branch 'master' into fix-hyperdash-test 2020-03-11 12:56:40 +09:00
smoogipoo
9683c0756d Start path at (0,0) 2020-03-11 12:56:12 +09:00
Dean Herbert
0be423183d Rename data class 2020-03-11 00:36:56 +09:00
Dean Herbert
66a0f3334d
Merge branch 'master' into fix-perfect-judgements 2020-03-10 23:50:57 +09:00
Dean Herbert
5329b222f6 Fix hyperdash test having a zero-length juice stream 2020-03-10 17:49:51 +09:00
Dean Herbert
8ad44952f8 Remove unused usings 2020-03-10 16:47:53 +09:00
Dean Herbert
eab544b49f Add afterimage glow when entering hyperdash 2020-03-10 16:41:08 +09:00
Dean Herbert
2b33594400 Add random rotation and scale factors to osu!catch bananas 2020-03-10 15:59:13 +09:00
Dean Herbert
7069cef9ce Add catcher kiai/fail animation states 2020-03-10 15:28:37 +09:00
Dan Balasescu
a6cf6207aa
Merge pull request #8192 from peppy/fix-hyperdash
Fix hyperdash not initiating correctly when juice streams are present
2020-03-10 14:00:44 +09:00
Dean Herbert
0d18ea1d29 Add animation and fallback catcher support 2020-03-10 12:36:25 +09:00
Dean Herbert
e7f1f0f38b Fix hyperdash not initiating correctly when juice streams are present 2020-03-10 10:21:32 +09:00
Dean Herbert
5b8aaba4a6 Merge branch 'master' into fix-perfect-judgements 2020-03-06 00:18:05 +09:00
Dean Herbert
5200633f9f Centralise TestPlayer implementations as much as possible 2020-03-05 11:25:07 +09:00
smoogipoo
a26ac31c64 Fix test name 2020-03-03 15:33:54 +09:00
smoogipoo
d11d29c1f7 Adjust namespaces 2020-03-03 15:30:53 +09:00
smoogipoo
6d939e9d41 Add failing test scenes 2020-03-02 12:42:48 +09:00
smoogipoo
239cfddcbb Improve test scenes/cases 2020-03-02 10:50:41 +09:00
smoogipoo
a02c5710ac Rename base class 2020-03-02 10:06:49 +09:00
voidedWarranties
089ec4c792 Test scene for mod development 2020-02-29 21:16:28 -08:00
Dean Herbert
83495eb648 Add testing support for hyperdash fruits 2020-02-26 19:22:31 +09:00
Bartłomiej Dach
88ec31c262 Add tests demonstrating crash 2020-02-25 22:48:47 +01:00
Dean Herbert
a55b2b8918 Add explosion effect when catching fruit 2020-02-21 18:09:50 +09:00
Dean Herbert
9344f62cf0 Merge branch 'master' into catch-droplet-rotation 2020-02-21 11:09:02 +09:00
Dean Herbert
d275bc8a61 Add test steps for droplet / tiny droplet 2020-02-21 10:44:48 +09:00
Dean Herbert
a7e3e8ace9 Merge branch 'master' into catch-drawable-namespace 2020-02-21 10:31:31 +09:00
Dean Herbert
f593bc8d9e Merge branch 'combo-colour-independence' into catch-fruit-skinning 2020-02-20 15:31:43 +09:00
Dean Herbert
907c1b3d1c Add missing test banana resources 2020-02-20 10:48:12 +09:00
Dean Herbert
ea0bbd2926 Rename drawable namespace to avoid clashes with framework class 2020-02-19 18:01:59 +09:00
Dean Herbert
14ebcc95fb Fix test scene dynamic compilation 2020-02-19 16:33:49 +09:00
Dean Herbert
ea6772ce04 Update TestSceneFruitObjects to use SkinnableTestScene 2020-02-17 17:19:46 +09:00
Dean Herbert
0325f30e01 Fix TestSceneFruitObjects not displaying all representations 2020-02-17 17:19:46 +09:00
Dean Herbert
c68309ac4f Update TestSceneCatcherArea to use SkinnableTestScene 2020-02-17 17:19:46 +09:00
Dean Herbert
a3e0f84fcc Update catcher test to use SkinnableTestScene 2020-02-17 17:19:46 +09:00
dependabot-preview[bot]
48781e5685 Bump Microsoft.NET.Test.Sdk from 16.4.0 to 16.5.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.4.0 to 16.5.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.4.0...v16.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 08:24:12 +00:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
smoogipoo
2688a855a0 Downgrade NUnit to fix discovery issues 2020-01-08 14:14:46 +09:00
dependabot-preview[bot]
f91637e7b6
Bump NUnit3TestAdapter from 3.15.1 to 3.16.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.1 to 3.16.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15.1...V3.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06 07:41:37 +00:00
Dean Herbert
492a910671 Update missed launch configurations 2019-12-20 19:08:05 +09:00
Huo Yaoyuan
351e826120 Upgrade project targets to netcoreapp3.1 2019-12-20 17:03:54 +08:00
Dean Herbert
bc31146560 Mods -> SelectedMods 2019-12-13 21:45:38 +09:00
Dean Herbert
7033974733 Fix test regressions (incorrect from the start) 2019-12-13 20:13:32 +09:00
smoogipoo
5861eca80d Make DrawableRuleset take a converted beatmap 2019-12-12 15:58:11 +09:00
Dean Herbert
45514ff660 Apply fixes 2019-11-25 11:30:55 +09:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
dependabot-preview[bot]
f2084df0bb
Bump Microsoft.NET.Test.Sdk from 16.3.0 to 16.4.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.3.0 to 16.4.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.3...v16.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 06:19:49 +00:00
Dean Herbert
e987db37ec Add grouping of ControlPoints 2019-10-25 19:52:02 +09:00
Dean Herbert
5d6648d9c9 Update 2.2 references 2019-10-10 17:45:38 +09:00
dependabot-preview[bot]
f10b390ca0
Bump Microsoft.NET.Test.Sdk from 16.2.0 to 16.3.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.2.0 to 16.3.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.2.0...v16.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-19 16:32:39 +00:00
Bartłomiej Dach
a407e267a2 Fix PF/SD legacy mod conversion
Upon investigating an user report in #6091 that indicated that viewing
replays using the Perfect mod would also display the Sudden Death mod
icon despite Perfect being the more restrictive of the two, it turned
out that the logic of importing legacy scores was missing that corner
case. A similar case of Double Time/Nightcore mutual exclusion was
handled, but PF/SD was missed.

Add analogous handling of PF/SD legacy mods for all four rulesets,
and additionally cover a tiny fraction of all cases with unit tests.
The most problematic cases (NC+HD and PF+SD) are covered in all four
basic rulesets.
2019-09-15 22:55:25 +02:00
Dean Herbert
a6420def99 Make hyperdash test automatic 2019-09-13 19:29:49 +09:00
Dean Herbert
c0bcbfd892 Merge branch 'master'
Conflicts:
	osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
2019-09-05 14:40:30 +09:00
Dean Herbert
40c61894ef Update some case sensitive resources lookups in-line with resources 2019-09-04 10:44:24 +09:00
Dean Herbert
bebc3309ce Refactor skin configuration to be infinitely extensible 2019-09-03 17:57:34 +09:00
Dean Herbert
0261456d5a
Merge branch 'master' into play-to-gameplay 2019-09-03 11:42:15 +09:00
Dean Herbert
f9fcf1562f Merge remote-tracking branch 'upstream/master' into iskincomponent 2019-09-02 14:21:02 +09:00
dependabot-preview[bot]
2876588193
Bump NUnit3TestAdapter from 3.15.0 to 3.15.1
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.0 to 3.15.1.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15...V3.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 13:36:31 +00:00
Dean Herbert
70e417533f Update naming 2019-08-30 15:13:29 +09:00
Dean Herbert
a15828ab25 Introduce the concept of SkinComponents
Removes reliance on string lookups and better defines elements for introduction into database
2019-08-30 14:55:52 +09:00