1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 19:17:25 +08:00
Commit Graph

33812 Commits

Author SHA1 Message Date
Dean Herbert
d319b27b3d Run sample lookup logic through getFallbackNames 2020-10-30 11:59:41 +09:00
Dean Herbert
0b28cca7e6 Don't force Gameplay prefix on all skin sample lookups 2020-10-30 11:59:40 +09:00
Dean Herbert
c9a85587fb Allow SampleInfo to specify fallback sample lookup names 2020-10-30 11:59:29 +09:00
Dean Herbert
0c1d12460f Remove unused parameter 2020-10-30 10:30:11 +09:00
Max Hübner
fb1e09b3e7 Load seasonal backgrounds according to setting 2020-10-29 18:04:48 +01:00
Max Hübner
d9846fad37 Remove fallback texture parameter
When there isn't a seasonal event, we don't want to fall back to the basic background here, but rather to the user selected background source.
2020-10-29 18:03:36 +01:00
Max Hübner
34371b8888 Show next Background on showSeasonalBackgrounds.ValueChanged 2020-10-29 17:44:23 +01:00
Max Hübner
bf4d99dfe7 Load SeasonalBackgroundLoader asynchronously 2020-10-29 17:43:10 +01:00
Max Hübner
907e1921c7 Make SeasonalBackgroundLoader read from SessionStatics 2020-10-29 17:31:42 +01:00
Max Hübner
76c0a790b4 Add separate Seasonal Backgrounds setting (Always, Sometimes, Never) 2020-10-29 17:28:04 +01:00
Dean Herbert
87be7d162b
Merge branch 'master' into spectator-replay-watcher 2020-10-30 00:25:17 +09:00
Max Hübner
b189e0b7cf Revert "Load SeasonalBackgroundLoader asynchronously"
This reverts commit 81ebcd8796.
2020-10-29 16:01:22 +01:00
Dean Herbert
05fecc340b
Merge pull request #10613 from peppy/update-framework
Update framework
2020-10-29 23:26:15 +09:00
Max Hübner
7d523fee28 Revert "Set BackgroundSource.Seasonal as default setting"
This reverts commit cdb2d23578.
2020-10-29 14:31:07 +01:00
Max Hübner
0c540537c9 Revert "Add BackgroundSource.Seasonal"
This reverts commit 2871001cc2.
2020-10-29 14:30:50 +01:00
Dean Herbert
1c353b4745 Update framework 2020-10-29 20:38:28 +09:00
Dean Herbert
17ea06f793 Merge branch 'results-screen-animate-once' into results-screen-applause 2020-10-29 20:23:25 +09:00
Dean Herbert
7be4dfabd8 Revert "Update namespace references"
This reverts commit d69d78ab5d.
2020-10-29 20:23:15 +09:00
Dean Herbert
404885af89 Merge branch 'results-screen-animate-once' into results-screen-applause 2020-10-29 18:52:54 +09:00
Dean Herbert
3491dea9e2 Fix scroll logic running before children may be alive in flow 2020-10-29 18:51:54 +09:00
Dean Herbert
d69d78ab5d Update namespace references 2020-10-29 18:45:18 +09:00
Dean Herbert
f1b8a8f7f5 Remove unused using 2020-10-29 18:16:04 +09:00
Dean Herbert
335d150a13 Fix aim time being mutated inside update loop 2020-10-29 18:11:50 +09:00
Dean Herbert
4dec46b33e Attempt to fix in a less destructive way for now 2020-10-29 17:52:58 +09:00
Dean Herbert
7bef695072 Merge branch 'master' into fix-test-beatmap-virtual-clock 2020-10-29 17:51:15 +09:00
Dean Herbert
ac071ec51a Merge branch 'results-screen-animate-once' into results-screen-applause 2020-10-29 17:15:18 +09:00
Dean Herbert
0a0239a7c7 Only play results panel animation once (and only for the local user) 2020-10-29 17:08:59 +09:00
Dean Herbert
11f85779d5 Fix panel expanded state being updated multiple times unnecessarily 2020-10-29 17:08:59 +09:00
Dean Herbert
71e373ff51 Make results panels aware of whether they are a local score that has just been set 2020-10-29 17:08:59 +09:00
Dean Herbert
4a26084df8 Only play results panel animation once (and only for the local user) 2020-10-29 17:04:33 +09:00
Dean Herbert
f1ce09930e Fix panel expanded state being updated multiple times unnecessarily 2020-10-29 17:03:45 +09:00
Dean Herbert
5d5b0221e5 Add skinning support for legacy applause playback 2020-10-29 16:32:29 +09:00
Dean Herbert
c863341ca1 Don't force Gameplay prefix on all skin sample lookups 2020-10-29 16:32:20 +09:00
Dean Herbert
b49a579411 Allow SampleInfo to specify fallback sample lookup names 2020-10-29 16:32:03 +09:00
Dean Herbert
fb82c043a5 Add rank appear sound (new default) 2020-10-29 16:11:37 +09:00
Dean Herbert
a8e9c62583 Make results panels aware of whether they are a local score that has just been set 2020-10-29 16:11:25 +09:00
Dean Herbert
6e630e8c88 Merge branch 'spectator-replay-watcher' into spectator-listing 2020-10-29 15:33:43 +09:00
Dean Herbert
2671d371da Move clock retrieval to new correct location 2020-10-29 15:28:39 +09:00
Dean Herbert
3ea27e23e8 Update namespace references 2020-10-29 15:20:10 +09:00
Dean Herbert
3751c357a3 Update framework 2020-10-29 15:19:05 +09:00
Dean Herbert
0818835b16 Merge branch 'spectator-replay-watcher' into spectator-listing 2020-10-29 15:13:21 +09:00
Dean Herbert
fa85751425 Move helper functions to bottom of class 2020-10-29 15:10:42 +09:00
Dean Herbert
fe409a55e6 Rename starvation test 2020-10-29 15:10:11 +09:00
Dean Herbert
ce58bfdc4e Add test covering host retry after returning to spectator screen 2020-10-29 15:09:12 +09:00
Dean Herbert
6a31a313b6 Fix stop watching test to check correct screen presence 2020-10-29 15:08:06 +09:00
Dean Herbert
7dd3a748be Add further test logic to ensure retry / restart flow is working correctly 2020-10-29 15:03:38 +09:00
Dean Herbert
a59ea987b7 Make tests more resilient under headless execution 2020-10-29 14:57:36 +09:00
Dean Herbert
c0960e60cb
Add note about testflight link
Sick of getting asked about this.
2020-10-29 14:52:34 +09:00
Dean Herbert
db2b00068f Avoid sourcing parent clock when in a paused state 2020-10-29 14:48:56 +09:00
Dean Herbert
d91456dc29 Move initial validity check out of loop for clarity 2020-10-29 14:25:47 +09:00