Endrik Tombak
5a118cfdc3
Merge branch 'master' of https://github.com/ppy/osu into carousel-perform-selection
...
Conflicts:
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
2022-10-24 21:40:48 +03:00
Bartłomiej Dach
6ac7518df4
Merge pull request #20904 from peppy/fix-tournament-seeding-editor-crash
...
Fix crash when exiting seeding editor too soon
2022-10-24 19:25:20 +02:00
Bartłomiej Dach
3f6b8ec38c
Merge branch 'master' into fix-tournament-seeding-editor-crash
2022-10-24 18:50:49 +02:00
Dean Herbert
e3e88d0d50
Merge pull request #19048 from ggliv/directoryselector-hidden-toggle
...
Add hidden item toggle to directory/file selectors
2022-10-24 16:28:47 +09:00
Dean Herbert
14704fd07c
Fix crash when exiting seeding editor too soon
...
Closes https://github.com/ppy/osu/issues/20783 .
2022-10-24 16:08:50 +09:00
Dean Herbert
f08270f6b0
Fix incorrect maxBaseScore accounting due to silly oversight
2022-10-24 15:54:09 +09:00
Dean Herbert
247cf589aa
Merge branch 'master' into directoryselector-hidden-toggle
2022-10-24 15:33:10 +09:00
Dean Herbert
995216cced
Merge pull request #20819 from Joppe27/taiko-kiai-flashing
...
Implement taiko hitobject kiai flashing
2022-10-24 15:31:13 +09:00
Dean Herbert
1d5df15027
Add ability to use Shift+Number to set current beat divisor in editor
2022-10-24 15:20:15 +09:00
Dean Herbert
d0e6bda9ef
Stop HitObjectComposer from handling Shift+Number keys
2022-10-24 15:19:36 +09:00
Dean Herbert
e72a71a28e
Add simple editor "duplicate objects" key binding
2022-10-24 14:01:34 +09:00
Dean Herbert
e9b3048a8b
Change the order of global bindings to give overlays lowest priority
2022-10-24 13:58:00 +09:00
Dan Balasescu
83dd295b22
Merge pull request #20899 from peppy/fix-tournament-point-deserialisation
...
Fix point conversion not using invariant culture
2022-10-24 13:32:48 +09:00
Dean Herbert
889c2978d7
Fix point conversion not using invariant culture
...
This was only the case in a fallback path (ie. when the user provides a
`json` file with an old or computed format from an external source).
Closes #20844 .
2022-10-24 13:15:00 +09:00
Bartłomiej Dach
a55f91f54b
Merge branch 'master' into read-current-distance-snap
2022-10-24 00:15:15 +02:00
Bartłomiej Dach
4ad669e729
Merge pull request #20811 from cdwcgt/taiko-compose
...
Fix placement preview not showing in timeline of osu!taiko editor
2022-10-23 20:27:54 +02:00
Bartłomiej Dach
819e598d23
Merge branch 'master' into taiko-compose
2022-10-23 19:54:20 +02:00
Bartłomiej Dach
a094225bc5
Merge pull request #20850 from peppy/fix-editor-distanct-snap-sv-accounting
...
Change distance snap to never account for slider velocity
2022-10-23 19:20:15 +02:00
Bartłomiej Dach
c0709a59f5
Merge branch 'master' into argon-spinner-sides
2022-10-23 18:44:04 +02:00
Bartłomiej Dach
3a6a87db0f
Merge branch 'master' into fix-editor-distanct-snap-sv-accounting
2022-10-23 18:42:08 +02:00
Dean Herbert
bff82a71a9
Merge pull request #20872 from Susko3/fix-android-startup-crash
...
Downgrade AutoMapper to fix Android startup crash
2022-10-23 12:00:45 +09:00
Susko3
a35026d537
Downgrade AutoMapper to fix Android startup crash
2022-10-22 23:29:44 +02:00
sw1tchbl4d3
e8960ba53b
whitespace removal
2022-10-22 22:46:19 +02:00
sw1tchbl4d3
f4db2c1ff4
Add test
2022-10-22 22:38:04 +02:00
cdwcgt
f14d871f97
let TaikoSpan show in timeline before placed
2022-10-23 01:32:22 +09:00
cdwcgt
a74e873b98
remove useless using
2022-10-23 01:13:29 +09:00
Dean Herbert
c195c13bcc
Merge pull request #20852 from peppy/update-framework
...
Update framework
2022-10-22 23:52:44 +09:00
Dean Herbert
9155fcf3cb
Update framework
2022-10-22 23:25:08 +09:00
Dean Herbert
3d37a67590
Update framework
2022-10-22 14:15:17 +09:00
Salman Ahmed
b0a4cd4f30
Inline content creation in base add method
2022-10-22 03:43:14 +03:00
Salman Ahmed
90a9961a69
Add visual test case for report button
...
Makes it much easier to test button/popover design changes
2022-10-22 02:50:59 +03:00
Salman Ahmed
6c82bc36ed
Encapsulate report logic inside button implementation
...
Avoids complicating the `DrawableComment` class, and allows for isolated
testability.
2022-10-22 02:48:27 +03:00
Salman Ahmed
9b5e35d599
Remove dependency on DrawableComment from report popover and simplify logic
...
Allows for testing the button and popover in isolation.
2022-10-22 02:47:33 +03:00
Salman Ahmed
081cf1cc47
Adjust comment report popover design
2022-10-22 02:45:31 +03:00
Bartłomiej Dach
9ca41b3054
Merge pull request #20855 from frenzibyte/ban-char-lower-upper
...
Ban `char.ToLower()`/`char.ToUpper()` as well for better safety
2022-10-21 23:20:16 +02:00
Bartłomiej Dach
2d00658bf1
Merge branch 'master' into ban-char-lower-upper
2022-10-21 22:08:29 +02:00
Salman Ahmed
0491b1fd18
Merge branch 'master' into update-framework
2022-10-21 22:39:56 +03:00
Salman Ahmed
0148f25171
Merge pull request #20848 from peppy/fix-settings-volume-sliders-double-samples
...
Fix adjusting volume via settings playing tick samples twice
2022-10-21 22:07:16 +03:00
Salman Ahmed
678bfb2caa
Ban char.ToLower()/char.ToUpper() as well for better safety
2022-10-21 20:56:34 +03:00
Dean Herbert
c1ed775deb
Update framework
2022-10-21 23:36:16 +09:00
Dean Herbert
f516e32949
Improve UI a bit
2022-10-21 23:35:53 +09:00
Dean Herbert
bb921ff9a7
Fix incorrect current DS value when inside a slider
2022-10-21 23:35:47 +09:00
ansel
15aeb4a137
Display text in buttons flow instead of toast
2022-10-21 17:25:41 +03:00
Dean Herbert
f6de366766
Combine display and button into one control
2022-10-21 23:21:07 +09:00
Dean Herbert
645a84b1d6
Display current distance snap and add button to update to use it
2022-10-21 22:58:36 +09:00
Dean Herbert
bace3df4ca
Update test assertions in line with change
2022-10-21 22:58:10 +09:00
Dean Herbert
7dc03097ff
Change distance snap to never account for slider velocity
...
This is a nuanced detail that was implemented incorrectly from the
outset. When mapping, generally a mapper chooses the distance spacing
with no regard to the SV. It has always been common to have a lower
or higher distance spacing than SV, but with the way the lazer editor
has worked, the SV was multiplied into the distance snap grid display,
incorectly changing its spacing depending on the "reference object"
(which is usually the previous hitobject chronologically).
2022-10-21 21:51:24 +09:00
Dean Herbert
447d420c99
Fix adjusting volume via settings playing tick samples twice
2022-10-21 21:03:39 +09:00
Dean Herbert
4803f606c2
Merge pull request #20845 from nekodex/settings-sidebar-sfx
...
Add unique hover/select samples to settings sidebar buttons
2022-10-21 20:56:58 +09:00
Dean Herbert
8b74b5807f
Update resources
2022-10-21 20:53:37 +09:00
