Shane Woolcock
4b6f893408
Merge branch 'master' into confine-during-gameplay
...
# Conflicts:
# osu.Game/Configuration/OsuConfigManager.cs
# osu.Game/OsuGame.cs
# osu.Game/Screens/Play/Player.cs
2020-10-05 10:23:37 +10:30
Dean Herbert
e56b2ad06b
Merge pull request #10365 from peppy/update-framework
...
Update framework
2020-10-05 00:21:01 +09:00
Dean Herbert
e3d9687be4
Merge pull request #10363 from bdach/fix-spinners-crashing-on-unpause
...
Fix spinners crashing on unpause
2020-10-05 00:06:31 +09:00
Dean Herbert
432ba7cdf9
Add test coverage of exit-without-save
2020-10-04 23:57:35 +09:00
Dean Herbert
9ca0e48acc
Change exit logic to be more test-friendly
2020-10-04 23:57:28 +09:00
Dean Herbert
1b02c814d6
Update framework
2020-10-04 23:47:47 +09:00
Dean Herbert
02e4f3ddaf
Fix the editor saving new beatmaps even when the user chooses not to
2020-10-04 23:47:16 +09:00
Bartłomiej Dach
6f2b991b32
Ensure true gameplay rate is finite when paused externally
2020-10-04 14:54:51 +02:00
Bartłomiej Dach
ad42ce5639
Add failing test cases
2020-10-04 14:54:51 +02:00
Dean Herbert
5dea37792c
Merge branch 'master' into health-adjustments
2020-10-04 21:38:40 +09:00
Dean Herbert
ec30ca24c5
Merge pull request #10343 from bdach/hitresult-miss-fixes
...
Replace direct references to HitResult.Miss wherever applicable
2020-10-04 21:36:26 +09:00
Bartłomiej Dach
a366591d6d
Merge branch 'master' into osu-selection-scaling
2020-10-04 13:28:59 +02:00
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
2020-10-03 21:11:34 +02:00
Dean Herbert
5888ecdeb1
Fix spinner crashing on rewind
2020-10-04 01:08:24 +09:00
Lucas A
27cc6c5046
Rename HitCirclesCount -> HitCircleCount.
2020-10-03 16:52:33 +02:00
Lucas A
d7747ebb2d
Remove unused WorkingBeatmap argument.
2020-10-03 16:51:22 +02: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
Lucas A
abd395a030
Remove unecessary using references.
2020-10-02 19:41:24 +02:00
Lucas A
cb2f695fdd
Calculate hit circle count in OsuPerformanceCalculator.
2020-10-02 19:34:41 +02:00
Lucas A
0163688a17
Remove IBeatmap from PerformanceCalculator.
2020-10-02 19:24: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
fcc6cb36e4
Change text colour to black
2020-10-02 18:50:47 +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
