1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 17:57:38 +08:00
Commit Graph

196 Commits

Author SHA1 Message Date
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
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