1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 14:12:54 +08:00
Commit Graph

44263 Commits

Author SHA1 Message Date
MBmasher
a8539bc75b Add newline to end of file 2021-09-15 19:04:36 +10:00
MBmasher
33e1273df8 Include Flashlight in total SR calculation 2021-09-15 19:03:42 +10: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
smoogipoo
cdb44d7239 Fix match footer test scene not working in visual testing 2021-09-15 17:16:11 +09:00
Dean Herbert
cab294ffa6
Merge pull request #14739 from smoogipoo/fix-spectator-random-mod
Fix random/target mods not working in spectator
2021-09-15 14:15:10 +09:00
Dean Herbert
623377772c
Merge branch 'master' into fix-spectator-random-mod 2021-09-15 13:55:28 +09:00
Dean Herbert
a2dcef7c0a Use local (or barebones BeatmapInfo) where feasible 2021-09-15 13:40:05 +09:00
smoogipoo
4b3ab42ffd Ensure beatmap is populated 2021-09-15 13:18:46 +09:00
Dean Herbert
1ba716d9f1
Merge pull request #14737 from bdach/editor-difficulty-switch-shared-state
Preserve current time and clipboard contents when switching between difficulties
2021-09-15 12:38:56 +09:00
Dan Balasescu
5c1e1d8150
Merge pull request #13986 from 02Naitsirk/display-sr-changes
Implement total SR formula that better correlates with pp
2021-09-15 10:43:29 +09:00
Dan Balasescu
5ea1924c30
Merge branch 'master' into display-sr-changes 2021-09-15 10:22:11 +09:00
Bartłomiej Dach
203f1b8862
Merge pull request #14668 from sh0ckR6/14421-multi-password-error-handling
Make response to failed multiplayer password attempt friendlier
2021-09-14 23:17:34 +02:00
Bartłomiej Dach
7b9e501fa0
Merge branch 'master' into 14421-multi-password-error-handling 2021-09-14 22:58:20 +02:00
Bartłomiej Dach
baf9961934
Amend xmldoc of shake extension method 2021-09-14 22:50:45 +02:00
Dean Herbert
57f8ccca16 Remove nullability from EditorState properties
Also update the xmldoc to not be specific to difficulty switching
2021-09-14 23:36:28 +09:00
Dean Herbert
f8bdca542d Make restoring state a public call on Editor 2021-09-14 23:36:17 +09:00
Dean Herbert
2a894e7a3f Make EditorLoader state private 2021-09-14 23:26:02 +09:00
smoogipoo
b807c161b4 Remove now-unused DI params 2021-09-14 17:25:57 +09:00
smoogipoo
6cffbee592 Fix random/target mods not working in spectator 2021-09-14 17:22:58 +09:00
Dean Herbert
5058f28504 Remove breaking padding 2021-09-14 14:52:50 +09:00
Dean Herbert
8865e3cab8 Add back shake and tweak transform of text 2021-09-14 14:44:32 +09:00
Dean Herbert
e17b800470 Move shake logic into extension method 2021-09-14 14:44:23 +09:00
Dean Herbert
7bd749d0eb Remove weird shaking 2021-09-14 14:19:55 +09:00
Dean Herbert
e3c56f9ebd Show error message in popover 2021-09-14 14:14:06 +09:00
Dean Herbert
6851e0000d Add test coverage 2021-09-14 14:06:24 +09:00
Dean Herbert
eaac2bad3d Fix incorrect child margin specifications 2021-09-14 13:49:02 +09:00
smoogipoo
3df4cbca2c Reduce precision of difficulty calculator tests 2021-09-14 13:45:10 +09:00
smoogipoo
81ced68f89 Merge branch 'master' into display-sr-changes 2021-09-14 13:32:58 +09:00
Bartłomiej Dach
cbb9ff1c49
Only run prompt-for-save test logic when relevant 2021-09-13 21:04:28 +02:00
Bartłomiej Dach
35ee889e5b
Restore clipboard content after difficulty switch 2021-09-13 21:04:27 +02:00
Bartłomiej Dach
79d0f4835e
Add failing tests for preserving clipboard content 2021-09-13 21:03:30 +02:00
Bartłomiej Dach
3fc72271f1
Restore editor clock time after difficulty switch 2021-09-13 20:59:31 +02:00
Bartłomiej Dach
80e54d51f2
Add failing test for preserving editor clock time 2021-09-13 20:56:36 +02:00
Bartłomiej Dach
52b1539dea
Merge pull request #14735 from AbstractQbit/fix-bar-hit-icons
Fix icon orientation for horizontal bar hit error meter
2021-09-13 19:03:42 +02:00
AbstractQbit
3c75094f43 Move BarHitErrorMeter's icon reorintation to Update() 2021-09-13 19:41:55 +03:00
AbstractQbit
7267602b95 Fix icon orientation for horizontal bar hit error meter 2021-09-13 17:14:39 +03:00
Dean Herbert
1e09f558d1
Merge pull request #14687 from Emil8250/master
Make "Reset bindings" button wider to accommodate to localisations better
2021-09-13 22:46:06 +09:00
Dean Herbert
07936bc88f
Merge pull request #14732 from AbstractQbit/fix-checkbox-nub-artefact
Fix dimmed checked nub artifact
2021-09-13 21:54:39 +09:00
AbstractQbit
9c1fc2ec65 Tweak filled nub border width value 2021-09-13 14:19:33 +03:00
Dean Herbert
4d2373ffb9 Combine similar value changed calls 2021-09-13 20:08:46 +09:00
AbstractQbit
0f5ed81a7a Fix dimmed checked nub artifact
This adds transition that extends nub's border to fill it.
Fill fade can be removed, but combined effect looks nicer imo,
and the fill is still needed because if removed, border
becomes invisible for some reason.
2021-09-13 13:31:13 +03:00
Dan Balasescu
f6c4bbe2c9
Merge pull request #14730 from peppy/add-missing-track-adjustment-defaults
Add missing screen level mod application settings for some screens
2021-09-13 15:22:22 +09:00
Dean Herbert
0c646f6dbd
Merge pull request #14694 from nekodex/no-avatar-click-sound
Don't play hover/select sounds for UpdatableAvatar unless it's clickable
2021-09-13 15:14:43 +09:00
Dean Herbert
f9c82a9098
Merge pull request #14676 from nekodex/lobby-team-swap
Add sound for multiplayer team swaps
2021-09-13 15:01:58 +09:00
Dean Herbert
caf7ef6519 Add missing screen level mod application settings for some screens
Closes #7480. But based on discussion in there this solution may change.
2021-09-13 15:00:34 +09:00
Dean Herbert
901a632494
Merge pull request #14723 from bdach/editor-test-scenes-through-loader
Integrate `EditorLoader` into `EditorTestScene`
2021-09-13 14:22:56 +09:00
Dean Herbert
52c69d2f22 Adjust value to not be full width (but allow for more accommodations with localised versions) 2021-09-13 14:17:45 +09:00
Dean Herbert
684c39dad0 Update resources 2021-09-13 14:12:37 +09:00
Dean Herbert
7fe0eefb78 Add inline comment regarding team switch sample logic
Feels a bit convoluted without this. Don't really have a better
suggestion for now so a comment will do.
2021-09-13 14:12:19 +09:00
Dean Herbert
65fdceee79
Merge branch 'master' into editor-test-scenes-through-loader 2021-09-13 14:02:55 +09:00