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

1626 Commits

Author SHA1 Message Date
Dean Herbert
9c1badd2e3 Fix rulesets not matching in dictionary lookups due to missing GetHashCode implementation 2019-07-15 15:42:54 +09:00
Dean Herbert
80ddfc3b1e Disable frame accurate replay playback
I want to prioritise better playback performance over accuracy for now. Also, in my testing this is still 100% accurate due to the addition of the FrameStabilityContainer, which is pretty cool.
2019-07-10 10:27:51 +09:00
Dean Herbert
84919d70bb Health bar -> Health display
Also inverts logic
2019-07-07 05:30:30 +09:00
Salman Ahmed
1f13b94c72
Fix build error 2019-07-06 18:44:55 +03:00
Salman Ahmed
a42c79895d
Remove unnecessary private field 2019-07-06 18:38:41 +03:00
Salman Ahmed
dfabed3d85
Merge branch 'master' into applicable-to-hud 2019-07-06 16:30:02 +03:00
iiSaLMaN
530e07110f Use a descriptive name for the setting 2019-07-06 06:32:25 +03:00
smoogipoo
5862eb172a Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders
# Conflicts:
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2019-07-05 15:48:04 +09:30
Dean Herbert
8120bb36bc More methods 2019-07-03 18:42:10 +09:00
Dean Herbert
06ef8f71e9 Fix typo 2019-07-03 18:41:01 +09:00
Dean Herbert
62dd89197c Refactor comment slightly 2019-07-03 18:36:04 +09:00
miterosan
5ecb764cdc Remove whitespaces and lowercase the comments 2019-07-03 10:57:09 +02:00
miterosan
43d7f66c5b Add comment about the android ruleset situation. 2019-07-03 10:54:10 +02:00
miterosan
ab244d1b7f Only log that the rulesets could not be loaded from a directory. 2019-07-03 10:21:18 +02:00
miterosan
d9e646d9ef Use addRuleset inside loadRulesetFromFile 2019-07-03 09:51:09 +02:00
Salman Ahmed
98daaf634a Simplify changes 2019-07-03 06:44:17 +03:00
Salman Ahmed
3f39541cc2 Fade health bar on value change 2019-07-03 05:11:11 +03:00
miterosan
f1ceea8361 style fixes 2019-07-02 17:25:12 +02:00
miterosan
778c36c7d7 Allow discover of rulesets that are already loaded. 2019-07-02 17:05:04 +02:00
Salman Ahmed
744e651a37
Merge branch 'master' into applicable-to-hud 2019-07-02 05:24:56 +03:00
Salman Ahmed
a8e8650ddd Move blocking fail logic into a base class 2019-07-02 01:47:39 +03:00
Dean Herbert
60ea3d4e1a Fix skinning support for combobreak 2019-06-30 21:58:30 +09:00
iiSaLMaN
41597efdf7 Hide health bar in no fail 2019-06-29 04:25:52 +03:00
iiSaLMaN
d37cefbad8 Implement IApplicableToHUD 2019-06-29 04:23:59 +03:00
smoogipoo
a6ee83eac2 Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders 2019-06-27 19:57:21 +09:00
Dean Herbert
ba48331fcb Remove no longer necessary HandleInput overrides 2019-06-27 18:34:59 +09:00
smoogipoo
6ce86e6083 General refactoring 2019-06-26 17:52:25 +09:00
Andrei Zavatski
4a05c560cf Remove unwanted class and move the bind logic outside the RulesetSelector 2019-06-24 23:13:28 +03:00
Andrei Zavatski
35db20a337 Remove useless bindable check 2019-06-24 02:01:00 +03:00
Andrei Zavatski
60ff497add Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-24 01:06:54 +03:00
David Zhao
de59e038ac Prevent non-combo affecting judgements from triggering sudden death 2019-06-21 14:29:16 +09:00
Andrei Zavatski
413c2158e2 Simplify bindables usage 2019-06-18 01:11:05 +03:00
Andrei Zavatski
c95e3da3ec Implement a BindableRulesetSelector 2019-06-18 00:23:00 +03:00
Andrei Zavatski
cecbcd21b2 Merge remote-tracking branch 'upstream/master' into toolbar-rulesets-refactor 2019-06-17 23:12:55 +03:00
smoogipoo
2e7922c3f9 Fix 0-length sliders not getting correct lengths 2019-06-15 23:53:28 +09:00
Dean Herbert
cf713fbacc
Merge branch 'master' into fix-stacking-shaking 2019-06-14 22:16:35 +09:00
smoogipoo
4818187d8f Reset result timeoffset to 0 when rewound 2019-06-13 14:55:52 +09:00
smoogipoo
27fdda8b91 Don't update hitobject results when rewinding 2019-06-13 12:21:49 +09:00
EVAST9919
e5a6d920cd Implement an abstract RulesetSelector class 2019-06-12 23:23:01 +03:00
Dean Herbert
00ee45fe46 Merge remote-tracking branch 'origin/update-visibility-container' into update-framework 2019-06-11 19:36:13 +09:00
Dean Herbert
5c2c4f0ada
Merge pull request #4878 from HoLLy-HaCKeR/expose-skills
Expose skills in DifficultyAttributes
2019-06-11 18:47:56 +09:00
Arphox
07e17518e9 Fix all "Maintainability" CodeFactor issues 2019-06-11 10:28:16 +02:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
Dan Balasescu
346c4310c3
Merge branch 'master' into fail-animation 2019-06-07 20:48:36 +09:00
smoogipoo
c7d0fcd42a Update drawnodes 2019-06-06 16:49:35 +09:00
Dean Herbert
9c214c3f0e Add animation on failing 2019-06-04 16:13:16 +09:00
HoLLy
2a295545a7 Don't mutate strainPeaks 2019-05-29 11:25:25 +02:00
HoLLy
7e9f5a0939 Add Skills to DifficultyAttributes 2019-05-29 11:22:51 +02:00
Paul Teng
1c3b768266 Use Precision.AlmostBigger 2019-05-12 09:02:22 -04:00
Paul Teng
1a6c8e91a5 Compare Health with small value 2019-05-12 08:44:20 -04:00
smoogipoo
3fe61c4a7e Trim whitespace 2019-05-10 18:48:39 +09:00
Dan Balasescu
425154c264
Merge branch 'master' into progress-bar-show-seek 2019-05-10 18:24:15 +09:00
smoogipoo
ad4b4f3422 Use nullable cancellation tokens 2019-05-10 17:42:45 +09:00
Dean Herbert
a44296a6db
Merge branch 'master' into progress-bar-show-seek 2019-05-10 17:27:49 +09:00
Dean Herbert
21ab628f41
Merge branch 'master' into player-load-cancellations 2019-05-10 16:58:36 +09:00
smoogipoo
d25d39b315 Add cancellation to storyboard/hitobject loading 2019-05-10 16:31:09 +09:00
Dan Balasescu
32808a8a59
Merge branch 'master' into fix-long-skip-performance 2019-05-10 16:10:50 +09:00
David Zhao
5c096cbc91 Revert mirroring condition too 2019-05-09 18:59:00 +09:00
David Zhao
9e0af723cc Split out affectscombo change 2019-05-09 18:56:19 +09:00
Dean Herbert
9248e6290c Use FrameStabilityClock to denote current position on song progress 2019-05-09 18:09:26 +09:00
Dean Herbert
3bcfc86b9c Allow custom MaxCatchUpFrames to be specified
Also adjusts the default to allow for smoother seeking.
2019-05-09 16:39:03 +09:00
Dean Herbert
66594b7a1b Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start 2019-05-09 16:39:03 +09:00
David Zhao
b0e34d86d5 Subtract a result from count if its been reverted 2019-05-09 16:16:20 +09:00
David Zhao
39fb5712f1 Only combo-incrementing results add to result count 2019-05-09 15:31:37 +09:00
smoogipoo
39efa2d173 Fix possible cross-thread config cache access 2019-05-08 19:05:00 +09:00
smoogipoo
117f8bdd01 Merge remote-tracking branch 'Joehuu/master' into flashlight-dim 2019-05-08 13:25:01 +09:00
smoogipoo
13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +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
David Zhao
abc163fa36 Fix merge 2019-05-07 12:07:45 +09:00
David Zhao
732b0b22a3 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-05-07 12:04:58 +09:00
Dean Herbert
6bdaca1e3b Fix mod equality checks not working as intended 2019-05-03 10:09:47 +09:00
Dean Herbert
6a4dc5e25c Improve xmldoc slightly 2019-05-02 14:03:58 +09:00
iiSaLMaN
ddd9262384
fix xmldoc 2019-04-30 19:08:31 +03:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2 2019-04-30 18:55:35 +03:00
iiSaLMaN
148f4c4ce0
Pass Rank.Value instead
Passing Rank.Value along each iteration instead of calculating.
2019-04-30 18:49:31 +03:00
iiSaLMaN
e0abd0b2c1
fix comment 2019-04-30 18:44:31 +03:00
iiSaLMaN
665558c297
Remove unnecessary comment 2019-04-30 18:44:06 +03:00
iiSaLMaN
5d50316ae7
Add xmldoc 2019-04-30 18:12:27 +03:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
iiSaLMaN
b08fb5136e
Merge branch 'master' into sh-xh-grading-2 2019-04-26 10:38:10 +03:00
David Zhao
9da13cb463
Merge branch 'master' into flashlight-dim 2019-04-25 23:15:15 +09:00
KingLuigi4932
619071b7ee Unnecessary 'using' directive 2019-04-25 14:23:00 +03:00
KingLuigi4932
4e0f21102b Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2 2019-04-25 14:04:12 +03:00
KingLuigi4932
c6b3197dd0 Add AdjustRank and use it in Hidden Mod 2019-04-25 13:56:57 +03:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
iiSaLMaN
d3bc443810
Merge branch 'master' into sh-xh-grading-2 2019-04-25 06:11:07 +03:00
Dean Herbert
4f31eee5ad
Merge branch 'master' into flashlight-dim 2019-04-24 17:01:11 +09:00
Dean Herbert
60328cf1fb Ensure FrameStabilityContainer's ElapsedTime is zero on initial seek 2019-04-24 15:25:53 +09:00
Dean Herbert
80e1568e97 Fix FrameStabilityContainer performing frame-stable seeks 2019-04-24 15:25:52 +09:00
iiSaLMaN
a29c7d81ee
Merge branch 'master' into sh-xh-grading-2 2019-04-23 10:31:17 +03:00
David Zhao
9890884726 Remove fade in, update comment 2019-04-23 14:23:09 +09:00
smoogipoo
6c568d228f Add comment 2019-04-23 13:45:51 +09:00
smoogipoo
6add395288 Fix gameplay cursor being hidden in tests/replays 2019-04-23 13:32:44 +09:00
iiSaLMaN
a6b60a2fc2
Merge branch 'master' into sh-xh-grading-2 2019-04-22 19:39:20 +03:00
Dean Herbert
5313ba2938
Merge branch 'master' into hp-rewind 2019-04-22 19:02:41 +09:00
Dean Herbert
908eee9942 Fix pause tests 2019-04-22 18:29:51 +09:00
smoogipoo
aeae759fcd Rename method + add xmldoc 2019-04-22 18:08:15 +09:00
smoogipoo
4edb17a88a Make hp work + cleanup 2019-04-22 18:02:49 +09:00
smoogipoo
fbb4e9df04 Implement hp at base ScoreProcessor 2019-04-22 16:51:38 +09:00
David Zhao
3fbbb7dcf9 Move intiial fade outside of absolute sequence 2019-04-22 16:39:28 +09:00