1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 03:42:58 +08:00
Commit Graph

31141 Commits

Author SHA1 Message Date
Dean Herbert
429ad783cf Merge branch 'update-framework' into beatmap-track-rework 2020-08-12 23:35:46 +09:00
Dean Herbert
00f8bb7c3e Update resources 2020-08-12 23:28:45 +09:00
Dean Herbert
b10cddf625 Update framework 2020-08-12 23:28:08 +09:00
Dan Balasescu
85182b19fe
Merge pull request #9831 from peppy/fix-informational-overlays
Fix informational overlays not hiding each other correctly
2020-08-12 02:18:34 +09:00
smoogipoo
c0031955c9 Update with further framework changes 2020-08-12 01:50:18 +09:00
smoogipoo
e47a1eb313 Use adjustable ITrack 2020-08-12 01:41:21 +09:00
smoogipoo
688e447950 Fix potential hierarchy mutation from async context 2020-08-12 01:33:06 +09:00
smoogipoo
eec94e1f53 Make track not-null in GameplayClockContainer/FailAnimation 2020-08-12 00:51:43 +09:00
smoogipoo
b66f303e71 Add annotation 2020-08-12 00:48:45 +09:00
smoogipoo
070d71ec27 More cleanups 2020-08-12 00:48:38 +09:00
Dean Herbert
8bfe6ba27c Fix informational overlays not hiding each other correctly 2020-08-11 23:15:08 +09:00
smoogipoo
031d29ac34 Inspect current track directly 2020-08-11 13:53:23 +09:00
smoogipoo
faff0a70c4 Privatise BMWB 2020-08-11 13:48:57 +09:00
smoogipoo
338c01fa43 Remove track store reference counting, use single instance stores 2020-08-11 13:16:06 +09:00
smoogipoo
6aafb3d271 Cleanup TestSceneScreenNavigation 2020-08-11 13:14:20 +09:00
smoogipoo
322d08af1b Remove more local music controller caches 2020-08-11 13:11:59 +09:00
smoogipoo
7d35893ecd Make MusicController non-nullable 2020-08-11 12:40:58 +09:00
smoogipoo
c66a14e9c5 Remove beatmap from FailAnimation 2020-08-11 12:37:48 +09:00
smoogipoo
b64142dff9 Fix incorrect load state being used 2020-08-11 12:37:00 +09:00
smoogipoo
20197e2768 Remove locally-cached music controller 2020-08-11 12:27:32 +09: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
327596b9d5
Merge branch 'master' into beatmap-track-rework 2020-08-10 20:53:12 +09: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
Bartłomiej Dach
a636c7052c Merge branch 'master' into adujustable-skinnablesound 2020-08-08 21:51:47 +02:00
smoogipoo
87ce1e3558 Remove impossible null case (DummyWorkingBeatmap) 2020-08-08 00:58:04 +09:00
Dan Balasescu
bfa20abd88
Merge branch 'master' into beatmap-track-rework 2020-08-08 00:38:35 +09:00
smoogipoo
2351701ade Fix test not having a long enough track 2020-08-07 23:08:51 +09:00
smoogipoo
b8373e89b7 Move beatmap bind to BDL load() 2020-08-07 23:08:09 +09:00
smoogipoo
e87f50f74f Rename method 2020-08-07 22:31:41 +09:00
smoogipoo
d1765c8a45 Fix using the wrong music controller instance 2020-08-07 22:06:04 +09:00
smoogipoo
b6fb7a0d39 Fix possibly setting null track 2020-08-07 22:05:58 +09:00
smoogipoo
08820c62ec Add back removed nullcheck 2020-08-07 21:36:02 +09:00
smoogipoo
b08ebe6f81 More inspections (rider is broken) 2020-08-07 21:14:45 +09:00
smoogipoo
961c6dab54 Fix more inspections 2020-08-07 21:08:03 +09:00