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

475 Commits

Author SHA1 Message Date
Dean Herbert
fecf92e16f Update libraries to latest versions 2022-05-11 19:54:59 +09:00
Dean Herbert
c7e9bd7751
Merge branch 'master' into catch-editor-per-object-sv 2022-05-09 19:18:01 +09:00
ekrctb
158f134260 Fix duration is negative while placing banana shower in catch editor.
Timeline blueprint is glitched when the hit object has negative duration.
Negative duration is unwanted anyways so placement implementation is fixed instead of supporting it in timline blueprint.
2022-05-09 00:01:05 +09:00
ekrctb
d8a4f9d37d Update juice stream blueprint tests
No "clipping" occur anymore for vertex positions. Instead, clipping may occur when the path is converted to a slider.
Add tests for automatic slider velocity change.
2022-05-08 22:36:33 +09:00
ekrctb
4e0155fa4b Make JuiceStreamPath time based instead of distance based.
And remove the "slope limit" feature.
TODO: for a juice stream with a large slope, the slider velocity of the hit object should be changed.
2022-05-08 22:36:33 +09:00
Huo Yaoyuan
5513710b2e Fix IDE0055 2022-05-03 13:09:19 +08:00
Dan Balasescu
32e55e7d78 Merge branch 'master' into osu-diff-calc-max-combo 2022-03-31 15:08:08 +09:00
Dean Herbert
078288a616 Make "skin.ini" the default skin filename and remove redundant parameters 2022-03-23 15:05:01 +09:00
Dean Herbert
7a1909bf97 Change parameter order of LegacySkin to put IStorageResourceProvider first
The optional resource store should not be before the (basically)
required resource provider.
2022-03-23 15:02:04 +09:00
Dan Balasescu
3fff7f4b7e Require ScoreProcessor to receive ruleset 2022-03-14 15:51:10 +09:00
Shivam
1a7a160f0a Update vscode launch.json files for all other projects 2022-02-25 14:28:54 +01:00
Dan Balasescu
567da9214e Merge branch 'master' into osu-diff-calc-max-combo 2022-02-18 18:35:24 +09:00
Dean Herbert
d79845fb1d Revert NUnit3TestAdaptor (again)
Console output is still broken. See
https://github.com/ppy/osu/runs/5196023462?check_suite_focus=true.
2022-02-15 17:06:34 +09:00
Dean Herbert
60153bb69d Update nuget packages to highest usable versions
EF packages are intentionally pinned to 5.0.14 as higher versions no
longer support `netstandard2.1`, which we require for xamarin projects.
2022-02-15 15:19:23 +09:00
Dean Herbert
176bb4a4e2 Update desktop projects to target .NET 6 2022-02-10 17:42:09 +09:00
Henry Lin
44311c1f4e Add tests for diffcalc max combo 2022-01-23 11:25:22 +08:00
Dan Balasescu
3e5d29ed00
Merge pull request #16505 from peppy/remove-base-difficulty-usage
Remove all usage of `BaseDifficulty` (and access `Difficulty` instead)
2022-01-19 13:53:55 +09:00
Dan Balasescu
f6f44029e8
Merge pull request #16507 from peppy/more-ingore-rules
Add some missing `IgnoredAttributes` to reduce automapper overhead
2022-01-19 12:26:37 +09:00
Dean Herbert
96d07e20ed Revert nunit test adaptor version bump until console output bug is resolved
Tests have started to output too much log content, causing viewing CI
failures to be painfully impossible. Roll back for now.

Fix may be related to
https://github.com/nunit/nunit3-vs-adapter/issues/941, although we don't
use filter.
2022-01-19 02:18:58 +09:00
Dean Herbert
67bf95bc91 Remove all usage of AuthorString 2022-01-18 23:30:40 +09:00
Dean Herbert
7f65f3a47f Remove all usage of BaseDifficulty (and access Difficulty instead) 2022-01-18 22:57:39 +09:00
Dean Herbert
1b62a685f3 Merge branch 'master' into realm-integration/score-and-beatmaps 2022-01-18 15:07:59 +09:00
Dean Herbert
125439d177 Update all (non-NET6) nuget packages 2022-01-18 11:09:26 +09:00
Dean Herbert
b5f670cc5b Add far too many fixes for ruleset non-nullable requirements 2022-01-12 23:24:11 +09:00
Dean Herbert
f9713b8895 Replace usage of TimeoutAttribute to fix beatmap conversion test failures 2022-01-04 11:51:41 +09:00
Joseph Madamba
7de43e3aba Fix most open compound words in identifiers being closed 2021-12-27 20:26:28 -08:00
Dan Balasescu
8a81392d2b Fix use of incorrect variable, add test 2021-12-16 19:26:36 +09:00
Dan Balasescu
5ea081e899 Test hyperdash generation in catch conversion tests 2021-12-16 19:04:42 +09:00
Dean Herbert
f6a3709060 Store default skins to database 2021-11-29 18:28:25 +09:00
Dean Herbert
e0629ba81c Update all dependencies 2021-11-20 13:31:10 +09:00
Dan Balasescu
33294ffda6
Merge branch 'master' into fix-plate-clearing-missing-last-banana 2021-11-19 11:42:57 +09:00
Darius Wattimena
9685892b94 Added an extra unit test when actually catching the last banana to also clear the plate 2021-11-18 20:23:42 +01:00
Darius Wattimena
cfedbb92c1 Added a unit test to cover clearing of the plate when missing the last banana 2021-11-18 20:07:03 +01:00
Dean Herbert
7c2e79f911 Update all simple cases of switching to IWorkingBeatmap 2021-11-17 20:56:57 +09:00
Dean Herbert
fabf253381 Update difficulty calculator tests to also use IWorkingBeatmap 2021-11-15 19:16:49 +09:00
Dean Herbert
369b4ba789 Update DifficultyCalculator to take an IRulesetInfo 2021-11-15 19:16:48 +09:00
ekrctb
dca2cd6c44
Merge branch 'master' into catch-spinner-checks 2021-11-11 11:32:58 +09:00
Bartłomiej Dach
5e3ac5ac9f
Reset combo in test in a less weird way 2021-11-10 12:05:14 +01:00
Semyon Rozhkov
577bdade5b Hide catcher during banana shower 2021-11-10 04:10:05 +03:00
Darius Wattimena
5d8f35f3c9 Code cleanup and added tests for the spinner check 2021-11-10 00:16:29 +01:00
Semyon Rozhkov
64bc8da14c Add "No Scope" mod implementation for Catch 2021-11-09 17:11:19 +03:00
dependabot[bot]
7747fd5810
Bump Microsoft.NET.Test.Sdk from 16.11.0 to 17.0.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.11.0 to 17.0.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.11.0...v17.0.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 17:01:54 +00:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
ekrctb
60df0151c0 Add very basic distance snap grid for catch editor 2021-10-25 15:25:59 +09:00
Dan Balasescu
8884091422
Merge pull request #15014 from joseph-ireland/remove-initial-strain
Change initial strain value in skills from 1 to 0
2021-10-10 15:56:20 +09:00
Joseph Ireland
185bb9c122 change initial strain from 1 to 0 to allow simpler implementations 2021-10-07 09:30:18 +01:00
smoogipoo
ca9c79b758 Use object initialiser (fixes CI inspection) 2021-10-07 16:51:42 +09:00
Dean Herbert
b339c149d8 Copy BaseDifficulty to Beatmap<T> and move all write operations across 2021-10-06 15:10:45 +09:00
Dean Herbert
a92d499d7a Convert usages of BeatmapDifficulty to IBeatmapDifficultyInfo 2021-10-01 16:55:50 +09:00
dependabot[bot]
5a1eccd8e3
Bump Microsoft.NET.Test.Sdk from 16.10.0 to 16.11.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.10.0 to 16.11.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.10.0...v16.11.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-01 18:17:37 +00:00
Dean Herbert
17f6efc6fe Fix missed cases of incorrect .Value usage
Changing from `Bindable` to `Nullable` comes with its issues...
2021-08-26 14:02:57 +09:00
Dean Herbert
6dcd9427ac Remove bindable usage in PathControlPoint
This is quite a breaking change, but I think it is beneficial due to the large amount of usage of this class.

I originally intended just to remove the allocations of the two delegates handling the `Changed` flow internally, but as nothing was really using the bindables for anything more than a general "point has changed" case, this felt like a better direction.
2021-08-26 12:33:53 +09:00
Bartłomiej Dach
a1f50e39aa
Add basic structure for skinning catch explosions 2021-08-11 21:23:32 +02:00
Bartłomiej Dach
637e5cb6b7
Fix offsets not being mirrored 2021-08-10 22:33:28 +02:00
Bartłomiej Dach
30cb4280a4
Add test for catch beatmap mirroring 2021-08-10 22:33:28 +02:00
ekrctb
a960a28d06 Replace "end glow" terminology with "hyper-dash after-image"
Because the is "end glow" is when a hyper-dash is *started*, the name was confusing.
The "after-image" was already used in the code as a synonym of "end glow" inconsistently.
2021-07-28 19:11:22 +09:00
ekrctb
0bf04ece34 Avoid internal property by using ChildrenOfType 2021-07-28 18:13:43 +09:00
ekrctb
da69867fd4 Move catcher trail generation logic to CatcherArea 2021-07-27 19:07:37 +09:00
ekrctb
d9d9db6f62 Revert "Modify catcher autoplay test pattern to see more variety movement"
I found `TestSceneHyperDash` is useful for visual inspection of hyper dash trails.
This reverts commit 0fbe950a
2021-07-27 19:07:37 +09:00
ekrctb
0fbe950a3c Modify catcher autoplay test pattern to see more variety movement 2021-07-26 18:06:30 +09:00
ekrctb
bb046fa3b8 Move catcher trail generation logic to Catcher
It resolves mutual dependency of `Catcher` and `CatcherTrailDisplay`.
Trail generation logic is moved to `Catcher`.
The generation logic no longer uses delayed scheduling because the hidden state is hard to manage.
Instead, the last time a trail is generated is calculated and used.
The new logic has a different behavior when the dash key is pressed in succession under 50ms, but it is not noticeable for normal plays.
2021-07-26 17:51:59 +09:00
ekrctb
b1fd6c0ded Apply changes to tests of juice stream placement 2021-07-23 10:45:33 +09:00
ekrctb
4e9ac5dc7b Add tests of juice stream placement blueprint 2021-07-22 15:47:23 +09:00
Dean Herbert
1d2fdd9841
Merge pull request #13937 from ekrctb/selection-editable-path
Add initial implementation of juice stream path editing
2021-07-22 14:48:02 +09:00
ekrctb
179ba3c9a8 Merge branch 'master' into catcher-area-catcher
# Conflicts:
#	osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
2021-07-21 16:45:28 +09:00
ekrctb
94678064ff Rename CatcherArea.MovableCatcher to Catcher 2021-07-21 16:28:31 +09:00
ekrctb
da3499f10e Simplify the way of getting catcher 2021-07-21 16:27:44 +09:00
Dean Herbert
6cc81c24b4
Merge pull request #13785 from ekrctb/dependency-providing-container
Add a convenient way to provide ad-hoc dependency to children in visual test
2021-07-20 14:18:17 +09:00
ekrctb
9db5847344 Add test that a slider path is resampled when the path is edited 2021-07-19 22:53:32 +09:00
ekrctb
8586458704 Implement vertex deletion in juice stream selection blueprint 2021-07-19 22:53:32 +09:00
ekrctb
08f8d4e65e Implement vertex addition in juice stream selection blueprint 2021-07-19 22:53:32 +09:00
ekrctb
01f5258a26 Add tests of juice stream selection blueprint 2021-07-19 22:53:32 +09:00
ekrctb
b88ee3c1a1 Pass DroppedObjectContainer via constructor instead of DI
It is now just one level deep, so it is not beneficial to use DI here.
This effectively reverts ae09c23e.
2021-07-19 20:11:49 +09:00
ekrctb
50f9e5f362 Replace usage of CatcherArea.MovableCatcher with Catcher 2021-07-19 19:52:40 +09:00
ekrctb
97059a9f50 Create Catcher in CatchPlayfield 2021-07-19 19:44:40 +09:00
ekrctb
87c39909c6 Simplify DependencyProvidingContainer
Using an array of tuple for dependencies instead of using children.
2021-07-19 14:37:19 +09:00
ekrctb
fffe0d2e57 Add tests of JuiceStreamPath.
"Property testing" is heavily used, tests that generates random cases and asserting properties.
That gives high confidence of round-trip correctness of `SliderPath` conversion, for example.
2021-07-19 13:59:10 +09:00
ekrctb
25b94061fd Fix assert step not waiting for transformation 2021-07-08 16:40:18 +09:00
ekrctb
8ac3015f14 Add tests of banana shower placement blueprint 2021-07-08 16:36:44 +09:00
ekrctb
68116aa042 Fix placement blueprint animation is not running in test scene 2021-07-08 16:17:09 +09:00
ekrctb
ae67409f41 Add a test of fruit placement blueprint 2021-07-08 16:12:08 +09:00
ekrctb
8da1335e5f Add catch placement blueprint visual test scenes (without tests) 2021-07-08 15:51:46 +09:00
ekrctb
bd4b3f5268 Add catch selection blueprint visual test scene (without tests) 2021-07-08 15:42:29 +09:00
PercyDan54
e1c646b9b2
Remove redundant arguments 2021-07-05 23:52:39 +08:00
Dean Herbert
01961fe4f9
Merge pull request #13747 from ekrctb/catcher-flip
Don't flip catcher plate contents when catcher changes direction
2021-07-06 00:02:23 +09:00
ekrctb
5a0a223b1b Use DependencyProvidingContainer in TestSceneCatcher 2021-07-05 19:07:48 +09:00
ekrctb
623ba15919 Relax caught object stacking test
The stacking code currently uses an unseeded RNG and there is a non-zero chance the stack will be very flat (small Y position difference).
Technically, `RNG.NextSingle(0, 5)` can return `0`, but extremely unlikely that the all RNG calls return 0.
2021-07-04 10:23:49 +09:00
ekrctb
333caca386 Add test for catcher plate flipping configuration 2021-07-02 23:23:23 +09:00
ekrctb
170513568b Move caught object stack vertical offset logic 2021-07-02 20:43:47 +09:00
dependabot[bot]
0d3de488de
Bump NUnit3TestAdapter from 3.17.0 to 4.0.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.17.0 to 4.0.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.17...V4.0.0)

---
updated-dependencies:
- dependency-name: NUnit3TestAdapter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-01 17:02:17 +00:00
ekrctb
ae09c23e4e Resolve DroppedObjectContainer via DI 2021-06-24 16:09:13 +09:00
ekrctb
16d5893535 Add DroppedObjectContainer class 2021-06-24 15:51:54 +09:00
ekrctb
fbe44dac34 Add empty catch hit object composer 2021-06-22 17:20:13 +09:00
ekrctb
67d8e0059f Use singular IApplicableToDrawableHitObject for consumers 2021-06-16 18:47:04 +09:00
Dean Herbert
33aec57238 Replace 1.0 version in old skin test assets with none 2021-06-11 15:45:34 +09:00
ekrctb
8d0840020b Specify legacy skin version of old-skin testing skin
Old-style catcher sprite is not supported for all versions
2021-06-11 15:33:13 +09:00
Dean Herbert
e388a896e8 Don't apply visibility increase to first object in osu!catch
The goal of the visibility increase is to help in cases where timing is
an issue (by showing the approach circle etc.). This doesn't need to
apply to catch.

@smoogipoo interested as to whether you agree with this one. Visually it
looks better to me but it does change the behaviour for only osu!catch,
so I'm not 100% confident on it.

Closes #13367.
2021-06-08 16:02:26 +09:00
ekrctb
181f1da3d3 Maintain catch hit explosion by lifetime entries
- Fix hit explosion not showing when a replay is rewound to a time after a hit object is caught
2021-06-04 19:46:50 +09:00
Dean Herbert
5366e7f61e
Merge branch 'master' into remove-hud-component-lookup 2021-06-02 16:10:06 +09:00
Dean Herbert
f8ae70e562 Update existing function type rather than adding an override 2021-06-02 16:04:53 +09:00