Commit Graph

20542 Commits

Author SHA1 Message Date
6636b64cbd Merge pull request #10407 from peppy/fix-sample-disposed-on-skin-change
Don't force playback of (non-looping) DrawableHitObject samples after skin change
2020-10-07 19:34:53 +09:00
94a6e28565 Add back second removed condition 2020-10-07 18:40:09 +09:00
3c3c1ce885 Don't force playback of (non-looping) DrawableHitObject samples after skin change 2020-10-07 18:18:01 +09:00
04fa0bff9d Add CanBeNull spec and xmldoc 2020-10-07 17:46:57 +09:00
f1a3b6d0ba Merge branch 'master' into perf-calculator-remove-working-beatmap 2020-10-07 17:43:17 +09:00
0f6eb9d4cb Ensure music playback is stopped when retrying by any means 2020-10-07 17:40:54 +09:00
5171c18a4b Merge branch 'master' into ruleset-result-types 2020-10-07 17:04:02 +09:00
f77ad8cf39 Remove unused using 2020-10-07 17:03:34 +09:00
54ca544855 Merge pull request #10400 from peppy/fix-first-hitobject-must-be-combo
Ensure first hitobject is always a new combo
2020-10-07 17:01:31 +09:00
31d347be5c Make extended score panel taller to better fit all information 2020-10-07 16:50:00 +09:00
f88ba1734b Remove ConfineMouseTracker field 2020-10-07 18:11:47 +10:30
f206ea96ce Merge pull request #10391 from peppy/editor-setup-screen-difficulty-adjust
Add difficulty adjustment settings to editor setup screen
2020-10-07 16:33:10 +09:00
67398b5d95 Move timestamp text out of flow and attach to bottom edge 2020-10-07 16:30:14 +09:00
2e0a9f53c1 Add test coverage 2020-10-07 17:52:39 +10:30
fbb10f6774 Merge branch 'master' into fix-first-hitobject-must-be-combo 2020-10-07 16:21:00 +09:00
6ac70945f2 Show bonus judgements on expanded panel 2020-10-07 16:17:28 +09:00
c0bc6a75b3 Show auxiliary judgements on next line 2020-10-07 16:17:17 +09:00
e281d724b8 Consume display name logic 2020-10-07 15:43:52 +09:00
3363c3399e Allow rulesets to specify valid HitResult types (and display names for them) 2020-10-07 15:34:23 +09:00
d6d0bd90a3 Extract tuple into class 2020-10-07 15:34:03 +09:00
338b4c56ce Merge pull request #10399 from peppy/editor-beatmap-batch-change-support
Add editor beatmap batch change support
2020-10-07 14:57:51 +09:00
8b8eb00bd7 Permit nulls rather than casting to OsuGame 2020-10-07 16:16:58 +10:30
d1ec380692 Don't cache ConfineMouseTracker 2020-10-07 16:15:32 +10:30
485bd962c7 Also reset LocalUserPlaying in OnSuspending 2020-10-07 16:15:17 +10:30
7fff762dfc Rename IsGameplay 2020-10-07 16:14:49 +10:30
c8c5998af4 Bail if FrameworkSetting.ConfineMouseMode is unavailable 2020-10-07 16:02:35 +10:30
a6d1484ad5 Add arbirary precision specification for now 2020-10-07 14:26:01 +09:00
2ef5a34ace Merge branch 'master' into editor-beatmap-batch-change-support 2020-10-07 14:08:49 +09:00
a8151d5c63 Fix HitWindows getting serialized alongside HitObjects
These were being serialized as the base type. On deserialization, due to
the HitWindow of objects being non-null, they would not get correctly
initialised by the CreateHitWindows() virtual method.

- Closes #10403
2020-10-07 13:45:42 +09:00
c1a8fe01ef Fix postprocess order in batch events 2020-10-07 11:09:45 +09:00
8847b88e65 Fix unit tests trying to resolve OsuGame 2020-10-07 11:44:41 +10:30
ec12a21088 Merge branch 'master' into confine-during-gameplay
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
2020-10-07 11:07:00 +10:30
f5a6beb4e5 Remove obsoletion notice. 2020-10-06 19:01:03 +02:00
afe3d3989a Force first hitobject to be a NewCombo in BeatmapProcessor preprocessing step 2020-10-06 22:10:13 +09:00
09f5e9c9eb Use batch change application in many places that can benefit from it 2020-10-06 22:10:07 +09:00
14c734c244 Add a very simple method of applying batch changes to EditorBeatmap 2020-10-06 22:10:07 +09:00
b2dad67ade Fix unresolvable dependency in settings test scene 2020-10-06 21:28:59 +09:00
478f2dec96 Maintain the current gameplay state in OsuGame 2020-10-06 22:39:35 +10:30
e8b34ba4ac Fix incorrectly committed testing change 2020-10-06 20:57:39 +09:00
aae4a74d14 Merge branch 'master' into editor-setup-screen-difficulty-adjust 2020-10-06 20:11:44 +09:00
50872e3839 Merge pull request #10390 from peppy/editor-setup-sections-container
Split editor setup screen up into sections
2020-10-06 20:07:56 +09:00
7d4b495197 Merge pull request #10395 from peppy/editor-timeline-show-repeats
Add repeats display to timeline blueprints
2020-10-06 19:53:50 +09:00
300423579e Merge pull request #10394 from peppy/add-back-obsoleted-bindable-prop
Add obsoleted Bindable property back to SettingsItem for compatibility
2020-10-06 19:43:24 +09:00
461be02e6f Update with underlying changes 2020-10-06 19:34:21 +09:00
87d4e86cad Merge branch 'editor-setup-sections-container' into editor-setup-screen-difficulty-adjust 2020-10-06 19:30:32 +09:00
77ccbb087c Merge pull request #10393 from peppy/fix-editor-backwards-seek
Increase backwards seek magnitude when the track is running
2020-10-06 19:28:28 +09:00
06a51297a3 Use content instead of exposing the flow container 2020-10-06 19:26:57 +09:00
a2796d2c01 Add repeats display to timeline blueprints 2020-10-06 19:22:35 +09:00
fa65e14455 Merge pull request #10392 from peppy/fix-editor-seek-modifier
Seek at 4x normal speed when holding shift (not 2x)
2020-10-06 19:19:41 +09:00
e64cee10b8 Add obsoleted Bindable property back to SettingsItem for compatibility 2020-10-06 19:07:31 +09:00