1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 09:27:29 +08:00
Commit Graph

31664 Commits

Author SHA1 Message Date
smoogipoo
679dc34aa4 Add test timeouts 2020-09-07 17:18:54 +09:00
smoogipoo
c72a8d4755 Add zero-length slider test 2020-09-07 17:18:40 +09:00
smoogipoo
ecc9c2957f Avoid float precision error in mania conversion 2020-09-07 16:30:05 +09:00
Dan Balasescu
a3a71a704c
Merge pull request #10041 from frenzibyte/fix-sliderborder-more-thicker
Bring legacy slider border width closer to osu!stable
2020-09-07 16:16:40 +09:00
Dan Balasescu
4c40d8f503
Merge pull request #9766 from Game4all/gameplay-disable-overlays
Disable activation of overlays while in gameplay
2020-09-07 16:06:45 +09:00
Dan Balasescu
fd2abc5c1e
Merge pull request #10074 from peppy/hide-cursor-on-touch-input
Hide the game-wide cursor on touch input
2020-09-07 16:00:17 +09:00
Dan Balasescu
025ead195c
Merge branch 'master' into fix-sliderborder-more-thicker 2020-09-07 15:40:34 +09:00
Dan Balasescu
476c325626
Merge branch 'master' into gameplay-disable-overlays 2020-09-07 15:34:02 +09:00
Dean Herbert
1a55d92c71 Use local input manager 2020-09-07 15:31:05 +09:00
Dean Herbert
daff060c9a Hide the game-wide cursor on touch input 2020-09-07 15:20:51 +09:00
Dan Balasescu
3347f57e46
Merge pull request #9957 from Craftplacer/combo-colors
Implement combo colour serializing
2020-09-07 14:25:35 +09:00
Dan Balasescu
e17ccdfe9f
Merge branch 'master' into combo-colors 2020-09-07 13:55:41 +09:00
Dan Balasescu
33faff8108
Merge pull request #10072 from Joehuu/lowercase-toolbar-tooltips
Make all toolbar tooltips lowercase
2020-09-07 13:55:34 +09:00
Dean Herbert
8f8f907fc7 Fix missed string 2020-09-07 13:27:28 +09:00
Joehu
b4b9c71f00 Make all toolbar tooltips lowercase 2020-09-06 10:13:06 -07:00
Bartłomiej Dach
2b16e25353 Revert unnecessary passing down of tuple in test 2020-09-06 18:44:41 +02:00
Dean Herbert
a0bc376446
Merge pull request #10062 from frenzibyte/fix-music-controller-propagating-event-twice
Fix MusicController raising track changed event twice
2020-09-04 20:09:49 +09:00
Salman Ahmed
569a56eccb Revert "Move adjustment to LegacySkinConfiguration as a default value"
This reverts commit 18927304f1.
2020-09-04 13:33:23 +03:00
Salman Ahmed
3239576a23
Minor rewording of new comment
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-09-04 11:50:49 +03:00
Salman Ahmed
4236e5fe71 Replace useless "matching-code" comment with explanation of how it could happen
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-09-04 11:31:54 +03:00
Salman Ahmed
65d541456a Slight rewording 2020-09-04 11:11:07 +03:00
Dan Balasescu
296294d024
Merge pull request #10061 from peppy/fix-ruleset-settings-crash
Fix potential hard crash if ruleset settings fail to construct
2020-09-04 17:07:55 +09:00
Dan Balasescu
6822805708
Merge pull request #10058 from peppy/expose-wedge-icons
Strongly type and expose default beatmap statistic icons for other rulesets
2020-09-04 17:07:35 +09:00
Dean Herbert
ab057e6c65 Remove unnecessary string interpolation 2020-09-04 16:28:35 +09:00
Dean Herbert
644f3375ac Also catch exceptions in the construction call 2020-09-04 16:28:19 +09:00
Salman Ahmed
54013790fc Fix MusicController raising TrackChanged event twice 2020-09-04 10:24:31 +03:00
Dan Balasescu
743c888986
Merge branch 'master' into expose-wedge-icons 2020-09-04 16:22:14 +09:00
Dan Balasescu
b631430a5b
Merge pull request #10045 from peppy/add-info-wedge-icons
Update and add missing beatmap statistic icons to info wedge
2020-09-04 16:22:01 +09:00
Dean Herbert
a15653c77c Fix potential hard crash if ruleset settings fail to construct 2020-09-04 16:15:57 +09:00
Dean Herbert
974bef5586
Merge pull request #10060 from smoogipoo/fix-room-mod-retention
Fix global mods being retained by rooms
2020-09-04 15:58:07 +09:00
Dan Balasescu
1a4e058acc
Merge branch 'master' into add-info-wedge-icons 2020-09-04 15:52:11 +09:00
Dan Balasescu
639a808345
Merge pull request #10059 from peppy/update-framework
Update framework
2020-09-04 15:50:20 +09:00
Dean Herbert
0b3f2fe7df Update framework 2020-09-04 15:21:48 +09:00
smoogipoo
4399f5976c Fix global mods being retained by rooms 2020-09-04 15:20:55 +09:00
Dean Herbert
25e142965d Strongly type and expose default beatmap information icon implementations for other rulesets 2020-09-04 15:01:32 +09:00
Dean Herbert
7c99f66cf5 Update resources 2020-09-04 14:13:42 +09:00
Dean Herbert
cd253ab055 Further tweaks to get closer to design originals 2020-09-04 13:05:39 +09:00
Dean Herbert
9d2dff2cb8 Add scale to allow legacy icons to display correctly sized 2020-09-04 12:55:39 +09:00
Dean Herbert
d6b46936a0 Adjust sizing to match updated textures with less padding 2020-09-04 12:55:28 +09:00
Lucas A
82e314da59 Fix merge conflicts. 2020-09-03 21:56:47 +02:00
Salman Ahmed
18927304f1 Move adjustment to LegacySkinConfiguration as a default value 2020-09-03 16:29:38 +03:00
Dean Herbert
a99e7a1dc2 Merge branch 'master' into add-info-wedge-icons 2020-09-03 21:57:58 +09:00
Dean Herbert
ebed7d09e3 Update resources 2020-09-03 21:56:36 +09:00
Dan Balasescu
8330a3aff4
Merge pull request #10044 from peppy/update-icons
Update toolbar icons and source titles from overlays directly
2020-09-03 20:55:20 +09:00
Dan Balasescu
4d9a5f7ba8
Merge branch 'master' into update-icons 2020-09-03 20:19:51 +09:00
Dean Herbert
bb8bc1097e
Merge pull request #10020 from smoogipoo/timeshift-leaderboard-topscore 2020-09-03 18:40:05 +09:00
Dean Herbert
7a0c1411b6
Merge branch 'master' into timeshift-leaderboard-topscore 2020-09-03 18:11:04 +09:00
Dean Herbert
72cb65c22f Update and add missing beatmap statistic icons to info wedge 2020-09-03 17:52:22 +09:00
Dean Herbert
d55c9c3cc2 Fix UserProfile weirdness 2020-09-03 17:11:34 +09:00
Dean Herbert
99e34d8562 Update with missing icons 2020-09-03 17:05:45 +09:00