1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 13:47:33 +08:00
Commit Graph

59757 Commits

Author SHA1 Message Date
Terochi
d1d4b54c64 Simplified 2023-05-03 18:31:35 +02:00
Terochi
332c199dc2 further simplification 2023-04-26 10:46:29 +02:00
Dean Herbert
27f81288ef
Merge branch 'master' into keep-shared-settings-ruleset-change 2023-04-26 15:51:31 +09:00
Dean Herbert
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
Terochi
8e297dc60a Added safety measures for invalid mod combinations 2023-04-25 21:28:03 +02:00
Bartłomiej Dach
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
Terochi
0841e73a39 Improved readability and sounds 2023-04-25 21:07:17 +02:00
Bartłomiej Dach
196b5b41eb
Also disable counting on argon display in test
Mostly for my own peace of mind.
2023-04-25 20:17:57 +02:00
Bartłomiej Dach
753fa09356
Fix test failures due to type mismatch 2023-04-25 20:10:11 +02:00
Daniel Kirschten
54e8aa8fe9
Merge branch 'master' into master 2023-04-25 16:04:02 +02:00
Dean Herbert
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
Dean Herbert
e08d7daffd Don't show decimal point in tooltip 2023-04-25 21:43:14 +09:00
Dean Herbert
6b4032e34b Add missing binding of IsCounting with contained counters 2023-04-25 21:37:19 +09:00
Dean Herbert
0a861ffcee Restructure key counters to use a common flow 2023-04-25 21:37:19 +09:00
Dean Herbert
0c3a015953 Fix key counter test not testing the full binding of IsCounting 2023-04-25 21:37:19 +09:00
Dean Herbert
807a139877
Merge pull request #22655 from ItsShamed/gameplay/argon-key-counter_le-retour
Implement new design of Key Counter
2023-04-25 21:11:04 +09:00
Dean Herbert
7630958633 Stop using Drawable.Name to convey actual UI information 2023-04-25 20:24:36 +09:00
Dean Herbert
dd2c289ce9 Remove pointless default value 2023-04-25 20:22:12 +09:00
Dean Herbert
d8b4db3a13
Merge branch 'master' into gameplay/argon-key-counter_le-retour 2023-04-25 19:54:31 +09:00
Daniel Kirschten
6c9a90d1ec
Merge branch 'master' into master 2023-04-22 19:23:52 +02:00
Bartłomiej Dach
36113f60b7
Merge pull request #23248 from peppy/default-beat-divisor
Change default beat divisor to 1/4 snap
2023-04-22 19:23:18 +02:00
Haspamelodica
3166f88c17 Removed unneccessary using directive 2023-04-21 10:11:47 +02:00
Haspamelodica
e9fb836e9c Added tests for video backgrounds 2023-04-21 03:24:11 +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
Dean Herbert
cc96d275c2
Merge pull request #23228 from smoogipoo/shader-cache-stages
Apply framework changes to custom ShaderManager
2023-04-19 21:49:21 +09: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
Dean Herbert
c326a98af5
Merge pull request #23189 from bdach/do-not-lookup-local-beatmaps
Do not look up metadata from online sources for locally-modified beatmaps on save
2023-04-12 21:55: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
Bartłomiej Dach
0cc92ce5f9
Add failing test case
Covering nested object reverts not firing the parent's `RevertResult`
event in accordance with what the xmldoc of the event states.
2023-04-11 18:24:34 +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
e58e1151f3
Merge pull request #23178 from Joehuu/fix-count-not-updating-when-deleting
Fix song select beatmap difficulty count not updating when deleting
2023-04-11 09:46:41 +09: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