1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-26 11:53:09 +08:00
Commit Graph

54485 Commits

Author SHA1 Message Date
MK56
91742859f1
Merge branch 'ppy:master' into blink_implementation 2022-08-19 16:55:27 +02:00
Dan Balasescu
4ef8e00a78
Merge pull request #19851 from peppy/update-framework
Update framework and resources
2022-08-19 22:03:55 +09:00
Dean Herbert
c3c44c19cd Use CompositeComponent in various locations 2022-08-19 20:43:15 +09:00
Dean Herbert
41321521e5 Update resources 2022-08-19 20:40:05 +09:00
Dean Herbert
426c4c9bf7 Update framework 2022-08-19 20:39:53 +09:00
Mk-56spn
7add3a6950 ar var test 2022-08-18 19:00:54 +02:00
Bartłomiej Dach
bc851c174b
Merge pull request #19836 from peppy/split-offset-clock
Split `OffsetCorrectionClock` out of `MasterGameplayClockContainer`
2022-08-18 18:26:51 +02:00
Bartłomiej Dach
4ad782b5a0
Merge branch 'master' into split-offset-clock 2022-08-18 17:52:45 +02:00
Dean Herbert
0f0b4fdfec
Merge pull request #19838 from peppy/test-scene-lead-in-updates
Update `TestSceneLeadIn` to use new assert style
2022-08-18 20:55:55 +09:00
Dean Herbert
2eba8650ca Update TestSceneLeadIn to use new assert style 2022-08-18 19:26:19 +09:00
Dean Herbert
343efa1d11 Split OffsetCorrectionClock out of MasterGameplayClockContainer 2022-08-18 18:54:10 +09:00
Dan Balasescu
fa167b1d12
Merge pull request #19779 from peppy/no-gameplay-clock
Remove all remaining usage of `GameplayClock`
2022-08-18 18:52:57 +09:00
Dean Herbert
3e34959a6e
Merge pull request #19833 from smoogipoo/fix-backwards-asserts
Fix some backwards asserts
2022-08-18 18:42:23 +09:00
Dan Balasescu
5d8d584afb Fix some backwards asserts 2022-08-18 18:08:46 +09:00
Dan Balasescu
c4dee1cf6d
Merge pull request #19832 from peppy/fix-taiko-span-blueprint-overlay
Fix taiko blueprints displaying incorrectly for drum rolls
2022-08-18 17:57:14 +09:00
Dan Balasescu
8480703e0b
Merge pull request #19831 from peppy/fix-zero-length-taiko-spans
Fix taiko drum rolls with zero length being placeable in editor
2022-08-18 17:56:46 +09:00
Dean Herbert
ad28bfc9b2 Fix taiko blueprints displaying incorrectly for drum rolls 2022-08-18 17:18:11 +09:00
Dean Herbert
48fac9f8a5 Fix taiko drum rolls with zero length being placeable in editor
Addresses https://github.com/ppy/osu/discussions/19808.
2022-08-18 16:50:36 +09:00
Dean Herbert
8d026eeeea
Merge pull request #19827 from smoogipoo/upgrade-analyser
Upgrade LocalisationAnalyser and disable warning
2022-08-18 16:35:34 +09:00
Dan Balasescu
e55b94d412 Also upgrade tools 2022-08-18 15:18:35 +09:00
Dan Balasescu
7512c126b7 Upgrade LocalisationAnalyser and disable warning 2022-08-18 15:08:24 +09:00
Dean Herbert
9735728cf6 Reverse conditionals to better define intent in addSourceClockAdjustments 2022-08-18 15:08:09 +09:00
Dan Balasescu
7878231a73
Merge pull request #19817 from peppy/various-test-fixes
Refactor some tests
2022-08-18 14:39:43 +09:00
Dean Herbert
d40d09a544 Rename method to be more specific and standardise setBeatmap calls 2022-08-17 23:03:39 +09:00
Dean Herbert
e7ddbc41c8
Merge branch 'master' into no-gameplay-clock 2022-08-17 22:21:10 +09:00
Dan Balasescu
4627e4f53b
Merge pull request #19120 from molneya/mania-note-order-fix
Fix mania star rating varying by order of notes in a chord
2022-08-17 20:39:52 +09:00
Dan Balasescu
11301f52b7
Merge pull request #19814 from peppy/update-framework
Update framework (and other dependencies)
2022-08-17 19:24:01 +09:00
Dean Herbert
553ae4781f Remove unnecessary local implementation in TestScenePlaybackControl 2022-08-17 19:21:54 +09:00
Dean Herbert
7d8fbc4dbc Refactor TestSceneDrawableTaikoMascot to read a bit better 2022-08-17 19:21:50 +09:00
Dean Herbert
4ef4d66f49 Add some extra initial state checks to TestSceneEditorSeekSnapping 2022-08-17 19:21:46 +09:00
Dan Balasescu
f381bc9115 Add explanatory comment 2022-08-17 19:03:48 +09:00
Dan Balasescu
203b8b22b9 Adjust tests 2022-08-17 19:02:16 +09:00
Dan Balasescu
237637f0c4
Merge pull request #19804 from stanriders/clamp-sb-estimation
Clamp effective miss count to maximum amount of possible breaks
2022-08-17 18:58:12 +09:00
Dean Herbert
e1e6be039a Don't create destination stream if backup source doesn't exist 2022-08-17 18:20:47 +09:00
Dean Herbert
eb9cfe97d2
Merge pull request #19815 from smoogipoo/fix-quick-retry-test
Fix flaky quick retry test
2022-08-17 17:43:31 +09:00
Dean Herbert
fca076b988 Fix edge case of realm backup cascading failure 2022-08-17 17:17:22 +09:00
Dean Herbert
243fe56b1d Realm bump for props 2022-08-17 17:11:17 +09:00
Dan Balasescu
3a0017c87b Fix flaky quick retry test 2022-08-17 17:09:44 +09:00
Dean Herbert
a5ac69a554 Update various dependencies 2022-08-17 16:57:56 +09:00
Dean Herbert
7191fbb6d6 Update framework 2022-08-17 16:40:07 +09:00
Dean Herbert
c3b3733307
Merge pull request #19782 from OliBomby/slider-merger
Add ability to merge hit objects in osu! editor to create sliders
2022-08-17 15:52:16 +09:00
Dan Balasescu
0cf3c5570a
Merge pull request #19800 from peppy/fix-editor-ear-rape
Fix slider ticks playing back at infinite rate while making changes to a slider in the editor
2022-08-17 15:50:58 +09:00
Dan Balasescu
aaaaff1bbf
Merge pull request #19812 from peppy/improve-intro-timings-2
Tweak intro timings more and ensure non-theme tracks play from preview point
2022-08-17 15:50:42 +09:00
Dean Herbert
20256aad11 Merge branch 'master' into no-gameplay-clock 2022-08-17 15:21:20 +09:00
Dean Herbert
21b364cd77 Fix nullref in tests as initialBeatmap may be null 2022-08-17 14:48:00 +09:00
Dean Herbert
6b9dec5996 Restore original event flow to allow for OnSuspend case to work correctly 2022-08-17 14:32:21 +09:00
Dean Herbert
8ce50e98a6 Move delegate debounce logic to Editor itself 2022-08-17 14:04:57 +09:00
Dan Balasescu
8b5ac55fca
Remove newline 2022-08-17 13:48:06 +09:00
Dean Herbert
615c5cf6ae
Merge branch 'master' into slider-merger 2022-08-17 13:36:15 +09:00
Dean Herbert
0ff5547b83 Make changeHandler optional in convertToStream method to match new implementation 2022-08-17 13:35:44 +09:00