1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 09:22:58 +08:00
Commit Graph

32522 Commits

Author SHA1 Message Date
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
1b02c814d6 Update framework 2020-10-04 23:47:47 +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
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
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
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
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
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
ed34985fdd Add step for mania note construction 2020-10-02 18:47:11 +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
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
Dan Balasescu
459380c811
Merge pull request #10322 from peppy/improve-slider-test-scene
Update slider test scene sliders to fit better
2020-10-02 16:31:37 +09:00
Dean Herbert
b7c276093d Add fallback case when EditorChangeHandler is not present (for tests) 2020-10-02 16:21:51 +09:00
smoogipoo
fe818a020a Fix spinners not transforming correctly 2020-10-02 16:17:57 +09:00
Dean Herbert
dde7f706aa Avoid rapid triangle repositioning during editor slider placement 2020-10-02 15:51:14 +09:00
Dean Herbert
501e02db09 Only regenerate autoplay on editor state change 2020-10-02 15:44:37 +09:00
Dean Herbert
0cb3926e1d Add event on EditorChangeHandler state change 2020-10-02 15:44:34 +09:00
Dean Herbert
2698dc513f Add basic textbox error handling 2020-10-02 15:33:33 +09:00
Dean Herbert
959c8730f6 Add settings section from TimingPointGroups on timing screen 2020-10-02 15:30:32 +09:00
Dean Herbert
f501c88b46 Fix individual control points not being removed from group when group is removed 2020-10-02 15:28:21 +09:00
Dean Herbert
d6fe5482d3 Add failing test showing missing control point removal 2020-10-02 15:28:21 +09:00
Dean Herbert
50722cc754 Update slider test scene sliders to fit better 2020-10-02 14:48:56 +09:00
Dean Herbert
e2934dff0e
Merge pull request #10320 from ppy/dependabot/nuget/ppy.osu.Framework.NativeLibs-2020.923.0
Bump ppy.osu.Framework.NativeLibs from 2020.213.0 to 2020.923.0
2020-10-02 02:25:07 +09:00
dependabot-preview[bot]
c72dbf1ba0
Bump ppy.osu.Framework.NativeLibs from 2020.213.0 to 2020.923.0
Bumps [ppy.osu.Framework.NativeLibs](https://github.com/ppy/osu-framework) from 2020.213.0 to 2020.923.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2020.213.0...2020.923.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-01 17:15:49 +00:00
Dean Herbert
3069428efe
Merge pull request #10316 from smoogipoo/fix-spinner-flicker
Fix default spinner flashing yellow glow before completion
2020-10-01 22:29:48 +09:00
Dean Herbert
89beea6658
Merge pull request #10317 from smoogipoo/protect-multiple-applyresult
Safeguard againts multiple ApplyResult() invocations
2020-10-01 22:22:26 +09:00
smoogipoo
ab33434a8a Reword xmldocs to better describe nested events 2020-10-01 21:54:43 +09:00
smoogipoo
042c39ae1b Remove redundant string interpolation 2020-10-01 21:48:45 +09:00
smoogipoo
d7f9b8045c Safeguard againts multiple ApplyResult() invocations 2020-10-01 21:33:54 +09:00
Dan Balasescu
c93d1631d4
Merge pull request #10257 from hbnrmx/legacy-SpinnerNoBlink
Add support for SpinnerNoBlink to LegacyOldStyleSpinner
2020-10-01 21:25:48 +09:00
Dan Balasescu
73edb87363
Merge pull request #10303 from peppy/more-textbox-entry
Add textbox entry for speed multiplier and volume
2020-10-01 20:42:14 +09:00
smoogipoo
6d3f4c8699 Fix a few more similar cases 2020-10-01 20:38:47 +09:00