1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 02:17:46 +08:00
Commit Graph

38153 Commits

Author SHA1 Message Date
OliBomby
a4c6850ab2 made the SampleControlPoint and DifficultyControlPoint obsolete 2023-04-25 11:34:09 +02:00
Dean Herbert
e330052852 Add second definition of EndTime for storyboard elements to account for loops in lifetime 2023-04-25 15:22:11 +09:00
Dean Herbert
3919400be2 Apply NRT to some storyboard classes 2023-04-25 14:30:01 +09:00
Hy0tic
80301f0fc9 Merge https://github.com/Hy0tic/osu 2023-04-22 13:32:41 -04:00
Hy0tic
56ab029a58 fix issue where multipler does not update when adjusting speed for preset mod 2023-04-22 13:30:08 -04:00
Daniel Kirschten
6c9a90d1ec
Merge branch 'master' into master 2023-04-22 19:23:52 +02:00
Haspamelodica
e90660c1a4 Switched to lowercase 2023-04-21 02:35:28 +02:00
Haspamelodica
b62de5514c Fixed video importing bug #23259 2023-04-21 02:10:24 +02:00
Dean Herbert
1066dfcbf6 Change default beat divisor to 4
This matches stable, and is a much saner default value.

Will apply to new beatmaps and also beatmaps which don't specify a snap
value in the `.osu` file.
2023-04-20 14:35:13 +09:00
Dean Herbert
9f4b1f0f24 Always round editor rotation to integer values 2023-04-20 14:30:01 +09:00
Joseph Madamba
776c4cfaad
Ensure selected field is correct in updateSelectionState()
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-04-19 18:34:35 -07:00
Dean Herbert
01260e5f54 Merge branch 'master' into shader-cache-stages 2023-04-19 20:47:34 +09:00
Dean Herbert
760ef10145 Update framework 2023-04-19 00:04:21 +09:00
Dean Herbert
ee5658c15a
Merge pull request #23222 from peppy/update-framework-resources
Update framework and resources
2023-04-18 14:10:42 +09:00
Dean Herbert
26a2d1fdea
Merge pull request #23000 from Joehuu/fix-beatmap-terminology
Fix song select matching label not using right terminology
2023-04-18 13:53:05 +09:00
Joseph Madamba
c80a25328d
Shorten label to just "matches" 2023-04-17 20:59:41 -07:00
Joseph Madamba
16df92f405
Fix sets not being plural 2023-04-17 20:59:02 -07:00
Dan Balasescu
c0a25144cf Apply changes to custom ShaderManager 2023-04-18 11:31:56 +09:00
Dean Herbert
c3f3b8db7c Update resources 2023-04-17 23:09:46 +09:00
Dean Herbert
fbb15fff26 Update framework 2023-04-17 23:03:16 +09:00
Dean Herbert
7aeab174eb
Merge pull request #23185 from bdach/nested-result-revert
Invoke `RevertResult` on parent DHO when nested DHO is reverted
2023-04-12 23:08:10 +09:00
Bartłomiej Dach
e72f103c17
Do not look up metadata for locally-modified beatmaps on save 2023-04-11 23:14:35 +02:00
Bartłomiej Dach
db86ced4b4
Invoke RevertResult on parent DHO when nested DHO is reverted
The behaviour described above was removed in
812a4b412a, thus henceforth
contradicting `RevertResult`'s xmldoc. As it is relied on by some
external rulesets, bring it back to unbreak them.
2023-04-11 18:29:08 +02:00
Joseph Madamba
d0cbe206a9
Revert back to one number with "matching beatmap difficulties" label 2023-04-10 23:37:29 -07:00
Joseph Madamba
f0c8a3202b
Merge remote-tracking branch 'upstream/master' into fix-beatmap-terminology 2023-04-10 23:22:15 -07:00
Dean Herbert
52bb7891f7
Merge branch 'master' into fix-count-not-updating-when-deleting 2023-04-11 09:04:02 +09:00
Joseph Madamba
f80de08f24
Adjust BeatmapSetsChanged xmldoc
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2023-04-10 11:28:23 -07:00
Joseph Madamba
c7dea71793
Use existing BeatmapSetsChanged action 2023-04-10 11:26:18 -07:00
Dean Herbert
8757276c37
Merge pull request #23156 from Micha-ohne-el/editor-selection-rotation-snapping
Add rotation snapping to editor selection
2023-04-11 00:45:44 +09:00
Dean Herbert
52c4703261
Merge pull request #23103 from Joehuu/normalise-overlay-padding
Normalise horizontal padding on overlays
2023-04-10 23:48:59 +09:00
Bartłomiej Dach
1f2c96c8e8
Merge branch 'master' into gd-onlinesetoverlay 2023-04-10 15:35:03 +02:00
Bartłomiej Dach
11fd93a2ba
Inline disturbing getGuestMapper() method
Disturbing because name suggests pure method, but it is in fact `void`
and also performs side effects by about the most confusing means
possible.
2023-04-10 15:20:43 +02:00
Bartłomiej Dach
73bd0feef5
Fix incorrectly implemented localisation 2023-04-10 15:03:33 +02:00
Bartłomiej Dach
6fec476147
Simplify snap implementation 2023-04-10 14:55:30 +02:00
Bartłomiej Dach
ead5e9f027
Merge branch 'master' into editor-inspector 2023-04-10 14:29:05 +02:00
Bartłomiej Dach
60358c7203
Perform first inspector text update immediately
Provides better and more consistent initial state for the inspector.
2023-04-10 14:13:53 +02:00
Bartłomiej Dach
641415ca32
Unify displayed duration format for single/multiple selection 2023-04-10 14:05:32 +02:00
Joseph Madamba
7f5b99c91b
Fix song select beatmap difficulty count not updating when deleting 2023-04-09 22:12:51 -07:00
Dan Balasescu
15f6bc155e Add progressive score multiplier for HT 2023-04-10 13:35:48 +09:00
Dan Balasescu
c923482976 Add progressive score multiplier for DT 2023-04-10 13:31:48 +09:00
Dean Herbert
8d2e852ffd Fix overbearing key down handling 2023-04-08 22:30:36 +09:00
Dean Herbert
a1fc4def1d Remove redundant method override 2023-04-08 22:18:07 +09:00
Micha Lehmann
3c4a25e53f Fix tooltip text not resetting when ending an editor rotation 2023-04-08 14:28:52 +02:00
Micha Lehmann
580d5745c0 Add "(snapped)" to the tooltip when snap-rotating in the editor 2023-04-08 14:15:49 +02:00
Joseph Madamba
a86a968fac
Use public BeatmapSet to match other usages 2023-04-07 21:16:36 -07:00
Joseph Madamba
ed208ef127
Fix more typos and adjust font size to match web 2023-04-07 21:10:37 -07:00
Dean Herbert
f72dd86b42 Fix code quality issues and avoid updating bindable twice per operation 2023-04-08 10:40:36 +09:00
Micha Lehmann
c827c2810b Improve editor selection rotation value wrapping
This fixes two issues the previous algorithm had:
1.  A half-turn rotation used to show up as -180°.
2.  Rotating more than 180° in one drag event would overwhelm it
    and cause the value to go outside its range.

This comes at the cost of a negligible performance hit,
since a division (modulo) is performed instead of just addition/subtraction.
2023-04-08 01:30:29 +02:00
Micha Lehmann
f1de560d57 Snap editor selection rotation when holding shift 2023-04-08 01:30:29 +02:00
Dean Herbert
0c71fa1bbd
Merge branch 'master' into gameplay/argon-key-counter_le-retour 2023-04-06 23:39:57 +09:00
Dean Herbert
ad717d2368 Fix scheduled calls piling up during transactions 2023-04-06 23:39:36 +09:00
Andrei Zavatski
ed565b1e59 Fix SampleStore isn't being disposed 2023-04-06 11:40:04 +03:00
Dean Herbert
e6872629f3
Merge pull request #22868 from peppy/no-epilepsy-warning-storyboard-disable
Don't show epilepsy warning when storyboards are disabled
2023-04-06 12:32:38 +09:00
tsrk
809b817e8e
Merge branch 'master' into gameplay/argon-key-counter_le-retour 2023-04-05 22:57:36 +02:00
Bartłomiej Dach
ba753a8aac
Merge branch 'master' into update-skinnable-sound-before-playing 2023-04-05 22:56:25 +02:00
Bartłomiej Dach
27055919a3
Merge branch 'master' into fix-old-beatmap-crash-on-load 2023-04-05 21:39:42 +02:00
Bartłomiej Dach
6df7614b9d
Add tests for suppressing epilepsy warning when storyboard disabled 2023-04-05 20:56:50 +02:00
Bartłomiej Dach
e5d57a65c9
Fix incorrect indent 2023-04-05 19:47:25 +02:00
Bartłomiej Dach
432f698697
Merge branch 'master' into gameplay/key-counter-abstraction 2023-04-05 19:45:14 +02:00
Dean Herbert
9c8b25e034 Fix display not always updating when expected by updating on a schedule 2023-04-05 13:45:24 +09:00
Dean Herbert
f07d859532 Optimise how often we update the display 2023-04-04 19:31:33 +09:00
Dean Herbert
3209b09270 Move inspector into own file 2023-04-04 19:17:34 +09:00
Dean Herbert
4aed483005 Tidy up dependency resolution 2023-04-04 19:14:30 +09:00
Dean Herbert
195b5fc3f1 Add view for selections of size != 1 2023-04-04 19:11:48 +09:00
Dean Herbert
b0d5761667 Add object type 2023-04-04 19:05:50 +09:00
Dean Herbert
c356c163fa Add hit object inspector view 2023-04-04 19:03:45 +09:00
Dean Herbert
f9ebdadfe8 Move right-side editor toolbox to base HitObjectComposer
Move right-side editor toolbox to base `HitObjectComposer`
2023-04-04 19:00:56 +09:00
Bartłomiej Dach
1a5707b65f
Merge pull request #22878 from peppy/fix-replay-fail-on-exit
Ensure replays don't enter a failed state when exiting gameplay
2023-04-03 22:38:32 +02:00
Bartłomiej Dach
8cc425774b
Merge branch 'master' into fix-replay-fail-on-exit 2023-04-03 21:23:23 +02:00
Bartłomiej Dach
7dfd903b76
Merge branch 'master' into fix-debug-perf-drd 2023-04-03 21:04:18 +02:00
Bartłomiej Dach
b5d9284de2
Merge pull request #23108 from peppy/fix-overlay-toggles-during-disclaimer
Fix attempting to show overlay during game intro playing hide sound effects
2023-04-03 20:48:03 +02:00
cdwcgt
9dd30e4b4c
condition fix 2023-04-03 20:24:38 +09:00
cdwcgt
735b48679e
use LinkFlowContainer directly 2023-04-03 20:09:49 +09:00
cdwcgt
41c01d3929
nullable condition 2023-04-03 20:07:21 +09:00
cdwcgt
51240ed46b
typo 2023-04-03 19:51:22 +09:00
Dean Herbert
7011928d86 Fix abysmal debug performance due to try-catch logic in DrawableRulesetDependencies 2023-04-03 18:04:33 +09:00
Dean Herbert
b0c09df259 Merge branch 'master' into gameplay/key-counter-abstraction 2023-04-03 15:33:35 +09:00
Dean Herbert
43d7386623
Merge pull request #22926 from Joehuu/fix-sort-direction-not-resetting
Fix beatmap listing sort direction not resetting when changing criteria
2023-04-03 15:32:10 +09:00
Dean Herbert
e4eb736622
Merge pull request #22929 from Joehuu/fix-loading-blocking-overlay-headers
Fix beatmap listing filter control being blocked by loading layer
2023-04-03 15:29:38 +09:00
Dean Herbert
a097433cb1 Fix overlay toggle keys working during disabled activation modes
Closes #23104.
2023-04-03 15:03:47 +09:00
Joseph Madamba
247d426c8a
Add horizontal padding to currently playing search textbox 2023-04-02 20:50:18 -07:00
Joseph Madamba
436f1e4ae4
Replace other hardcoded horizontal padding with const
- Also add overlay stream item padding const and account for it
2023-04-02 20:50:18 -07:00
Joseph Madamba
af389b1107
Replace all hardcoded 50 horizontal padding with const 2023-04-02 20:50:18 -07:00
Joseph Madamba
7a0edabd5d
Normalise overlay horizontal padding const 2023-04-02 20:24:13 -07:00
Dean Herbert
daf9f19b29
Merge pull request #23098 from Joehuu/update-vote-pill-hover
Update comment vote pill in line with web
2023-04-03 12:01:46 +09:00
Dean Herbert
8932668f77 Update framework 2023-04-03 10:31:47 +09:00
Joseph Madamba
63ea17f10e
Update comment vote pill in line with web 2023-04-02 18:17:40 -07:00
Susko3
c3a6a58169 Fix window mode dropdown not showing 2023-04-02 19:23:18 +02:00
Dean Herbert
1e0b64c9e8 Update framework (again) 2023-04-02 23:07:40 +09:00
cdwcgt
d949ef3ca4
make guestMapperContainer private
tests don't use it
2023-04-02 22:53:15 +09:00
cdwcgt
2cf8636366
show guest diff author in BeatmapPicker 2023-04-02 22:25:58 +09:00
Dean Herbert
4c2b7e7788 Fix random inspection showing up only in CI 2023-04-02 21:05:20 +09:00
Dean Herbert
cf5acbf66e Update usage of SupportedWindowModes 2023-04-02 20:16:14 +09:00
Dean Herbert
0f0dd9f2dc Update resources 2023-04-02 20:07:33 +09:00
Dean Herbert
7f9bf09e03 Update framework 2023-04-02 20:07:31 +09:00
Dean Herbert
4b294278d6 Merge branch 'master' into fix-ruleset-shader-caching 2023-03-31 20:04:55 +09:00
Dean Herbert
1277c8eb5a
Merge branch 'master' into debug-use-en-localisation-fallbacks 2023-03-31 17:26:56 +09:00
Dan Balasescu
4b7d44c329
Remove unused using 2023-03-31 16:23:56 +09:00
Dan Balasescu
28f31ef379
Adjust comment slightly 2023-03-31 16:23:37 +09:00
Dan Balasescu
d5b8a45541
Always use fallback strings for English
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-03-31 16:20:16 +09:00
Bartłomiej Dach
bfbb5ab96b
Merge branch 'master' into fix-fail-progression-to-results 2023-03-30 21:40:49 +02:00
Dean Herbert
796cd9c916 Rewrite comment explaining early return on checkScoreCompleted given new usages 2023-03-31 02:36:17 +09:00
Dean Herbert
b25a59fd14 Rename scoreCompleted -> checkScoreCompleted to reflect the fact it doesn't always succeed 2023-03-31 02:30:04 +09:00
cdwcgt
5d395e6d37
move to ctor 2023-03-29 22:59:54 +09:00
cdwcgt
19b7036b95
use same same duration
negligence in migrating code
2023-03-29 22:56:35 +09:00
cdwcgt
e85c28031e
change weird name 2023-03-29 22:55:25 +09:00
Dean Herbert
72c5c9848f Always use LocalisableString fallbacks when deploying debug and viewing english
This allows changes to `xxxStrings.cs` files to immediately reflect in
the UI, which is (at least for me) an expectation.
2023-03-29 14:44:43 +09:00
Dean Herbert
c7003434b2 Fix localisation for audio device error containing incorrect newline escaping 2023-03-29 14:33:10 +09:00
Dean Herbert
4dd0c2c7a5 Add assert ensuring we don't ever get to the results screen with an F rank
Intentionally an assertion as I want tests to fail, but I don't want
this to cause crashes for an end user if it does happen to occur.
2023-03-29 14:11:58 +09:00
Dean Herbert
a8bb2e33ac Ensure all preconditions are checked before progressing to results screen after storyboard ends 2023-03-29 14:00:11 +09:00
Dean Herbert
aad540629f Remove duplicate load rule from ShaderPrecompiler 2023-03-29 12:36:56 +09:00
cdwcgt
46ede27869
add feature to adjust ScalingContainer background dim 2023-03-28 22:41:24 +09:00
Dean Herbert
8c1df3c8d9 Fix web account registration not bypassing the URL warning 2023-03-28 15:38:19 +09:00
Dean Herbert
0d77ec013a Fix ruleset-local shader manager not correctly falling back to existing cached shaders 2023-03-28 15:00:49 +09:00
Dean Herbert
5dfac02b11 Preload triangle shader on startup 2023-03-28 14:15:38 +09:00
Dean Herbert
c742b3f0a8 Update DrawableRulesetDependencies xmldoc to read more correctly 2023-03-28 14:15:19 +09:00
Joseph Madamba
8b30c67580
Fix incorrect song select matching label by showing both beatmap and difficulty count for less ambiguity 2023-03-26 18:08:28 -07:00
Joseph Madamba
76a6f97fbb
Fix wrong definition of a beatmap in first run setup 2023-03-26 17:32:03 -07:00
Joseph Madamba
3e0bbb2432
Fix select beatmap button not highlighting when creating a multiplayer room using keyboard 2023-03-26 16:03:21 -07:00
Dean Herbert
6924dc5c50 Update framework 2023-03-27 02:16:33 +09:00
Dean Herbert
898717231b Hide vulkan renderer option for now
We'll bring it back when it's more stable.
2023-03-27 02:00:10 +09:00
Bartłomiej Dach
292486c25a
Use more resilient restore method 2023-03-26 14:35:00 +02:00
Bartłomiej Dach
f3c174a7f2
Fix test errors due to missing dependencies 2023-03-26 13:52:26 +02:00
Dean Herbert
bab93bed17 Fix string interpolation and use GetDescription on renderer value 2023-03-26 20:43:28 +09:00
Dean Herbert
ba078e8357 Show "automatic" resolved renderer inline in dropdown instead 2023-03-26 20:29:30 +09:00
Dean Herbert
764361b3d3 Add special case to hide definitely non-working renderers on android 2023-03-26 20:14:33 +09:00
Dean Herbert
e346b02ebf Add display of current renderer 2023-03-26 20:09:35 +09:00
Dean Herbert
91da546ba2 Merge branch 'master' into add-renderer-selection 2023-03-26 19:33:15 +09:00
Dean Herbert
c803eb8e04 Update framework 2023-03-26 16:14:15 +09:00
Dean Herbert
d31b37e87e Merge branch 'master' into fix-ubo-not-bound 2023-03-26 16:14:11 +09:00
Joseph Madamba
eaef5ff2a3
Fix now playing playlist not highlighting selected item on initial open 2023-03-25 22:13:51 -07:00
Joseph Madamba
e1906a90eb
Use image@2x from tournament banner api 2023-03-25 13:08:46 -07:00
Joseph Madamba
450c5cef07
Add comment explaining loading container padding 2023-03-24 18:42:34 -07:00
Terochi
e6f1ec57a9 Bring back and make use of clearPreviousSamples() 2023-03-23 18:46:48 +01:00
Dean Herbert
ab6cfea5c7
Revert old value instead of always using default
Co-authored-by: cdwcgt <loginchen@outlook.com>
2023-03-23 11:27:05 +09:00
Dean Herbert
3050a16bf8 Don't require a restart when selecting Automatic and startup setting was also automatic 2023-03-22 16:56:36 +09:00
Dean Herbert
aabe86dc26 Limit renderers to those available for the current platform 2023-03-22 16:49:29 +09:00
Dean Herbert
956fabb445 Show restart notice when changing renderer 2023-03-22 16:49:29 +09:00
Dean Herbert
13be709718 Add basic renderer selection 2023-03-22 16:49:29 +09:00
Dean Herbert
ad5bdf6511 Merge branch 'master' into fix-ubo-not-bound 2023-03-22 16:46:39 +09:00
Dean Herbert
9bc6b46e4e Update framework 2023-03-22 16:36:05 +09:00
Joseph Madamba
6f3bb85eaa
Always show down arrow on inactive sort buttons 2023-03-22 00:19:23 -07:00
Dean Herbert
425be20e46 Fix song select search textbox font size incorrectly having increased 2023-03-22 14:17:39 +09:00
Joseph Madamba
d9571b6fc9
Move filter control property setters to load() 2023-03-21 21:31:35 -07:00
Joseph Madamba
74a15d7424
Fix overlay headers being blocked by loading layer 2023-03-21 20:32:26 -07:00
Joseph Madamba
e1fb63e1f3
Move beatmap listing filter control to header 2023-03-21 20:32:26 -07:00
Terochi
1478a26cc0 Addressed changes 2023-03-21 23:15:49 +01:00
Joseph Madamba
3cd01ee621
Fix beatmap listing sort direction not resetting when changing criteria 2023-03-21 15:08:37 -07:00
Joseph Madamba
df3ccdff9f
Add failing beatmap listing sort direction on criteria change test 2023-03-21 15:08:37 -07:00
Bartłomiej Dach
9ff9cd3b7f
Merge branch 'master' into skin-editor-cyclic-selection 2023-03-21 19:49:55 +01:00