1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 23:52:57 +08:00
Commit Graph

32646 Commits

Author SHA1 Message Date
Bartłomiej Dach
7957773d58
Merge branch 'master' into more-timeline-toggles 2020-10-04 12:53:10 +02:00
Bartłomiej Dach
1559bc7c3b
Merge pull request #10331 from peppy/fix-broken-ctor-tests
Fix tests specifying steps in their constructors
2020-10-04 12:51:36 +02:00
Bartłomiej Dach
439f4a2e3f
Merge branch 'master' into fix-broken-ctor-tests 2020-10-04 11:31:36 +02:00
Bartłomiej Dach
26eff0120d Apply same fix for miss-triggering case
See 5888ecd - the same fix is applied here, but in the miss case.
2020-10-03 21:11:34 +02:00
Dean Herbert
5888ecdeb1 Fix spinner crashing on rewind 2020-10-04 01:08:24 +09:00
Dean Herbert
a864f2906f
Merge branch 'master' into health-adjustments 2020-10-03 22:50:19 +09:00
Dan Balasescu
06b55c6aba
Merge pull request #10326 from peppy/editor-less-autoplay-regeneration
Only regenerate autoplay on editor state change
2020-10-03 20:10:29 +09:00
Bartłomiej Dach
7e7f225eee Adjust slider input test to match new judgement result 2020-10-03 12:34:34 +02:00
Bartłomiej Dach
682b5fb056 Adjust health increase for drum roll tick to match new max result 2020-10-03 12:16:22 +02:00
Bartłomiej Dach
db31280671 Award health for completed slider tails 2020-10-03 12:16:22 +02:00
Bartłomiej Dach
601675db07 Adjust health increase values to match old ones better 2020-10-03 12:16:22 +02:00
Bartłomiej Dach
309714081f Make new health increase values mania-specific 2020-10-03 12:16:22 +02:00
Dean Herbert
a452d4b557
Merge pull request #10348 from tytydraco/android-rotation-lock
Allow rotation lock on Android to function properly
2020-10-03 18:32:43 +09:00
tytydraco
feb39920c5 Allow rotation lock on Android to function properly
According to Google's documentation, fullSensor will ignore rotation
locking preferences, while fullUser will obey them.

Signed-off-by: tytydraco <tylernij@gmail.com>
2020-10-03 00:48:49 -07:00
Bartłomiej Dach
2ddfd79923 Replace object pattern match with simple conditional 2020-10-03 08:09:10 +02:00
Bartłomiej Dach
1f0620ffd4 Replace assignment references to HitResult.Miss with Judgement.MinResult 2020-10-02 23:31:24 +02:00
Bartłomiej Dach
2b1ef16f89 Replace comparison references to HitResult.Miss with IsHit 2020-10-02 23:31:24 +02:00
Bartłomiej Dach
36dbb1b70a
Merge pull request #10334 from peppy/fix-editor-current-time-button-crash
Protect "use current time" button against crash when no timing point is selected
2020-10-02 19:49:30 +02:00
Endrik Tombak
676f58c3bf Merge branch 'master' of https://github.com/ppy/osu into trail-density 2020-10-02 19:36:40 +03:00
Endrik Tombak
8cd13729ee Actually multiply by the multiplier 2020-10-02 19:34:49 +03:00
Endrik Tombak
16f331cf6d Move implementation to LegacyCursorTrail 2020-10-02 19:34:06 +03:00
Dean Herbert
dab50bff6f Protect "use current time" button against crash when no timing point is selected 2020-10-03 01:27:42 +09:00
Dean Herbert
b1e7a5113e
Merge pull request #10328 from smoogipoo/fix-spinner-transforms
Fix spinners not transforming correctly
2020-10-02 23:51:09 +09:00
Dean Herbert
75ae9f1b30 Remove unused using 2020-10-02 19:57:14 +09:00
Dean Herbert
a3ecc6c5a4 Remove redundant array type specification 2020-10-02 19:56:24 +09:00
Dean Herbert
0d3a95d8fc Remove unnecessary string interpolation 2020-10-02 19:54:13 +09:00
Dean Herbert
2f15d558a3 Merge branch 'master' into control-point-timeline-representation 2020-10-02 19:53:25 +09:00
Dean Herbert
ed34985fdd Add step for mania note construction 2020-10-02 18:47:11 +09:00
Dean Herbert
5a6c45e2ff Fix hidden mod support for sliderendcircle 2020-10-02 18:41:28 +09:00
Dan Balasescu
b14b16071c
Merge branch 'master' into editor-timing-screen-change-handling 2020-10-02 18:36:06 +09:00
Dean Herbert
f0eae02471 Merge branch 'fix-broken-ctor-tests' into skin-slider-end-circle-support 2020-10-02 18:24:35 +09:00
Dan Balasescu
7dc0b4d97e
Merge pull request #10327 from peppy/osu-slider-stable-triangle-seed
Avoid rapid triangle repositioning during editor slider placement
2020-10-02 18:23:19 +09:00
Dean Herbert
1a0171fb2d Fix tests specifying steps in their constructors 2020-10-02 18:23:18 +09:00
Dean Herbert
575046e5fd Don't update reply on add/remove (will be automatically handled by change handler events) 2020-10-02 18:21:13 +09:00
Dean Herbert
66f5187e6a Remove redundant access permission 2020-10-02 18:20:59 +09:00
Dan Balasescu
7f67b9bc46
Merge pull request #10325 from peppy/editor-timing-move-control-group
Add the ability to move a control point around in time
2020-10-02 18:15:39 +09:00
Dean Herbert
519c3ac2bd Change SliderWithTextBoxInput to transfer on commit 2020-10-02 17:59:57 +09:00
Dean Herbert
9fc9009dbe Add change handling for sample section 2020-10-02 17:59:47 +09:00
Dean Herbert
08faef694b Add change handling for difficulty section 2020-10-02 17:58:27 +09:00
Dean Herbert
693a4ff474 Add change handling for effects section 2020-10-02 17:58:23 +09:00
Dean Herbert
98fd661b23 Add change handling for timing section 2020-10-02 17:55:47 +09:00
Dean Herbert
c1c5b5da8e Push state change on control point group addition / removal 2020-10-02 17:49:38 +09:00
Dean Herbert
436cc572d3 Expose ChangeHandler.SaveState via interface 2020-10-02 17:37:29 +09:00
Dean Herbert
00eed29527 Don't update time if it hasn't changed 2020-10-02 17:35:41 +09:00
Dean Herbert
fc920a8899 Add change handler logic 2020-10-02 17:32:34 +09:00
Dan Balasescu
066e9bb466
Merge branch 'master' into editor-timing-move-control-group 2020-10-02 17:27:11 +09:00
Dan Balasescu
d0447d78ed
Merge pull request #10324 from peppy/fix-control-point-group-removal
Fix control points not being removed from ControlPointInfo lists when group is removed
2020-10-02 17:13:18 +09:00
Dean Herbert
faeb9910e5 Revert "Exit import process after first handler is run"
This reverts commit 4139301afa.
2020-10-02 17:06:55 +09:00
Dean Herbert
2a02f8f3f3 Add support for background changing 2020-10-02 16:52:45 +09:00
Dean Herbert
4139301afa Exit import process after first handler is run 2020-10-02 16:52:45 +09:00