1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 17:42:54 +08:00
Commit Graph

44327 Commits

Author SHA1 Message Date
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
kj415j45
18e7d86dd4
Resolve test failure after localizing 2021-09-16 17:08:19 +08:00
kj415j45
51997fa533
Add localisation for GlobalActions 2021-09-16 16:02:04 +08:00
Dean Herbert
d3767ec4e9
Merge pull request #14743 from AbstractQbit/inheritable-allow-track-adjust
Make `IOsuScreen.AllowTrackAdjustments` nullable
2021-09-16 16:55:25 +09:00
Dean Herbert
da0667365b
Merge branch 'master' into inheritable-allow-track-adjust 2021-09-16 16:35:11 +09:00
Dean Herbert
6f2d818b64
Merge pull request #14740 from smoogipoo/mania-note-animations
Add animation support for mania notes
2021-09-16 16:34:53 +09:00
Dean Herbert
3495fae519 Handle potential for OnResuming call without an OnSuspending first 2021-09-16 16:31:41 +09:00
Dean Herbert
b58415fe19 Make suspend stored state nullable to ensure we don't break it 2021-09-16 16:12:14 +09:00
Dean Herbert
fa693bb8a8 Move MusicController adjustment set to inside OsuScreen itself (and result nullable) 2021-09-16 16:08:09 +09:00
Dean Herbert
45b07aa362 Add some basic animated textures to mania metric skin 2021-09-16 15:33:55 +09:00
Dan Balasescu
43379a2eaa
Merge pull request #14752 from peppy/realm-settings
Move (ruleset) settings to realm
2021-09-16 14:05:41 +09:00
Dean Herbert
4d4a9b86c1 Merge branch 'master' into mania-note-animations 2021-09-16 11:12:07 +09:00
AbstractQbit
9057be1a02 Remove unused usings 2021-09-16 01:30:53 +03:00
AbstractQbit
3cd3e133ce Move AllowTrackAdjustments test to TestSceneOsuScreenStack 2021-09-16 01:24:50 +03:00
AbstractQbit
30c458c662 Oops, fix not compiling test 2021-09-15 21:34:41 +03:00
AbstractQbit
318f0941ca Move all the "inherit previous AllowTrackAdjustments" logic into OsuScreen 2021-09-15 21:25:39 +03:00
Dean Herbert
931e873a7e
Merge branch 'master' into inheritable-allow-track-adjust 2021-09-15 22:26:13 +09:00
AbstractQbit
f0439ef50b Remove unnecessary AllowTrackAdjustments overrides, add true to SongSelect 2021-09-15 13:12:57 +03:00
Dean Herbert
8acfefed1b
Merge pull request #14741 from smoogipoo/fix-lounge-beatmaps-counter
Fix incorrect beatmap count and SR range in multi lounge
2021-09-15 18:51:52 +09:00
Dean Herbert
0d2ae0e4f2
Merge pull request #14750 from smoogipoo/fix-mania-tests-2
Fix mania hitobject tests
2021-09-15 18:37:02 +09:00
AbstractQbit
1181317c72 Fix issues found by code quality ci 2021-09-15 12:01:56 +03:00
Dean Herbert
d176804793
Merge pull request #14751 from smoogipoo/fix-match-footer-test-scene
Fix match footer test scene not working in test browser
2021-09-15 17:45:13 +09:00
AbstractQbit
9b101ea9eb Add a test for AllowTrackAdjustments 2021-09-15 11:40:23 +03:00
Dean Herbert
4f1db5af40 Attach migration memo to DatabasedSetting class for visibility 2021-09-15 17:25:07 +09:00
smoogipoo
cdb44d7239 Fix match footer test scene not working in visual testing 2021-09-15 17:16:11 +09:00
Dean Herbert
a1d325cb22 Mark key and value non-nullable (at realm end) and simplify Value logic 2021-09-15 17:16:05 +09:00
Dean Herbert
a150fb2996 Add nullability directive and make variant non-nullable 2021-09-15 17:16:05 +09:00
Dean Herbert
15e3f95c87 Remove remnants of DatabasedSetting from SkinInfo
This was never used
2021-09-15 17:12:04 +09:00
Dean Herbert
dcfe9c67e3 Make ruleset id non-nullable 2021-09-15 17:12:04 +09:00
Dean Herbert
80ecf81be3 Rename all databased setting classes to be specific to rulesets for now 2021-09-15 17:12:04 +09:00
Dean Herbert
520e550764 Bring back SettingsStore to avoid changing ruleset API for now
Also fixes some remaining test failures due to locally constructed
rulesets that are not being tracked by the game.
2021-09-15 17:12:02 +09:00
Dean Herbert
c36a67d06e Fix some tests failing due to using a locally constructed ruleset 2021-09-15 17:04:38 +09:00
Dean Herbert
5bb741b4e8 Remove migration of key bindings 2021-09-15 17:04:38 +09:00
smoogipoo
f54d554d30 Extract removal to method 2021-09-15 17:03:28 +09:00
AbstractQbit
48cf98ef93 Rephrase null meaning in IOsuScreen.AllowTrackAdjustments
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-09-15 11:00:49 +03:00
AbstractQbit
b87af3dd68 Move the inherited AllowTrackAdjustments into OsuScreen 2021-09-15 10:55:16 +03:00
Dean Herbert
2bcb3fd304 Add migration of existing settings 2021-09-15 16:31:13 +09:00