Commit Graph

20471 Commits

Author SHA1 Message Date
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
782fc1d60f Use OsuGame.OverlayActivationMode rather than per-Player 2020-10-06 20:27:35 +10:30
1877312a91 Rename DuringGameplay 2020-10-06 20:27:35 +10:30
064d081138 Merge branch 'master' into editor-setup-sections-container 2020-10-06 18:36:11 +09:00
4036412387 Merge branch 'master' into labelled-slider-bar-2020 2020-10-06 18:29:20 +09:00
e2d081e3cc Merge pull request #10388 from peppy/editor-setup-placeholder-text
Add placeholder text/colour when no beatmap background is specified yet
2020-10-06 18:29:01 +09:00
d5782c95bd Merge branch 'master' into confine-during-gameplay 2020-10-06 18:05:15 +09:00
b1a64f89d7 Increase backwards seek magnitude when the track is running
This matches osu-stable. When the track is running, seeking backwards
(against the flow) is harder than seeking forwards. Adding a mutliplier
makes it feel much better.

Note that this is additive not multiplicative because for larger seeks
the (where `amount` > 1) we don't want to jump an insanely huge amount -
just offset the seek slightly to account for playing audio.
2020-10-06 17:53:12 +09:00
3ce234d552 Seek at 4x normal speed when holding shift
This matches osu-stable 1:1. Not sure if it feels better or not but
let's stick with what people are used to for the time being.
2020-10-06 17:47:25 +09:00
7e8ab1cb95 Add description text 2020-10-06 17:36:18 +09:00
7a20a34aff Add support to EditorBeatmap to update all hitobjects 2020-10-06 17:36:18 +09:00
6d7f12ad4b Add basic difficulty setting sliders 2020-10-06 17:33:50 +09:00
13b67b93a5 Add difficulty section 2020-10-06 17:33:50 +09:00
e1a6f47d90 Add the most basic implementation of LabelledSliderBar feasible 2020-10-06 17:33:50 +09:00
505dd37a75 Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:33:50 +09:00
98fe5f78ee Split setup screen up into sections (and use a SectionContainer) 2020-10-06 17:29:08 +09:00
87bf3bdc16 Add the most basic implementation of LabelledSliderBar feasible 2020-10-06 17:26:06 +09:00
28756d862b Add placeholder text/colour when no beatmap background is specified yet 2020-10-06 17:21:01 +09:00
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +09:00
461fa22e74 Merge pull request #10381 from peppy/ios-update-notifications
Add update notifications for iOS builds
2020-10-06 14:36:49 +09:00
5e10ac418b Add update notifications for iOS builds 2020-10-06 13:19:52 +09:00
22b0105d62 Show a notification if checking for updates via button and there are none available 2020-10-06 13:00:02 +09:00