1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 05:02:55 +08:00
Commit Graph

44642 Commits

Author SHA1 Message Date
Dean Herbert
7ea55b2cee Merge branch 'master' into fix-taiko-fl 2021-09-17 19:15:20 +09:00
Dean Herbert
a743a3f306 Change combo bind logic to be non-weird 2021-09-17 19:15:14 +09:00
Dan Balasescu
90f1592d15
Merge pull request #14783 from peppy/login-feedback
Move login panel related files to own namespace and tidy up class nesting
2021-09-17 19:02:23 +09:00
Dan Balasescu
a591fffdbd
Merge pull request #14782 from peppy/refocus-textbox-on-failed-password
Refocus the multiplayer password entry textbox on failed join
2021-09-17 18:59:09 +09:00
Dan Balasescu
c87a48bd4d
Merge pull request #14777 from peppy/osz-tests-use-temp-folder
Fix a couple of remaining temp file edge cases in tests
2021-09-17 18:57:46 +09:00
smoogipoo
35c3d75cb8 Preserve flashlight size through aspect adjustment 2021-09-17 18:51:43 +09:00
Dan Balasescu
d249d6708c
Merge pull request #14780 from peppy/fix-default-parallax-background-scren
Fix the default background parallax being set incorrectly when no screen is present
2021-09-17 18:41:08 +09:00
smoogipoo
2d39131202 Refactor taiko flashlight a bit 2021-09-17 18:41:03 +09:00
Dean Herbert
e49d8d0878 Add test coverage of login dialog 2021-09-17 18:36:09 +09:00
Dean Herbert
50f155e4b9 Move login panel related files to own namespace and tidy up class nesting 2021-09-17 18:34:16 +09:00
Dean Herbert
027912d4f6 Refocus the multiplayer password entry textbox on failed join 2021-09-17 18:25:25 +09:00
Dean Herbert
a1f587f2c5 Add failing test coverage of password entry textbox not regaining focus 2021-09-17 18:25:25 +09:00
Dean Herbert
1c8e17cf11 Fix the default background parallax being set incorrectly when no screen is present 2021-09-17 18:14:39 +09:00
smoogipoo
f584d6593a Fix flashlight alignment 2021-09-17 18:10:53 +09:00
smoogipoo
a4238e49a7 Revert "Don't apply normal visibility to increased visibility state"
This reverts commit 5dd0e0d961.
2021-09-17 17:39:34 +09:00
smoogipoo
5dd0e0d961 Don't apply normal visibility to increased visibility state 2021-09-17 17:33:32 +09:00
smoogipoo
ea68be08cb Split magic values into named constants 2021-09-17 17:27:54 +09:00
smoogipoo
c9e76783e6 Fix taiko HD not calculating pre-empt correctly 2021-09-17 17:24:03 +09:00
Dean Herbert
45caeb84d3 Fix incorrect type specification when restoring bindable value 2021-09-17 16:28:47 +09:00
Dean Herbert
2ab235ebe7 Use new temporary folder storage for beatmap import tests 2021-09-17 16:24:21 +09:00
Dean Herbert
e0bbc677d2 Fix TestRollbackOnFailure not cleaning up after itself 2021-09-17 16:23:09 +09:00
Dean Herbert
5f27f1c099 Avoid accounting for the pause pitch adjust effect when "fixing" hardware offset adjustments
Bit of an unfortunate one. Because we are applying the pitch adjustment
to the lowest level (`Track`), it's hard to filter out in parent clock
calculations.

Tried a few solutions but this feels the best. Note that we can't just
undo the `pauseFreqAdjust` adjustment as it will div-by-zero.

Closes https://github.com/ppy/osu/issues/14773.
2021-09-17 15:43:38 +09:00
Dean Herbert
2c071a4d22 Add test coverage of pausing with a large audio offset 2021-09-17 15:43:38 +09:00
Dan Balasescu
9bacc0d50c
Merge pull request #14775 from peppy/fix-skin-editor-masking
Fix skin editor potentially leaving game-wide masking in the wrong state
2021-09-17 14:20:22 +09:00
Dan Balasescu
24105debce
Merge branch 'master' into fix-skin-editor-masking 2021-09-17 13:54:24 +09:00
Dan Balasescu
87dbdfe632
Merge pull request #14774 from peppy/move-allow-adjustments-specification
Move `AllowTrackAdjustments` specification to `RoomSubScreen`
2021-09-17 13:48:44 +09:00
Dean Herbert
1b13b74740 Fix skin editor potentially leaving game-wide masking in the wrong state
Just going with the simplest way to solve this.

Closes https://github.com/ppy/osu/issues/14769.
2021-09-17 13:48:20 +09:00
Dean Herbert
f524e913e1 Move AllowTrackAdjustments specification to RoomSubScreen 2021-09-17 13:24:01 +09:00
Dean Herbert
cd4ba71a6b Revert "Merge pull request #14772 from Joehuu/lounge-disallow-track-adj"
This reverts commit 06ff4838fb, reversing
changes made to 5453ea0ce9.
2021-09-17 13:22:39 +09:00
Dan Balasescu
06ff4838fb
Merge pull request #14772 from Joehuu/lounge-disallow-track-adj
Disallow track adjustments on playlists / multi lounge
2021-09-17 13:20:49 +09:00
Joseph Madamba
55feb47e61 Disallow track adjustments on playlists / multi lounge 2021-09-16 20:17:21 -07:00
Dean Herbert
5453ea0ce9
Merge pull request #14771 from Joehuu/fix-overflowing-wiki-blurb
Fix wiki main page blurb overflowing at higher ui scale
2021-09-17 10:45:51 +09:00
Joseph Madamba
2983d54682 Fix wiki main page blurb overflowing at higher ui scale 2021-09-16 17:32:23 -07:00
Dean Herbert
414735b8d0 Bump mobile project props realm references 2021-09-17 00:18:08 +09:00
Dean Herbert
c8b9756398
Merge pull request #14764 from smoogipoo/update-framework
Update framework with KeyBindings + TextBuilder changes
2021-09-16 23:37:15 +09:00
Dean Herbert
6b43e955be Merge branch 'limit-max-triangles' into update-framework 2021-09-16 22:49:50 +09:00
Dean Herbert
fde7c88999
Merge branch 'master' into update-framework 2021-09-16 22:49:02 +09:00
Dean Herbert
edb1230111 Fix potential nullref throw on failed startup 2021-09-16 22:48:09 +09:00
Dean Herbert
b399f910e4 Merge branch 'fix-osu-game-test-scene' into update-framework 2021-09-16 22:46:52 +09:00
Dean Herbert
bb132f9509 Update a few more missed event changes in tests 2021-09-16 22:41:35 +09:00
Dean Herbert
a1d33c1a46 Update framework 2021-09-16 22:38:19 +09:00
Dean Herbert
df786afb24
Merge pull request #14763 from kj415j45/localisation-settings-GlobalAction
Add localisation for Settings-KeyBindings-GlobalActions
2021-09-16 21:08:00 +09:00
Dean Herbert
9aed92a4d3
Merge pull request #14765 from smoogipoo/fix-legacy-approach-alpha
Fix legacy approach circles accepting 0-alpha
2021-09-16 21:06:35 +09:00
smoogipoo
bcbd0e0961 Revert ctor param 2021-09-16 20:06:20 +09:00
smoogipoo
d8f27633a4 Fix legacy approach circles accepting alpha 2021-09-16 19:35:15 +09:00
kj415j45
a18fed0da4
Remove unused using 2021-09-16 17:38:33 +08:00
smoogipoo
4b5857c876 Merge branch 'baseline-changes-update' into update-framework 2021-09-16 18:34:22 +09:00
smoogipoo
e8dea0138c Fix one more issue 2021-09-16 18:34:13 +09:00
smoogipoo
f9d5abff8a Update with keybinding changes 2021-09-16 18:26:12 +09:00
kj415j45
e323f10cd5
Remove unused [Description] 2021-09-16 17:10:29 +08:00