1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 19:22:54 +08:00
Commit Graph

21104 Commits

Author SHA1 Message Date
Max Hübner
0b46c19b23 Move seasonalBackgroundMode check up and early return if available 2020-10-30 17:16:51 +01:00
Max Hübner
f6eb5680ec Save full api response in SessionStatics 2020-10-30 16:43:18 +01:00
Max Hübner
6f6a8e2a8f Convert switch to if 2020-10-30 16:06:48 +01:00
Max Hübner
d19dd4eef6 IsInSeason() -> IsInSeason 2020-10-30 15:56:19 +01:00
Max Hübner
4e3fb615d2 Rename "SeasonalBackgrounds" to "SeasonalBackgroundMode" 2020-10-30 15:54:10 +01:00
Dean Herbert
1db8dfd03e
Merge branch 'master' into seasonal-backgrounds 2020-10-30 22:53:51 +09:00
Dean Herbert
bc69ed3870 Simplify sample lookup 2020-10-30 22:33:27 +09:00
cadon0
a1fa6588f6 Fix "bounce" when metadata container text is empty 2020-10-31 01:06:19 +13:00
Dean Herbert
b4e5311014 Move initial state set inside updateClock 2020-10-30 20:39:25 +09:00
Dean Herbert
1bd461f229 Move clock logic back to inside updateClock method 2020-10-30 20:21:14 +09:00
Max Hübner
f27ce7521d Make "Sometimes" setting depend on season end date, rather than chance 2020-10-30 10:27:43 +01:00
Dean Herbert
79aecc9a98
Merge branch 'master' into spectator-replay-watcher 2020-10-30 16:31:24 +09:00
Dean Herbert
32e68a6a3c Fix FramedReplayInputHandler incorrectly blocking in streaming mode when time requested is before the first frame
Most of this is just tidying up the logic to (hopefully) be better to
follow, again (again (again)).

The actual fix is that we now allow interpolation/playback when the
incoming time is less than the first frame's time, regardless of
receiving status.
2020-10-30 16:09:03 +09:00
Dan Balasescu
0ef1459f4b
Merge pull request #10621 from peppy/hud-momentary-visibility
Add momentary HUD toggle
2020-10-30 15:40:54 +09:00
Dean Herbert
0f997386ae Fix direction and IsRunning not updating on first frame after becoming valid
The parent clock will not unpause until WaitingForFrames becomes false,
so I've moved the set of that before we start to propagate its values
across. Doesn't fix any visible issue but should make propagation one
game loop faster.
2020-10-30 15:26:23 +09:00
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
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
8928aa6d92 Add key binding to show HUD while held 2020-10-30 14:19:40 +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
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
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
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
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
Dean Herbert
2e5a8b2287 Fix xmldoc to read better in new context 2020-10-29 13:16:31 +09:00
Dan Balasescu
a022b869eb
Merge branch 'master' into frame-stability-clean-up 2020-10-29 13:02:17 +09:00
Dan Balasescu
4a264bc173
Merge branch 'master' into beatmap-listing-search-options 2020-10-29 12:04:40 +09:00
Dan Balasescu
8ccc3c2ec8
Merge pull request #10596 from charlie-gray/right-click-circle-delete
Add support for deleting objects when Shift is held down
2020-10-29 11:37:22 +09:00
Bartłomiej Dach
1313ab89e7 Add xmldoc to multiple selection row 2020-10-28 23:37:21 +01:00
Bartłomiej Dach
016e920aa9 Move filter tab item hierarchy construction to BDL 2020-10-28 23:14:52 +01:00
Bartłomiej Dach
a8cefb0d4c Rename method 2020-10-28 23:12:28 +01:00
Bartłomiej Dach
f5aedc96c4 Rework multiple selection filter 2020-10-28 23:07:54 +01:00
Bartłomiej Dach
e77049eae3 Use discard-like lambda parameter names 2020-10-28 22:58:51 +01:00
Bartłomiej Dach
fa53549ed2 Mark request fields as possibly-null 2020-10-28 22:57:03 +01:00
Bartłomiej Dach
a1696942f0 Merge branch 'master' into right-click-circle-delete 2020-10-28 22:12:14 +01:00
Bartłomiej Dach
202fe09306 Group selection actions back up in SelectionHandler 2020-10-28 22:06:48 +01:00
Andrei Zavatski
5c2c5f2000 Use existing ScoreRank for rank filter 2020-10-28 23:35:08 +03:00
Andrei Zavatski
4f6081c7f3 Use BindableList<T> 2020-10-28 19:44:13 +03:00
Dean Herbert
bca317b151 Remove excess using statement 2020-10-28 23:43:16 +09:00
Dean Herbert
e1bf751dac Merge branch 'spectator-replay-watcher' into spectator-listing 2020-10-28 23:17:50 +09:00
Dean Herbert
5d02de29ca Fix attempt to change ruleset/beatmap bindables while screen is not active 2020-10-28 22:50:45 +09:00
Dean Herbert
25ab3a5fea Construct replay after being sure a ruleset is available to avoid nullrefs 2020-10-28 22:10:37 +09:00
Dean Herbert
dd2f44f393 Add basic "currently watching" text to player to signify that spectator is active 2020-10-28 19:43:06 +09:00
Dean Herbert
93fd913876 Add setting to allow automatically downloading during a spectating session 2020-10-28 19:43:06 +09:00
Dean Herbert
9807089834 Fix screen exit potentially occuring during transition 2020-10-28 19:43:06 +09:00
Dean Herbert
4df8119852 Add missing schedule 2020-10-28 19:43:06 +09:00
Dean Herbert
93e3e1a4db Don't inherit ReplayPlayer to make results screen work correctly 2020-10-28 19:02:38 +09:00
Dean Herbert
344ff8f4bc "Improve" visuals of spectator screen 2020-10-28 19:02:38 +09:00
Dean Herbert
2d73dfbe39 Add more safety around beatmap panel and button display logic 2020-10-28 19:02:38 +09:00
Dean Herbert
c97feb09bf Allow continuing to automatically spectate user from results screen 2020-10-28 19:02:38 +09:00
Dean Herbert
16b0a7b33e Add button flow to allow resuming watching after exiting manually 2020-10-28 19:02:38 +09:00
Dean Herbert
84d854e231 Avoid having the user profile show when clicking a spectator panel 2020-10-28 19:02:38 +09:00
Dean Herbert
32becb6882 Add simple listing of currently playing users 2020-10-28 19:02:38 +09:00
Dean Herbert
ce9dd0c920 Fix enum descriptions not being displayed in OverlayHeaderTabControl 2020-10-28 17:44:15 +09:00
Dean Herbert
6169349f7c Fix switching to new beatmap not working correctly 2020-10-28 17:44:11 +09:00
Dean Herbert
730cc645fb Avoid reconstructing ruleset for each frame bundle 2020-10-28 16:33:52 +09:00
Dean Herbert
48b0357e7d Fix "finished playing" events handled for potentially incorrect user 2020-10-28 16:11:14 +09:00
Dean Herbert
6eddd76bdc Simplify FramedReplayInputHandler's SetFrame implementation 2020-10-28 16:03:23 +09:00
Dean Herbert
09da75b143 Merge branch 'frame-stability-clean-up' into spectator-replay-watcher 2020-10-28 15:34:46 +09:00
Dean Herbert
2b1e79a4e8 Simplify state changes further 2020-10-28 15:32:20 +09:00
Dean Herbert
c9515653b3 Restore previous directionality logic to avoid logic differences 2020-10-28 15:31:57 +09:00
Dean Herbert
77d807d0f5 Merge branch 'frame-stability-clean-up' into spectator-replay-watcher 2020-10-28 15:26:02 +09:00
Dean Herbert
59e9c2639a Remove try-finally 2020-10-28 15:16:56 +09:00
Dean Herbert
a06516c900 Extract out frame stability state into enum for (hopefully) better clarity 2020-10-28 15:15:15 +09:00
Dean Herbert
8c9bda2ded Split out replay update method 2020-10-28 15:14:06 +09:00
Dean Herbert
9b9a41596f Split out frame stability calculation to own method 2020-10-28 15:14:06 +09:00
Dean Herbert
3e5322541d Make direction setting more clear 2020-10-28 14:35:42 +09:00
Dean Herbert
351acce698 Merge branch 'master' into fix-editor-bindable-crash 2020-10-28 13:34:54 +09:00
Dean Herbert
01b576c861 Fix editor crash on exit when forcing exit twice in a row 2020-10-28 13:32:39 +09:00
Andrei Zavatski
914bd53788 Add missing blank line 2020-10-28 02:39:51 +03:00
Andrei Zavatski
6fd3686c4d Use IReadOnlyCollection instead of List in SearchBeatmapSetsRequest 2020-10-28 02:36:35 +03:00
Andrei Zavatski
03c5057a92 Simplify BeatmapSearchMultipleSelectionFilterRow 2020-10-28 02:28:31 +03:00
Andrei Zavatski
fd11346a28 Update button colours 2020-10-28 01:48:24 +03:00
Andrei Zavatski
b4ec3b9fef Simplify MultipleSelectionFilterTabItem state changes 2020-10-28 01:41:46 +03:00
Dean Herbert
0a7f3dc19b
Avoid null reference on finalization
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-10-28 07:29:07 +09:00
Andrei Zavatski
c4efceceb2 Use char instead of sting for request parameter creation 2020-10-27 23:57:11 +03:00
Andrei Zavatski
008d1d697c Implement filtering by rank achieved 2020-10-27 23:14:48 +03:00
Andrei Zavatski
1710b396e7 Implement BeatmapSearchMultipleSelectionFilterRow 2020-10-27 22:27:29 +03:00
Andrei Zavatski
1b40b56d41 Add ability to search by play criteria 2020-10-27 21:30:53 +03:00
Andrei Zavatski
26a60d898c Implement BeatmapSearchExtraFilterRow 2020-10-27 21:22:20 +03:00
Andrei Zavatski
742a96484b Add ability to set extra parameters to SearchBeatmapSetsRequest 2020-10-27 20:13:18 +03:00
Leon Gebler
0ddf840a63 Merge branch 'master' into fix-timeline-drag-select-weirdness 2020-10-27 15:31:55 +01:00
Leon Gebler
983a2774e8 Code Formatting 2020-10-27 15:09:10 +01:00
Leon Gebler
064c50c3ac Expose currentZoom to fix selection box wiggle 2020-10-27 14:38:35 +01:00
Dean Herbert
d5e0fa322b Fix a couple of inspections 2020-10-27 22:30:45 +09:00
Lucas A
a96c067bea Remove uncessary async-await state machine level. 2020-10-27 13:45:21 +01:00
Dan Balasescu
26a7545534
Merge branch 'master' into fix-editor-samples-not-pausing-screen-swap 2020-10-27 21:29:16 +09:00
Dean Herbert
2cacdaa11b Add basic beatmap download and play flow 2020-10-27 19:28:34 +09:00
Dean Herbert
42b3aa3359 Fix spectating when starting from a point that isn't at the beginning of the beatmap 2020-10-27 18:58:37 +09:00
Dean Herbert
b3d793a505 Fix gameplay proceeding when no frames have been received yet 2020-10-27 18:58:37 +09:00
Dean Herbert
851d45d2eb Add sane pausing logic 2020-10-27 18:58:37 +09:00
Dean Herbert
9e6b0a42ec Allow FrameStabilityContainer to handle waiting-for-data state better (and pause outwards) 2020-10-27 18:58:37 +09:00
Dean Herbert
3ec3321a3d Add missing space 2020-10-27 18:58:37 +09:00
Dean Herbert
b737a8bf6e Add field to Replay denoting whether the full replay have been received or not 2020-10-27 18:58:37 +09:00
Dean Herbert
c1e7cd6e47 Stop replay playback when frames are starved 2020-10-27 18:58:37 +09:00
Dean Herbert
9bac8f3792 Add null check on replay as safety measure 2020-10-27 18:58:37 +09:00
Dean Herbert
400542bc0b Ensure frames arrive 2020-10-27 18:58:37 +09:00
Dean Herbert
ac4671c594 Add basic implementation of spectator screen 2020-10-27 18:58:37 +09:00
Dean Herbert
154ccf1b49 Expose events from streaming client 2020-10-27 18:58:37 +09:00
Dean Herbert
5fd97bd043 Add basic spectator screen 2020-10-27 18:58:37 +09:00
Dean Herbert
df5348cd93
Merge pull request #10601 from peppy/move-sample-pause-logic 2020-10-27 17:49:32 +09:00
Dean Herbert
b8beac27ce Use previous logic for catching-up mode 2020-10-27 17:14:41 +09:00