Commit Graph

56765 Commits

Author SHA1 Message Date
5f70ee3ed7 Merge branch 'master' into mania-note-order-fix 2022-08-15 23:44:02 +09:00
a2c911990c Merge branch 'master' into even-nicer-frame-stability-clock 2022-08-15 23:22:50 +09:00
5a88f9c7ee Merge pull request #19776 from peppy/even-less-gameplay-clock
Remove `FrameStableClock` (and redirect usages to `FrameStabilityContainer`)
2022-08-15 23:21:47 +09:00
8e0049c005 Add back null check 2022-08-15 21:57:41 +09:00
c03e47317a Fix notes not being added to list 2022-08-15 21:56:03 +09:00
4d4ee05981 Whoops I meant to remove these 2022-08-15 21:56:03 +09:00
78283ce3c5 Remove TaikoDifficultyPreprocessor 2022-08-15 21:43:09 +09:00
21d2998032 Privatise internals of TaikoColourDifficultyPreprocessor 2022-08-15 21:35:57 +09:00
94c6beeaf7 Use ctor in a place that looks visually weird
I read through this thinking "why doesn't Previous get assigned to
currentEncoding here? But it's because the initializer runs right after
the ctor and before the "method" returns. So really there's 3 operations
running on one line here - ctor, init, and assignment.
2022-08-15 21:30:46 +09:00
502e31dd37 General refactoring 2022-08-15 21:26:54 +09:00
d686e841c5 Merge branch 'master' into colour-encoding-2 2022-08-15 20:56:50 +09:00
1ef8bb2367 Merge branch 'master' into even-less-gameplay-clock 2022-08-15 13:23:42 +02:00
c334a84139 Merge pull request #19775 from peppy/less-gameplay-clock
Move all usage of `GameplayClock` to `IGameplayClock`
2022-08-15 13:23:04 +02:00
61a8873266 Ensure GameplayClockContainer's FramedClock is always non-null 2022-08-15 20:22:36 +09:00
1696a905ba Reduce exposed properties in GameplayClockContainer 2022-08-15 20:22:36 +09:00
704568ae3b Remove remaining usage of GameplayClock 2022-08-15 20:22:36 +09:00
43442dbf65 Merge branch 'even-less-gameplay-clock' into even-nicer-frame-stability-clock 2022-08-15 20:22:30 +09:00
87760bbc06 Fix IsCatchingUp not being in correct state 2022-08-15 20:17:48 +09:00
1fc3d005c0 Seal FrameStabilityContainer
No one should ever derive from this class. It is already too complex.
2022-08-15 19:31:02 +09:00
fff2b57905 Tidy up and document FrameStabilityContainer 2022-08-15 19:28:12 +09:00
9bc2e91de0 Fix incorrect handling of reference clocks when no parent IGameplayClock is available 2022-08-15 19:19:19 +09:00
04d88b8216 Use constraint based assertions in TestSceneFrameStabilityContainer 2022-08-15 19:19:19 +09:00
828b6f2c30 Remove unnecessary setClock shenanigans 2022-08-15 19:19:19 +09:00
27569e2ed5 Remove FrameStableClock (and redirect usages to FrameStabilityContainer) 2022-08-15 19:19:19 +09:00
b8fe2e5f4f Merge branch 'master' into master 2022-08-15 17:58:45 +08:00
71961b244e Merge branch 'master' into less-gameplay-clock 2022-08-15 11:58:30 +02:00
11854158a8 Merge pull request #19773 from peppy/constraint-asserts-in-tests
Update some clock tests to use constraint-based assertions
2022-08-15 11:57:43 +02:00
e41f5ac4b9 Merge branch 'master' of https://github.com/josh-codes/osu 2022-08-15 17:52:40 +08:00
be7367b90e Invert the dash and normal hits. 2022-08-15 17:52:26 +08:00
cc982d374c Cache self rather than GameplayClock 2022-08-15 18:30:53 +09:00
c5f8529d20 Mark unused methods as NotImplemented for safety 2022-08-15 18:30:53 +09:00
f81c7644b4 Make GameplayClockContainer also an IGameplayClock and expose to remaining tests 2022-08-15 18:30:53 +09:00
c8764cb333 Move all usage of GameplayClock to IGameplayClock 2022-08-15 18:30:53 +09:00
c64c9144c0 Merge branch 'ppy:master' into master 2022-08-15 17:24:02 +08:00
ff497c452f Fix formatting + Add tests + fix touch UI 2022-08-15 17:23:29 +08:00
6d78218142 Update usages of GameplayClockContainer.GameplayClock to access properties directly 2022-08-15 18:08:49 +09:00
224f3eaa84 Make GameplayClockContainer non-abstract and use in MultiSpectatorPlayer 2022-08-15 18:08:49 +09:00
95c1b488a7 Add non-null assertion to FrameStabilityContainer 2022-08-15 18:08:49 +09:00
58146598c8 Update TestSceneEditorClock to use constraint-based assertions 2022-08-15 18:08:05 +09:00
0087935708 Update TestSceneSpinnerRotation to use constraint-based assertions 2022-08-15 18:05:39 +09:00
4b5439f434 Merge pull request #19768 from peppy/fix-song-progress-div-by-zero
Fix div-by-zero in `SongProgress` when no object duration could be calculated
2022-08-15 16:44:28 +09:00
623e90a7b2 Fix div-by-zero in SongProgress when no object duration could be calculated 2022-08-15 15:05:35 +09:00
Nao
c940f5abcb Merge branch 'master' into ruleset-localization 2022-08-14 15:17:44 -04:00
784ce4d23d Add test coverage for localisable setting source 2022-08-14 15:06:33 -04:00
45e9eda9e7 Localise hit result name 2022-08-14 14:57:02 -04:00
18ce784ae0 Allow StatisticItem's name param to be nullable 2022-08-14 14:51:35 -04:00
2aa3a1b50d Rename all "KeysPerSecond" usages to "ClicksPerSecond" 2022-08-14 20:12:11 +02:00
9dc806506e Make ActionListener and KeysPerSecondCalculator not rely on events to add timestamps 2022-08-14 19:31:14 +02:00
5106c00a9c Improve code quality 2022-08-14 19:02:29 +02:00
d5f10cbb9d Revert 787dee24 and initialize calculator in HUDOverlay 2022-08-14 18:53:00 +02:00