1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 10:42:54 +08:00
Commit Graph

33833 Commits

Author SHA1 Message Date
Dean Herbert
326fd03525 Fix loop not exiting after first valid frame 2020-10-30 15:25:53 +09:00
Dan Balasescu
b14291a312
Merge branch 'master' into tracked-hud-visibility-settings 2020-10-30 14:58:45 +09:00
Dean Herbert
984a243eff Add skinnable test scene for HUD overlay 2020-10-30 14:24:16 +09:00
Dan Balasescu
8be16bd4ed
Merge pull request #10370 from peppy/fix-test-beatmap-virtual-clock
Ensure virtual track time is long enough for test beatmaps
2020-10-30 14:23:06 +09:00
Dan Balasescu
45b8af5391
Merge pull request #10614 from peppy/results-screen-animate-once
Only play results panel animation once (and only for the local user)
2020-10-30 14:21:05 +09:00
Dean Herbert
bd7871d9f5 Update test scene to be non-skinnable (and add test covering momentary display) 2020-10-30 14:20:00 +09:00
Dean Herbert
8928aa6d92 Add key binding to show HUD while held 2020-10-30 14:19:40 +09:00
Dean Herbert
53bd31c69e Commit missing test pieces 2020-10-30 14:00:07 +09:00
Dean Herbert
b4eda65383 Commit missing pieces 2020-10-30 13:53:51 +09:00
Dean Herbert
c72017a7db Remove "hide during breaks" option
Probably wouldn't be used anyway.
2020-10-30 13:49:45 +09:00
Dean Herbert
f58f8e0f93 Update resources 2020-10-30 13:46:54 +09:00
Dean Herbert
9bb86ccb83 Change shift-tab to cycle available HUD visibility modes 2020-10-30 13:09:22 +09:00
Dean Herbert
18f92818da Show current HUD visibility mode as a tracked setting 2020-10-30 13:09:13 +09:00
Dean Herbert
46d89d55f4 Add note about ScheduleAfterChildren requirement 2020-10-30 12:47:04 +09:00
Dean Herbert
8e6c803900 Avoid running full updateClock loop when waiting on frames 2020-10-30 12:39:11 +09:00
Dean Herbert
8dbaca341e Merge branch 'sample-lookup-improvements' into results-screen-applause 2020-10-30 12:28:48 +09:00
Dean Herbert
b906736b85 Remove redundant initialisation 2020-10-30 12:28:40 +09:00
Dean Herbert
823230f06a Merge branch 'sample-lookup-improvements' into results-screen-applause 2020-10-30 12:17:36 +09:00
Dean Herbert
fed4accfea Update tests to refect new mappings 2020-10-30 12:12:30 +09:00
Dean Herbert
2ec2749cb4 Fix taiko lookup logic 2020-10-30 11:59:41 +09:00
Dean Herbert
2ea4aa0a37 Fix incorrect specification on some sample lookups 2020-10-30 11:59:41 +09:00
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