1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 21:17:33 +08:00
Commit Graph

31092 Commits

Author SHA1 Message Date
Andrei Zavatski
fdfda453c7 Merge remote-tracking branch 'refs/remotes/ppy/master' into dashboard-news 2020-08-11 20:14:52 +03:00
Dan Balasescu
c86798f8b2
Merge pull request #9829 from peppy/fix-multiple-assembly-loaded-crash
Fix crash when same ruleset loaded more than once
2020-08-11 12:09:44 +09:00
Dan Balasescu
8b7e715c2b
Merge pull request #9818 from peppy/improve-token-fail-error-messaging
Improve messaging when timeshift token retrieval fails
2020-08-11 11:31:52 +09:00
Dean Herbert
471ed968e3 Fix crash when same ruleset loaded more than once
If the same ruleset assembly was present more than once in the current
AppDomain, the game would crash. We recently saw this in Rider EAP9.
While this behaviour may change going forward, this is a good safety
measure regardless.
2020-08-11 11:09:02 +09:00
Dean Herbert
dd2f677aa4
Merge pull request #9633 from Joehuu/fix-keybind-clearing 2020-08-11 11:01:03 +09:00
Dean Herbert
02084d7636 Merge branch 'master' into improve-token-fail-error-messaging 2020-08-11 10:59:33 +09:00
Dean Herbert
d1b106a3b5 Include mention of old releases in error message 2020-08-11 10:59:28 +09:00
Dean Herbert
ca7fd57ec2
Merge pull request #9826 from bdach/spinner-rotation-clock-rate 2020-08-11 10:43:55 +09:00
Dan Balasescu
088f7f5cc7
Merge pull request #9819 from peppy/fix-overlay-depths
Always show newly presented overlay at front
2020-08-11 10:24:37 +09:00
Dan Balasescu
7dc9888730
Merge pull request #9827 from peppy/update-framework
Update framework
2020-08-11 09:59:44 +09:00
Dean Herbert
6e0d071510 Merge branch 'upstream/dependabot/nuget/Microsoft.NET.Test.Sdk-16.7.0' into update-framework 2020-08-11 06:55:12 +09:00
Dean Herbert
ecb4826e19 Update framework 2020-08-11 06:54:26 +09:00
Bartłomiej Dach
cca78235d5 Replace CumulativeRotation with RateAdjustedRotation 2020-08-10 23:02:06 +02:00
Bartłomiej Dach
5d63b5f6a5 Add failing test cases 2020-08-10 23:02:01 +02:00
Bartłomiej Dach
61f1c4fe62 Extract replay-transforming helper test method 2020-08-10 19:51:00 +02:00
dependabot-preview[bot]
d7de8b2916
Bump Microsoft.NET.Test.Sdk from 16.6.1 to 16.7.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.6.1 to 16.7.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.6.1...v16.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-10 17:17:07 +00:00
Dean Herbert
730d13fda6 Always show newly presented overlay at front
This feels much better. Does not change order if the overlay to be shown
is not yet completely hidden.

- Closes #9815.
2020-08-10 20:48:04 +09:00
Dean Herbert
1f84e54151 Improve messaging when timeshift token retrieval fails
Obviously not a final solution, but should better help self-compiling
(or unofficial package) users better understand why this is happening.
2020-08-10 20:16:16 +09:00
Dean Herbert
96c4a30fac
Merge pull request #9788 from smoogipoo/adujustable-skinnablesound
Make SkinnableSound an IAdjustableAudioComponent
2020-08-10 19:39:13 +09:00
Andrei Zavatski
d8f8930691 Remove HomeNewsPanelFooter 2020-08-09 05:28:43 +03:00
Andrei Zavatski
a72a48624d Remove NewsPostDrawableDate 2020-08-09 05:16:08 +03:00
Bartłomiej Dach
a636c7052c Merge branch 'master' into adujustable-skinnablesound 2020-08-08 21:51:47 +02:00
Andrei Zavatski
cddd4f0a97 Implement HomeShowMoreNewsPanel 2020-08-07 13:18:31 +03:00
Andrei Zavatski
76d35a7667 Implement HomeNewsGroupPanel 2020-08-07 12:59:45 +03:00
Andrei Zavatski
e56671a1f1 Merge remote-tracking branch 'refs/remotes/ppy/master' into dashboard-news 2020-08-07 11:33:04 +03:00
Andrei Zavatski
2e0f567d5d Implement HomeNewsPanel component 2020-08-07 11:33:02 +03:00
Dan Balasescu
d8ffc00f75
Merge pull request #6345 from frenzibyte/expand-number-piece-on-old-skins
Expand number piece for legacy old skins
2020-08-07 17:18:36 +09:00
Dan Balasescu
08934b7e39
Merge pull request #9763 from Wieku/playfield-shift
Add vertical offset to osu! playfield to match stable
2020-08-07 16:56:07 +09:00
smoogipoo
3c3756e42d Merge branch 'master' into expand-number-piece-on-old-skins 2020-08-07 16:36:58 +09:00
smoogipoo
bce3f3952f Split out variable declaration 2020-08-07 16:36:40 +09:00
Dan Balasescu
3c8fe12ccf
Merge branch 'master' into playfield-shift 2020-08-07 16:27:03 +09:00
Dean Herbert
bb6e05404b
Merge pull request #9794 from peppy/update-framework
Update framework
2020-08-06 22:27:48 +09:00
Dean Herbert
c84452cfbf Update usages 2020-08-06 21:53:20 +09:00
Dean Herbert
f994bf2888 Update framework 2020-08-06 21:34:48 +09:00
Dean Herbert
c68fb92d00
Merge pull request #9791 from Joehuu/toolbar-keybinding-tooltips 2020-08-06 19:12:58 +09:00
Dean Herbert
9685df0eca Only update key binding on next usage to avoid large blocking calls 2020-08-06 18:24:20 +09:00
Joehu
f9c369b23c Fix toolbar music button tooltip overflowing off-screen 2020-08-06 01:20:03 -07:00
Joehu
d574cac702 Add keybinding to toolbar button's tooltip 2020-08-06 01:18:45 -07:00
Joehu
7bcb68ffac Handle overlay toggling with toolbar buttons instead 2020-08-06 01:17:24 -07:00
Joehu
ad959ce523 Make toolbar button abstract 2020-08-06 01:06:51 -07:00
smoogipoo
641279ec3e Make SkinnableSound an IAdjustableAudioComponent 2020-08-06 14:43:48 +09:00
smoogipoo
9a00ad48c6 Update components to use extension methods 2020-08-06 14:43:39 +09:00
Dan Balasescu
bba23dc928
Merge pull request #9780 from peppy/add-toolbar-tooltips
Add missing toolbar tooltips for right-hand icons
2020-08-06 13:45:01 +09:00
Dan Balasescu
6f5fbbe141
Merge pull request #9779 from peppy/fix-super-short-spinners
Fix very short spinners being impossible to complete
2020-08-06 13:43:42 +09:00
Dean Herbert
3b15a50f0d Fix unnecessary + character 2020-08-06 12:34:42 +09:00
Dean Herbert
d5324be07d Fix malformed testcase 2020-08-06 12:33:40 +09:00
Dean Herbert
e3f314349a
Don't use title case
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2020-08-06 12:27:30 +09:00
Salman Ahmed
9465e7abe1 Rename sprites container to "circleSprites" 2020-08-05 23:45:00 +03:00
Salman Ahmed
43161697f8 Fix wrong english 2020-08-05 23:42:05 +03:00
Sebastian Krajewski
2c73fc0e1b
Merge branch 'master' into playfield-shift 2020-08-05 22:34:43 +02:00