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

176 Commits

Author SHA1 Message Date
Dean Herbert
414c40d298 Reverse inheritance order of SkinnableSound's pause logic 2020-09-30 15:45:14 +09:00
smoogipoo
f439c1afbc Make osu/taiko/catch use Ok+Great 2020-09-29 17:16:55 +09:00
Dean Herbert
5d1c377379 Fix HitObject samples getting stuck in a playing state on seeking far into the future 2020-09-29 15:07:55 +09:00
Dean Herbert
d6f3beffb6 Use existing bindable flow instead 2020-09-29 12:50:17 +09:00
Bartłomiej Dach
5f35b3ebb9 Fix constant casing 2020-08-15 20:44:02 +02:00
Ron B
390e872730
Fix acoording to review 2020-08-15 21:34:17 +03:00
Ron B
a1079bac32
Move frequency values into consts 2020-08-15 21:19:47 +03:00
Ron B
40445d0005
replicate osu-stable behaviour for spinningSample frequency 2020-08-15 21:07:44 +03:00
Ron B
07c25d5a78
Move spinnerFrequencyModulate set to ApplySkin 2020-08-15 20:51:33 +03:00
Ron B
5c11270b98
Add SpinnerFrequencyModulate skin config option 2020-08-15 20:12:06 +03:00
Dean Herbert
05b06e7451
Merge branch 'master' into fix-skinnable-sound-mute 2020-08-12 22:01:04 +09:00
Bartłomiej Dach
cca78235d5 Replace CumulativeRotation with RateAdjustedRotation 2020-08-10 23:02:06 +02:00
Dean Herbert
365aae799e
Merge branch 'master' into fix-skinnable-sound-mute 2020-08-10 23:55:51 +09:00
Dean Herbert
e3105fd4c8 Add more resilient logic for whether to avoid playing SkinnableSound on no volume 2020-08-06 19:16:26 +09:00
smoogipoo
9a00ad48c6 Update components to use extension methods 2020-08-06 14:43:39 +09:00
Dean Herbert
bb73489ae5 Fix very short spinners being impossible to complete 2020-08-05 18:46:58 +09:00
Dean Herbert
38a4bdf068 Add spinner spin sample support 2020-07-30 19:34:59 +09:00
Dean Herbert
c1085d49d3 Add more xmldoc 2020-07-30 12:55:34 +09:00
Dean Herbert
54fee7e716 Simplify and standardise scale for default display 2020-07-30 11:50:13 +09:00
Dean Herbert
2b71ffa2ed Add back legacy implementations 2020-07-29 22:32:21 +09:00
Dean Herbert
023feaf438 Refactor to centralise implementation into a single component
Turns out this is a better way forward.
2020-07-29 22:31:52 +09:00
Dean Herbert
2a5e9fed4d Move default background implementation out of DrawableSpinner 2020-07-29 18:15:19 +09:00
Dean Herbert
2cd6e89cb0 Move default centre implementation out of DrawableSpinner 2020-07-29 18:02:12 +09:00
Dean Herbert
1c00cf95d5 Add initial support for spinner middle skinning 2020-07-29 16:55:47 +09:00
Dean Herbert
e98154b432 Add initial support for spinner background layer 2020-07-29 16:37:32 +09:00
Dean Herbert
d01d1ce3f1 Add initial support for spinner disc skinning 2020-07-29 16:25:10 +09:00
Dean Herbert
1560e1786a Revert back to bool for application 2020-07-21 19:48:44 +09:00
Dean Herbert
7f2ae694cc Simplify rewind handling 2020-07-21 19:21:30 +09:00
Dean Herbert
947f4e0d4c Move tick handling to DrawableSpinner itself 2020-07-21 19:20:19 +09:00
Dean Herbert
05102bc1ba Split ticks up into bonus and non-bonus 2020-07-21 18:22:37 +09:00
Dean Herbert
4dd40542d5 Rename rotation set method to match others 2020-07-21 11:31:29 +09:00
Dean Herbert
35d53139e7 Merge branch 'master' into add-spinner-bonus-score 2020-07-21 11:21:17 +09:00
Dean Herbert
e06d3c5812 Minor adjustments to tick clearance 2020-07-20 17:52:59 +09:00
Dean Herbert
4cbc176cb6 Add less fill and more transparency 2020-07-20 17:50:11 +09:00
Dean Herbert
33e58bb7db Fix sizing and colour not correct on hit 2020-07-20 17:22:30 +09:00
Dean Herbert
55d921ef85 Improve feel of animation 2020-07-20 17:22:30 +09:00
Dean Herbert
efb2c2f4ae Rename variable to be more clear on purpose 2020-07-09 12:01:00 +09:00
Bartłomiej Dach
213dfac344 Fix broken spinner rotation logic 2020-07-08 22:37:50 +02:00
Bartłomiej Dach
d229993e5c Use RotationAbsolute instead 2020-07-05 02:12:26 +02:00
Bartłomiej Dach
cd6bdcdb88 Replace further spinner transforms with manual lerp 2020-07-05 00:25:01 +02:00
Dean Herbert
d1b01095ee Rewrite to reduce code changes and complexities in hit object implementation 2020-03-29 14:31:03 +09:00
Dean Herbert
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
Salman Ahmed
b7565f5943 Remove unnecessary using directive 2019-12-25 05:36:58 +03:00
Salman Ahmed
949ab4e0d3 Move spinner bonus scoring to it's own component class
Also fixes counter rewinding issue and does optimizations.
2019-12-25 05:34:12 +03:00
Dean Herbert
419656cea4
Merge branch 'master' into add-spinner-bonus-score 2019-12-20 19:55:53 +09:00
Salman Ahmed
cbfbbf9999 Make SpmCounter public 2019-12-18 03:04:37 +03:00
Salman Ahmed
10e1e512fd Update the nested hitobject logic inline with new implementation 2019-12-12 15:15:16 +03:00
Dean Herbert
06352a95be Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score 2019-12-11 20:02:51 +09:00
Berkan Diler
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
iiSaLMaN
a75ae14cb2 Use foreach loop to avoid too long lines 2019-10-14 00:40:36 +03:00
iiSaLMaN
c8593f1215 Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score 2019-10-13 23:04:05 +03:00
smoogipoo
5c2c055614 Set lifetime on initial state update 2019-09-13 18:49:21 +09:00
Dean Herbert
f21e47d6d2 Move expire to DrawableHitObject 2019-09-12 19:29:08 +09:00
iiSaLMaN
33f4a6897c Assign to the text property directly 2019-09-07 18:01:15 +03:00
iiSaLMaN
87d10c6a32 Merge remote-tracking branch 'upstream/master' into add-spinner-bonus-score 2019-09-07 14:50:23 +03:00
Dean Herbert
f925e781a9 Refactor HitWindows for legibility 2019-09-06 15:24:14 +09:00
iiSaLMaN
e4179fe440 Show bonus text if contains bonus points (1,000) 2019-08-20 21:51:32 +03:00
iiSaLMaN
07795c9922 Add logic to gain bonus score from spinner ticks 2019-08-20 21:50:49 +03:00
Dean Herbert
be170b4124 Naming and documentation improvements 2019-07-22 15:50:02 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +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
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo
52bc47499f Fix spinners not having proper lifetimes 2018-11-29 12:11:45 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo
cc8531790a Use bindables for hitobject events 2018-11-09 13:58:46 +09:00
smoogipoo
af1de01ed6 Add a spinner selection mask 2018-10-29 18:23:23 +09:00
smoogipoo
741ec0021e Rename more judgement-related methods to "result" 2018-08-06 11:31:46 +09:00
smoogipoo
2a4994e5ce Make hitobjects only have one judgement + result 2018-08-03 15:38:48 +09:00
smoogipoo
4548d2c87f Make Rulesets.Osu use the new judgement result structure 2018-08-02 20:36:38 +09:00
smoogipoo
462f1033c0 Migrate Rulesets.Osu to the new judgement system 2018-08-02 15:21:23 +09:00
Dean Herbert
1d6609d9f3 Add common custom words to dotsettings dictionary
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
smoogipoo
0dce7a5b61 Update framework + fix CI errors 2018-04-20 18:19:17 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
a42035f494 Make DrawableHitObject a CompositeDrawable
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Dean Herbert
d0881e443b Merge remote-tracking branch 'upstream/master' into approach-rate 2018-01-12 18:05:16 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Shawdooow
94f81a1784 fix 2018-01-03 10:04:36 -05:00
Shawdooow
9122eaa28e
Merge branch 'master' into approach-rate 2018-01-03 10:02:55 -05:00
Aergwyn
481a16b491 extended hitobject tests 2018-01-01 11:55:30 +01:00
Shawdooow
064758b96d fixes 2017-12-31 11:30:58 -05:00
Shawdooow
3ba5dce052 new Approach to approach rate 2017-12-31 11:15:14 -05:00
Aergwyn
ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
Aergwyn
07040f9fd1 rename field 2017-12-29 17:52:28 +01:00
Aergwyn
0b23ceb781 fix slider fade out to be eased
+ move duration calculation to not be done twice
+ made Slider / Spinner private again as they are not accessed externally anymore
2017-12-28 15:36:27 +01:00
Aergwyn
e42fa7205b adjust spinner sequence to the new fadeout speed 2017-12-27 21:23:56 +01:00
Aergwyn
4c2554595e implement hidden (mostly)
some things work and others don't, I dunno
2017-12-26 17:25:18 +01:00
Dean Herbert
e76961a932 Remove unnecessary bool 2017-10-11 11:23:02 +09:00
Huo Yaoyuan
09093013a7 Move spm calculation into counter. 2017-10-07 15:58:53 +08:00
Huo Yaoyuan
a876ab9b90 Move spm counter to a seperated control. 2017-10-07 15:31:42 +08:00
Huo Yaoyuan
ee8746b848 Fade in spm texts. 2017-10-05 20:07:33 +08:00
Huo Yaoyuan
24187cc53a Move spm text out of scaled parts. 2017-10-05 19:55:20 +08:00
Huo Yaoyuan
3de42ee405 Smooth spm values into a time range. 2017-09-30 15:23:10 +08:00
Huo Yaoyuan
e2e26c91af Show SPM value basically. 2017-09-29 22:30:41 +08:00
smoogipooo
ac8ec31b61 Make judgements able to be "added" plus make everything compile and run. 2017-09-06 17:02:13 +09:00