1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 23:27:28 +08:00
Commit Graph

32757 Commits

Author SHA1 Message Date
Bartłomiej Dach
02d45529fc
Merge pull request #10420 from peppy/fix-taiko-composer-movement
Fix taiko's HitObjectComposer not allowing movement of selected hitobjects
2020-10-08 23:22:09 +02:00
Bartłomiej Dach
7a3488c86b
Merge branch 'master' into fix-taiko-composer-movement 2020-10-08 22:48:08 +02:00
Bartłomiej Dach
cc41c74aad
Merge pull request #10382 from peppy/update-check-improvements
Improve behaviour of "check for updates" button
2020-10-08 22:03:59 +02:00
Bartłomiej Dach
c867fb4985
Merge branch 'master' into update-check-improvements 2020-10-08 21:32:26 +02:00
Dean Herbert
8dddd8aff5
Merge pull request #9883 from swoolcock/confine-during-gameplay
Add "During Gameplay" option for mouse confining
2020-10-08 20:25:27 +09:00
Dean Herbert
dbdb25ccf7 Move reset logic to OsuGame 2020-10-08 18:29:19 +09:00
Dean Herbert
43a575484a Remove pointless comments 2020-10-08 18:29:09 +09:00
Dean Herbert
0967db768f Add xmldoc covering usage restrictions 2020-10-08 18:28:56 +09:00
Dean Herbert
c9f069d7ed Fix taiko's HitObjectComposer not allowing movement o
f selected hitobjects
2020-10-08 18:17:57 +09:00
Dean Herbert
5d55f00139
Merge pull request #10414 from bdach/fix-current-time-button-crashes 2020-10-08 11:27:36 +09:00
Bartłomiej Dach
ac44f6f679 Ensure control point group exists after move
If the control point group moved was empty, it would not be created due
to a lack of ControlPointInfo.Add() calls.
2020-10-07 23:10:28 +02:00
Bartłomiej Dach
b1029a124c Move event subscription to LoadComplete
Prevents attempting to read from the `colours` field before it is
actually injected.
2020-10-07 22:57:20 +02:00
Bartłomiej Dach
6627e7e459
Merge pull request #10406 from peppy/fix-quick-retry-music-playback
Ensure music playback is stopped when retrying by any means
2020-10-07 21:32:50 +02:00
Bartłomiej Dach
4ba8d823d3
Merge branch 'master' into fix-quick-retry-music-playback 2020-10-07 20:57:10 +02:00
Dean Herbert
1566882dc4
Merge pull request #10338 from Game4all/perf-calculator-remove-working-beatmap
Remove WorkingBeatmap from PerformanceCalculator
2020-10-07 20:04:24 +09:00
Dan Balasescu
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
Dan Balasescu
10a3bebe1a
Merge pull request #10408 from peppy/fix-taiko-double-judgements
Fix legacy taiko skins showing double judgements
2020-10-07 19:24:21 +09:00
Dean Herbert
94a6e28565 Add back second removed condition 2020-10-07 18:40:09 +09:00
Dean Herbert
8c528c8910 Fix legacy taiko skins showing double judgements 2020-10-07 18:36:40 +09:00
Dean Herbert
3c3c1ce885 Don't force playback of (non-looping) DrawableHitObject samples after skin change 2020-10-07 18:18:01 +09:00
Dean Herbert
04fa0bff9d Add CanBeNull spec and xmldoc 2020-10-07 17:46:57 +09:00
Dean Herbert
f1a3b6d0ba Merge branch 'master' into perf-calculator-remove-working-beatmap 2020-10-07 17:43:17 +09:00
Dean Herbert
0f6eb9d4cb Ensure music playback is stopped when retrying by any means 2020-10-07 17:40:54 +09:00
Shane Woolcock
f90ac2e76c Ensure we assert after the seek has completed 2020-10-07 18:50:02 +10:30
Dan Balasescu
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
Shane Woolcock
f88ba1734b Remove ConfineMouseTracker field 2020-10-07 18:11:47 +10:30
Dan Balasescu
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
Shane Woolcock
2e0a9f53c1 Add test coverage 2020-10-07 17:52:39 +10:30
Dan Balasescu
fbb10f6774
Merge branch 'master' into fix-first-hitobject-must-be-combo 2020-10-07 16:21:00 +09:00
Dan Balasescu
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
Shane Woolcock
8b8eb00bd7 Permit nulls rather than casting to OsuGame 2020-10-07 16:16:58 +10:30
Shane Woolcock
d1ec380692 Don't cache ConfineMouseTracker 2020-10-07 16:15:32 +10:30
Shane Woolcock
485bd962c7 Also reset LocalUserPlaying in OnSuspending 2020-10-07 16:15:17 +10:30
Shane Woolcock
7fff762dfc Rename IsGameplay 2020-10-07 16:14:49 +10:30
Shane Woolcock
c8c5998af4 Bail if FrameworkSetting.ConfineMouseMode is unavailable 2020-10-07 16:02:35 +10:30
Dean Herbert
a6d1484ad5 Add arbirary precision specification for now 2020-10-07 14:26:01 +09:00
Dan Balasescu
744668a264
Merge pull request #10404 from peppy/fix-editor-crash-after-paste
Fix HitWindows getting serialized alongside HitObjects
2020-10-07 14:23:30 +09:00
Dan Balasescu
2ef5a34ace
Merge branch 'master' into editor-beatmap-batch-change-support 2020-10-07 14:08:49 +09:00
Dean Herbert
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
Dean Herbert
c1a8fe01ef Fix postprocess order in batch events 2020-10-07 11:09:45 +09:00
Shane Woolcock
8847b88e65 Fix unit tests trying to resolve OsuGame 2020-10-07 11:44:41 +10:30
Shane Woolcock
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
Lucas A
f5a6beb4e5 Remove obsoletion notice. 2020-10-06 19:01:03 +02:00
Dean Herbert
1f2dd13b49 Update tests 2020-10-06 22:10:13 +09:00
Dean Herbert
afe3d3989a Force first hitobject to be a NewCombo in BeatmapProcessor preprocessing step 2020-10-06 22:10:13 +09:00
Dean Herbert
09f5e9c9eb Use batch change application in many places that can benefit from it 2020-10-06 22:10:07 +09:00
Dean Herbert
14c734c244 Add a very simple method of applying batch changes to EditorBeatmap 2020-10-06 22:10:07 +09:00
Dean Herbert
b2dad67ade Fix unresolvable dependency in settings test scene 2020-10-06 21:28:59 +09:00
Shane Woolcock
478f2dec96 Maintain the current gameplay state in OsuGame 2020-10-06 22:39:35 +10:30
Dean Herbert
e8b34ba4ac
Fix incorrectly committed testing change 2020-10-06 20:57:39 +09:00