Commit Graph

38048 Commits

Author SHA1 Message Date
61b62b35f5 Merge pull request #18626 from ggliv/decouple-mod-fails
Allow ModFailCondition to arbitrarily trigger failures
2023-04-26 16:19:42 +09:00
cb7b246e33 Fix naming and update in line with nullability 2023-04-26 15:27:58 +09:00
210c5e7c53 Merge branch 'master' into decouple-mod-fails 2023-04-26 15:26:20 +09:00
6a3b587374 Merge pull request #23260 from Haspamelodica/master
Fix some videos with uppercase file extensions not displaying correctly in-game
2023-04-26 14:29:25 +09:00
5ec8ecb11b Merge pull request #23309 from peppy/key-counters-fix
Fix key counters counting during break time
2023-04-25 21:15:12 +02:00
54e8aa8fe9 Merge branch 'master' into master 2023-04-25 16:04:02 +02:00
14af2063e5 Merge pull request #23247 from peppy/round-editor-rotation
Always round editor rotation to integer values
2023-04-25 21:43:44 +09:00
e08d7daffd Don't show decimal point in tooltip 2023-04-25 21:43:14 +09:00
6b4032e34b Add missing binding of IsCounting with contained counters 2023-04-25 21:37:19 +09:00
0a861ffcee Restructure key counters to use a common flow 2023-04-25 21:37:19 +09:00
7630958633 Stop using Drawable.Name to convey actual UI information 2023-04-25 20:24:36 +09:00
dd2c289ce9 Remove pointless default value 2023-04-25 20:22:12 +09:00
d8b4db3a13 Merge branch 'master' into gameplay/argon-key-counter_le-retour 2023-04-25 19:54:31 +09:00
6c9a90d1ec Merge branch 'master' into master 2023-04-22 19:23:52 +02:00
e90660c1a4 Switched to lowercase 2023-04-21 02:35:28 +02:00
b62de5514c Fixed video importing bug #23259 2023-04-21 02:10:24 +02:00
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
9f4b1f0f24 Always round editor rotation to integer values 2023-04-20 14:30:01 +09:00
01260e5f54 Merge branch 'master' into shader-cache-stages 2023-04-19 20:47:34 +09:00
760ef10145 Update framework 2023-04-19 00:04:21 +09:00
ee5658c15a Merge pull request #23222 from peppy/update-framework-resources
Update framework and resources
2023-04-18 14:10:42 +09:00
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
c80a25328d Shorten label to just "matches" 2023-04-17 20:59:41 -07:00
16df92f405 Fix sets not being plural 2023-04-17 20:59:02 -07:00
c0a25144cf Apply changes to custom ShaderManager 2023-04-18 11:31:56 +09:00
c3f3b8db7c Update resources 2023-04-17 23:09:46 +09:00
fbb15fff26 Update framework 2023-04-17 23:03:16 +09:00
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
e72f103c17 Do not look up metadata for locally-modified beatmaps on save 2023-04-11 23:14:35 +02:00
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
d0cbe206a9 Revert back to one number with "matching beatmap difficulties" label 2023-04-10 23:37:29 -07:00
f0c8a3202b Merge remote-tracking branch 'upstream/master' into fix-beatmap-terminology 2023-04-10 23:22:15 -07:00
52bb7891f7 Merge branch 'master' into fix-count-not-updating-when-deleting 2023-04-11 09:04:02 +09:00
f80de08f24 Adjust BeatmapSetsChanged xmldoc
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2023-04-10 11:28:23 -07:00
c7dea71793 Use existing BeatmapSetsChanged action 2023-04-10 11:26:18 -07:00
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
52c4703261 Merge pull request #23103 from Joehuu/normalise-overlay-padding
Normalise horizontal padding on overlays
2023-04-10 23:48:59 +09:00
1f2c96c8e8 Merge branch 'master' into gd-onlinesetoverlay 2023-04-10 15:35:03 +02:00
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
73bd0feef5 Fix incorrectly implemented localisation 2023-04-10 15:03:33 +02:00
6fec476147 Simplify snap implementation 2023-04-10 14:55:30 +02:00
ead5e9f027 Merge branch 'master' into editor-inspector 2023-04-10 14:29:05 +02:00
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
641415ca32 Unify displayed duration format for single/multiple selection 2023-04-10 14:05:32 +02:00
7f5b99c91b Fix song select beatmap difficulty count not updating when deleting 2023-04-09 22:12:51 -07:00
15f6bc155e Add progressive score multiplier for HT 2023-04-10 13:35:48 +09:00
c923482976 Add progressive score multiplier for DT 2023-04-10 13:31:48 +09:00
8d2e852ffd Fix overbearing key down handling 2023-04-08 22:30:36 +09:00
a1fc4def1d Remove redundant method override 2023-04-08 22:18:07 +09:00
3c4a25e53f Fix tooltip text not resetting when ending an editor rotation 2023-04-08 14:28:52 +02:00