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

302 Commits

Author SHA1 Message Date
ekrctb
5e36fb322a Move fruit visual logic from CHO to DrawableFruit 2020-11-27 11:08:32 +09:00
ekrctb
047a02b863
Merge branch 'master' into palpable-catch-hit-object 2020-11-26 14:35:27 +09:00
ekrctb
9131546876 Workaround TestSceneCatchModRelax failure 2020-11-26 13:04:19 +09:00
ekrctb
ab7251d742 Move members to PalpableCatchHitObject 2020-11-24 19:57:37 +09:00
Roman Kapustin
3b600f0a7b Target net5.0 instead of netcoreapp3 2020-11-20 10:45:19 +03:00
ekrctb
c360533e4c Simplify code of TestSceneFruitObjects 2020-11-17 23:40:30 +09:00
ekrctb
eebce1f914 Fix TestSceneFruitObjects 2020-11-17 18:13:32 +09:00
ekrctb
a53b5ef8b9 Remove --no-restore from VSCode build tasks 2020-11-16 19:22:08 +09:00
Bartłomiej Dach
f9fa7c86ea Cover mapping fully for catch mods 2020-11-15 14:53:25 +01:00
Bartłomiej Dach
9899687bfe Rename existing method to allow for new one 2020-11-15 14:17:41 +01:00
kamp
ceb17764b1 Also replace / with - for args in other task.jsons 2020-11-07 01:09:21 +01:00
Dean Herbert
a50ca0a1ed Fix osu!catch test failures due to trying to retrieve container too early 2020-10-19 20:00:17 +09:00
smoogipoo
f439c1afbc Make osu/taiko/catch use Ok+Great 2020-09-29 17:16:55 +09:00
smoogipoo
4ef7ab2872 Fix tests 2020-09-29 16:33:38 +09:00
Salman Ahmed
bfe332909c Remove "hide combo counter on break time" feature for being too complex
The combo counter will be hidden at most one second after the break has started anyways, so why not just remove this feature if the way of implementing it is complicated to be merged within the legacy counter implementation.
2020-09-21 14:32:14 +03:00
Dan Balasescu
0761aab42f
Merge branch 'master' into catch-combo-counter 2020-09-15 17:20:31 +09:00
Bartłomiej Dach
fcf3a1d13c Encapsulate combo display better 2020-09-12 22:40:34 +02:00
smoogipoo
679dc34aa4 Add test timeouts 2020-09-07 17:18:54 +09:00
dependabot-preview[bot]
66c0d12da6
Bump Microsoft.NET.Test.Sdk from 16.7.0 to 16.7.1
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.0 to 16.7.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.7.0...v16.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-01 17:19:46 +00:00
Salman Ahmed
a0a4501008 Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-09-01 20:17:25 +03:00
Dean Herbert
997ea2f27e
Merge pull request #9932 from smoogipoo/hyperdash-full-catch-width
Use full catcher width for hyperdash calculation
2020-08-24 16:44:35 +09:00
Dean Herbert
c03cc754e3 Move event attaching to ensure reporting is done at a high enough rate 2020-08-24 11:38:03 +09:00
Bartłomiej Dach
3d68f30467 Fix code style issues 2020-08-23 21:52:50 +02:00
Orosfai I. Zsolt
a8a7d9af29 Add testcase to osu!catch relax mod 2020-08-23 21:35:15 +02:00
Bartłomiej Dach
68a043a070 Add test case covering regression 2020-08-23 18:04:57 +02:00
Dean Herbert
d274652b3a Fix failures if test ran too fast 2020-08-24 00:13:26 +09:00
Dean Herbert
2dce850f5b Rewrite hyperdash test to not rely on timing 2020-08-23 23:11:56 +09:00
Salman Ahmed
cf6b34db1e Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-08-22 13:07:28 +03:00
smoogipoo
855b5ba4ed Merge branch 'master' into add-droplet-hypers 2020-08-21 13:09:16 +09:00
Dean Herbert
f0ba587515
Merge branch 'master' into fix-catch-double-sample 2020-08-21 12:38:29 +09:00
smoogipoo
dd1f2db175 Use startTime in test 2020-08-21 12:30:33 +09:00
smoogipoo
f956c9fe37 Clobber in a gameplay test 2020-08-21 02:01:29 +09:00
Bartłomiej Dach
35ff25940b Add sample playback to juice stream test scene 2020-08-20 18:16:32 +02:00
smoogipoo
725caa9382 Add visual test for hyperdash droplets 2020-08-20 23:33:32 +09:00
smoogipoo
a193fb7907 Fix test not working for droplets/tinydroplets 2020-08-20 23:15:30 +09:00
smoogipoo
c89509aca0 Fix right bound not being applied correctly 2020-08-20 20:25:40 +09:00
Salman Ahmed
deb5cc752b Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-08-19 08:39:58 +03:00
Salman Ahmed
dde0bc6070 Add step to randomize judged object's combo colour 2020-08-19 08:29:42 +03:00
Salman Ahmed
a59dabca7e Use existing hit objects instead of defining own 2020-08-19 08:28:11 +03:00
dependabot-preview[bot]
d7de8b2916
Bump Microsoft.NET.Test.Sdk from 16.6.1 to 16.7.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.6.1 to 16.7.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.6.1...v16.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-10 17:17:07 +00:00
Salman Ahmed
5cd2841080 Add test scene showing off the skinnable catch-specific combo counter 2020-08-03 22:17:42 +03:00
Salman Ahmed
f5af81d775 Add legacy combo font glyphs to legacy skins of test purposes 2020-08-03 21:41:22 +03:00
Dean Herbert
c1442568b9 Make perfect mod ignore all non-combo-affecting hitobjects 2020-07-21 17:04:45 +09:00
Dean Herbert
02678c04d5
Merge pull request #9556 from gagahpangeran/toggle-hit-lighting-catch 2020-07-17 17:06:40 +09:00
Bartłomiej Dach
a8e96b3994 Reword test steps for consistency & fix typo 2020-07-16 20:17:37 +02:00
Bartłomiej Dach
fbf3a09835 Create catcher explicitly to make tests independent of ctor 2020-07-16 20:14:57 +02:00
Bartłomiej Dach
54b0321581 Factor out catcher as property 2020-07-16 20:12:32 +02:00
Bartłomiej Dach
f72a6b8c9d Use [Resolved] instead 2020-07-16 20:08:48 +02:00
Gagah Pangeran
545e4a1f66 fix formatting 2020-07-16 15:32:07 +07:00
Gagah Pangeran
7021459c75 add hit lighting test in test scene catcher area 2020-07-16 15:25:07 +07:00
Gagah Pangeran
16d429d2b6 Delete test hitlighting 2020-07-16 15:24:03 +07:00
Gagah Pangeran
8e4f854145 initial test hit lighting catch 2020-07-15 16:34:13 +07:00
smoogipoo
f13bde68e6 Add test for catch hidden mod 2020-07-15 16:53:36 +09:00
dependabot-preview[bot]
8087a75c35
Bump NUnit3TestAdapter from 3.15.1 to 3.17.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.1 to 3.17.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15.1...V3.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-13 17:22:39 +00:00
ekrctb
3278a1d7d8 Standardize osu!catch coordinate system
There were two coordinate systems used:
- 0..512 (used in osu!stable)
- 0..1 (relative coordinate)

This commit replaces the usage of
the relative coordinate system to
the coordinate system of 0..512.
2020-07-02 00:21:45 +09:00
Bartłomiej Dach
1bc5f36184 Adjust test usage 2020-06-21 23:06:55 +02:00
Salman Ahmed
11da045d8c
Reorder declaration position of ruleset-creation methods
Should be recognized as a normal protected method in its declaring class.
2020-06-03 23:43:18 +03:00
Salman Ahmed
84b40ea2c6
Merge remote-tracking branch 'upstream/master' into test-scene-create-ruleset
# Conflicts:
#	osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
#	osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
#	osu.Game/Tests/Visual/ModTestScene.cs
#	osu.Game/Tests/Visual/OsuTestScene.cs
2020-06-03 22:00:02 +03:00
smoogipoo
648999a2de Remove all RequiredTypes usages 2020-05-16 18:17:12 +09:00
Salman Ahmed
ff6642190f
Update colour retrieval logic 2020-05-14 07:26:47 +03:00
Salman Ahmed
b161aa72b7
Merge remote-tracking branch 'upstream/master' into catch-legacy-skin-decoding 2020-05-14 07:22:01 +03:00
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