Commit Graph

1528 Commits

Author SHA1 Message Date
1c3b768266 Use Precision.AlmostBigger 2019-05-12 09:02:22 -04:00
1a6c8e91a5 Compare Health with small value 2019-05-12 08:44:20 -04:00
3fe61c4a7e Trim whitespace 2019-05-10 18:48:39 +09:00
425154c264 Merge branch 'master' into progress-bar-show-seek 2019-05-10 18:24:15 +09:00
ad4b4f3422 Use nullable cancellation tokens 2019-05-10 17:42:45 +09:00
a44296a6db Merge branch 'master' into progress-bar-show-seek 2019-05-10 17:27:49 +09:00
21ab628f41 Merge branch 'master' into player-load-cancellations 2019-05-10 16:58:36 +09:00
d25d39b315 Add cancellation to storyboard/hitobject loading 2019-05-10 16:31:09 +09:00
32808a8a59 Merge branch 'master' into fix-long-skip-performance 2019-05-10 16:10:50 +09:00
5c096cbc91 Revert mirroring condition too 2019-05-09 18:59:00 +09:00
9e0af723cc Split out affectscombo change 2019-05-09 18:56:19 +09:00
9248e6290c Use FrameStabilityClock to denote current position on song progress 2019-05-09 18:09:26 +09:00
3bcfc86b9c Allow custom MaxCatchUpFrames to be specified
Also adjusts the default to allow for smoother seeking.
2019-05-09 16:39:03 +09:00
66594b7a1b Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start 2019-05-09 16:39:03 +09:00
b0e34d86d5 Subtract a result from count if its been reverted 2019-05-09 16:16:20 +09:00
39fb5712f1 Only combo-incrementing results add to result count 2019-05-09 15:31:37 +09:00
39efa2d173 Fix possible cross-thread config cache access 2019-05-08 19:05:00 +09:00
117f8bdd01 Merge remote-tracking branch 'Joehuu/master' into flashlight-dim 2019-05-08 13:25:01 +09:00
13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +09:00
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
abc163fa36 Fix merge 2019-05-07 12:07:45 +09:00
732b0b22a3 Merge remote-tracking branch 'upstream/master' into flashlight-dim 2019-05-07 12:04:58 +09:00
6bdaca1e3b Fix mod equality checks not working as intended 2019-05-03 10:09:47 +09:00
6a4dc5e25c Improve xmldoc slightly 2019-05-02 14:03:58 +09:00
ddd9262384 fix xmldoc 2019-04-30 19:08:31 +03:00
3b03ca802a Merge branch 'master' into sh-xh-grading-2 2019-04-30 18:55:35 +03:00
148f4c4ce0 Pass Rank.Value instead
Passing Rank.Value along each iteration instead of calculating.
2019-04-30 18:49:31 +03:00
e0abd0b2c1 fix comment 2019-04-30 18:44:31 +03:00
665558c297 Remove unnecessary comment 2019-04-30 18:44:06 +03:00
5d50316ae7 Add xmldoc 2019-04-30 18:12:27 +03:00
d40177f97c Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
b08fb5136e Merge branch 'master' into sh-xh-grading-2 2019-04-26 10:38:10 +03:00
9da13cb463 Merge branch 'master' into flashlight-dim 2019-04-25 23:15:15 +09:00
619071b7ee Unnecessary 'using' directive 2019-04-25 14:23:00 +03:00
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
c6b3197dd0 Add AdjustRank and use it in Hidden Mod 2019-04-25 13:56:57 +03:00
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
d3bc443810 Merge branch 'master' into sh-xh-grading-2 2019-04-25 06:11:07 +03:00
4f31eee5ad Merge branch 'master' into flashlight-dim 2019-04-24 17:01:11 +09:00
60328cf1fb Ensure FrameStabilityContainer's ElapsedTime is zero on initial seek 2019-04-24 15:25:53 +09:00
80e1568e97 Fix FrameStabilityContainer performing frame-stable seeks 2019-04-24 15:25:52 +09:00
a29c7d81ee Merge branch 'master' into sh-xh-grading-2 2019-04-23 10:31:17 +03:00
9890884726 Remove fade in, update comment 2019-04-23 14:23:09 +09:00
6c568d228f Add comment 2019-04-23 13:45:51 +09:00
6add395288 Fix gameplay cursor being hidden in tests/replays 2019-04-23 13:32:44 +09:00
a6b60a2fc2 Merge branch 'master' into sh-xh-grading-2 2019-04-22 19:39:20 +03:00
5313ba2938 Merge branch 'master' into hp-rewind 2019-04-22 19:02:41 +09:00
908eee9942 Fix pause tests 2019-04-22 18:29:51 +09:00
aeae759fcd Rename method + add xmldoc 2019-04-22 18:08:15 +09:00
4edb17a88a Make hp work + cleanup 2019-04-22 18:02:49 +09:00