h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 23:47:24 +08:00
Code Issues Releases Wiki Activity
38,872 Commits 3 Branches 653 Tags 367 MiB
356b1e9a2d
Commit Graph

4070 Commits

Author SHA1 Message Date
Christine Chen
7f5b1e84a1 Update TestSceneStoryboardWithOutro.cs 
- Construct storyboard in CreateWorkingBeatmap()
- Use GameplayClockContainer.GameplayClock.CurrentTime
- Remove unnecessary lines
 2021-04-17 13:57:32 -04:00
jvyden
1e56f14f5b
Merge remote-tracking branch 'upstream' 2021-04-17 09:35:24 -04:00
Bartłomiej Dach
f3ea51eeed Adjust tests to not rely on invalid assumption 2021-04-17 14:23:32 +02:00
smoogipoo
5e82f40d67 Merge branch 'master' into gcc-abstraction 2021-04-16 20:14:53 +09:00
jvyden
8d6c30c73b
Fix lint 2021-04-16 05:57:36 -04:00
jvyden
ec0211809f
Apply peppy's suggestions 2021-04-16 05:53:27 -04:00
jvyden
d760e81a91
Fix lint 2021-04-16 05:22:41 -04:00
smoogipoo
46d2181d42 Remove now unnecessary (duplicating) test 2021-04-16 18:21:56 +09:00
smoogipoo
377e5ce6b3 Fix test incorrect sending state too often 2021-04-16 18:21:35 +09:00
jvyden
471b8e3c74
Merge branch 'master' of https://github.com/ppy/osu 2021-04-16 05:02:40 -04:00
jvyden
7d23973ef8
Reset SessionStatics on activity 
Closes #12424
 2021-04-16 05:01:58 -04:00
smoogipoo
ca74f413cd Change to explicit method instead 2021-04-16 17:31:02 +09:00
smoogipoo
25f0f17766 Attempt to fix match subscreen test failure 2021-04-16 16:16:28 +09:00
smoogipoo
5652490d61 Fix OnUserBeganPlaying not being invoked if already watching 2021-04-16 14:11:55 +09:00
Christine Chen
b15838b220 Move storyboard outro logic to DrawableStoryboard 2021-04-16 00:59:10 -04:00
Christine Chen
45c2b72a25
Merge branch 'master' into play-storyboard-outro 2021-04-15 15:11:35 -04:00
Christine Chen
25b8c2f257 Allow skipping storyboard outro 
Reuses SkipOverlay by calculating the endtime of the storyboard and using that as a "start point". Upon skipping the outro the score is instantly shown.
When the end of the storyboard is reached the score screen automatically shows up. If the player holds ESC (pause) during the outro, the score is displayed

The storyboard endtime is calculated by getting the latest endtime of the storyboard's elements, or simply returning 0 if there is no storyboard.

Co-Authored-By: Marlina José <marlina@umich.edu>
 2021-04-15 13:20:40 -04:00
Dean Herbert
7cf15fe729
Merge pull request #12412 from peppy/timeline-adjustments 
Update timeline control point display
 2021-04-15 22:43:26 +09:00
Dan Balasescu
ac8e462d32
Merge branch 'master' into refactor-framed-replay-input-hander 2021-04-15 21:48:58 +09:00
Dean Herbert
ad671ee07a
Merge branch 'master' into timeline-adjustments 2021-04-15 20:42:38 +09:00
Dan Balasescu
6f17c19a48
Merge branch 'master' into summary-timeline-design-refactors 2021-04-15 20:11:39 +09:00
Dean Herbert
5b06a68b93
Merge pull request #12330 from Cublibre/master 
Send a warning notification if device is unplugged and at low battery
 2021-04-15 19:21:04 +09:00
Dean Herbert
18e8682f39 Remove unused using statements 2021-04-15 17:01:25 +09:00
Dean Herbert
dd9a142e89 Fix TestSceneEditorSummaryTimeline not displaying actual beatmap content 2021-04-15 16:39:20 +09:00
Dean Herbert
66bb5766b9 Make Mod.Description abstract and add missing descriptions 2021-04-15 16:39:20 +09:00
Dan Balasescu
a56391c6ca
Merge pull request #12418 from peppy/abstract-mod-description 
Make `Mod.Description` abstract and add missing descriptions
 2021-04-15 15:42:36 +09:00
Dean Herbert
346e36d32a Make Mod.Description abstract and add missing descriptions 2021-04-15 14:36:26 +09:00
Salman Ahmed
92fd34cea9 Revert "Inverse ignore user settings bindable to "apply user settings" instead" 
This reverts commit 175b8da2b2.
 2021-04-15 08:02:12 +03:00
Salman Ahmed
175b8da2b2 Inverse ignore user settings bindable to "apply user settings" instead 2021-04-15 07:34:20 +03:00
Salman Ahmed
7a9ff2ab38 Use until steps instead 
Ah..
 2021-04-15 00:48:25 +03:00
Salman Ahmed
505dc15e03 Add failing test case 2021-04-14 23:35:42 +03:00
Dean Herbert
9dea0ae935 Update test scene to be able to see a bit more 2021-04-14 21:03:52 +09:00
smoogipoo
1aa36818df Abstractify GameplayClockContainer 2021-04-14 17:47:11 +09:00
Dean Herbert
7654df94f6
Merge pull request #12395 from frenzibyte/fix-cinema-ignore-settings 
Fix beatmap background displayed if storyboard is hidden on "Cinema" mod
 2021-04-14 14:31:03 +09:00
Dan Balasescu
1505a38164
Merge pull request #12396 from peppy/update-timeline-slider-apperance 
Update timeline slider/spinner apperance
 2021-04-13 20:47:44 +09:00
Dan Balasescu
b2aa46690d
Merge pull request #12389 from peppy/fix-editor-ctrl-drag-deselection 
Fix ctrl-dragging on an existing selection unexpectedly causing deselection
 2021-04-13 20:38:29 +09:00
Dean Herbert
00f235760d Update visual appearance of timeline blueprints to close match new designs 2021-04-13 19:26:20 +09:00
Dean Herbert
fca9c70c1b Move timeline hit object test to immediately viewable area 2021-04-13 19:26:20 +09:00
Dean Herbert
0cf13dab8d
Merge pull request #12391 from frenzibyte/replays-tooltip-graph 
Display separate "replays watched" tooltip for replays subsection
 2021-04-13 19:25:50 +09:00
Dean Herbert
2884ed3ab9
Merge pull request #12350 from smoogipoo/multiplayer-spectator-player-grid 
Add the multiplayer spectator player grid
 2021-04-13 19:25:32 +09:00
Dan Balasescu
a0513f64f9
Merge branch 'master' into replays-tooltip-graph 2021-04-13 18:21:10 +09:00
Salman Ahmed
15658eda55 Add failing test case 2021-04-13 12:00:13 +03:00
Salman Ahmed
36510309d1 Merge EnableUserDim and IgnoreUserSettings to one bindable 2021-04-13 10:58:56 +03:00
Dean Herbert
a9652b7b25 Start TimelineTestScene in a more visible place 2021-04-13 16:05:12 +09:00
ekrctb
38d10755cb Merge branch 'master' into refactor-framed-replay-input-hander 2021-04-13 13:47:22 +09:00
Dean Herbert
516bd138e3 Add (previously failing) test coverage of drag from selection 2021-04-13 13:46:38 +09:00
Dean Herbert
7c975359d9 Add basic select/deselect tests 2021-04-13 13:29:37 +09:00
Dean Herbert
05d7fe289f Rename test scene in preparation for increasing scope 2021-04-13 13:09:18 +09:00
Dean Herbert
66e74da2b7 Fix regression in quick delete mouse action blocking 2021-04-13 13:03:14 +09:00
Salman Ahmed
8f84abf348 Display "replays watched" tooltip for replays subsection 2021-04-12 21:51:06 +03:00
Christine Chen
f66306a81a Remove IsLowBattery 2021-04-12 11:15:24 -04:00
Christine Chen
43b97fe0ad Refactor PowerStatus (now called BatteryInfo) 2021-04-12 10:52:52 -04:00
smoogipoo
1e002841cf Add test for scoring mode changes 2021-04-12 22:03:45 +09:00
smoogipoo
c531e38a36 Rework to create a derived tracked user data instead 2021-04-12 22:00:27 +09:00
smoogipoo
27660265b5 Merge branch 'master' into multiplayer-spectator-leaderboard 2021-04-12 21:02:18 +09:00
Dean Herbert
b4c75ba3c6 Fix TestQuickDeleteRemovesObject failing on second run 2021-04-12 19:19:25 +09:00
ekrctb
359fae895f Rename property 2021-04-12 18:50:25 +09:00
ekrctb
e19e8ff2a3 Rewrite FramedReplayInputHandler for robustness 
This commit changes the semantics of `CurrentFrame` and `NextFrame` of the class.
The ordering of `NextFrame.Time` and `CurrentFrame.Time` was dependent on the current direction.
Now, it should always satisfy `CurrentFrame.Time <= CurrentTime <= NextFrame.Time` except at the start/end.
This change, however, doesn't break existing deriving classes if the template code pattern usage of interpolation is used.
The deriving class code can be simplified due to the elimination of nullable types. I didn't include those changes in this commit.

I removed `StreamingFramedReplayInputHandlerTest` for now, as it is almost-duplicate of `FramedReplayInputHandlerTest`. I'll include more tests in later commits.

This commit fixes #6150.
 2021-04-12 16:18:11 +09:00
Dean Herbert
9be3163592 Merge branch 'master' into multiplayer-spectator-player-grid 2021-04-12 14:14:13 +09:00
smoogipoo
4fcddfb44b Fix multiplayer test failure 2021-04-12 13:42:14 +09:00
ekrctb
d6d8ea5b6b Throw when getting a frame of an empty replay 2021-04-12 11:17:56 +09:00
Salman Ahmed
cb947a3b27 Add expected output in test case rather than determining internally 2021-04-11 13:18:25 -04:00
Salman Ahmed
1fd4cb8963
Merge branch 'master' into master 2021-04-11 10:19:16 +03:00
Christine Chen
08311abc5e Remove setters, cache CreatePowerStatus() and use a dummy LocalPowerStatus class in test scene 2021-04-10 00:00:21 -04:00
smoogipoo
e73f3f52d7 Add some more asserts 2021-04-09 18:23:41 +09:00
smoogipoo
9ddcd686ac Fix incorrect assert 2021-04-09 18:23:38 +09:00
smoogipoo
b49997f531 Add test for no frames 2021-04-09 18:18:23 +09:00
smoogipoo
589ce4bdc2 Add test 2021-04-09 18:16:10 +09:00
Christine Chen
59d13b0dd3 Fixed indentation 
sorry about the style fixes... I'm using JetBrains Rider from now on.
 2021-04-08 21:53:42 -04:00
Christine Chen
6b6a71d3c3 trim whitespace 2021-04-08 20:39:17 -04:00
Christine Chen
493c095535 Fixed code style 2021-04-08 20:28:23 -04:00
Christine Chen
6bccb3aab6 Use DI to implement battery detection, add BatteryCutoff property 
- Removed the Xamarin.Essentials package from osu.Game and added it to osu.iOS and osu.Android only.
- iOS and Android implementations use Xamarin.Essentials.Battery, while the Desktop implementation
only returns 100% battery for now.
- Added a BatteryCutoff property to PowerStatus so it can be different for each platform (default 20%, 25% on iOS)
 2021-04-08 19:55:11 -04:00
smoogipoo
70cd018a98 Fix intermittent test failure 2021-04-08 21:38:58 +09:00
Dean Herbert
1e23f671fa
Merge pull request #12321 from smoogipoo/add-spectate-button-and-state 
Add multiplayer spectating user state and button
 2021-04-08 19:48:58 +09:00
smoogipoo
b38d332268 Fix broken test 2021-04-08 16:31:39 +09:00
Dean Herbert
545156d15c Add regression test coverage 2021-04-08 15:20:53 +09:00
Dean Herbert
8aff53172d Remove necessity for nested PassThroughInputManger 2021-04-08 15:18:31 +09:00
Christine Chen
0a6baf670e Send a warning notification if device is unplugged and low battery 
- Uses Xamarin.Essentials in osu.Game.PlayerLoader to check battery level
- Encapsulated battery checking in the public BatteryManager class so battery level and plugged in status can be accessed and edited in TestPlayerLoader
- When checking battery level, catch NotImplementedException thrown by Xamarin.Essentials.Battery on non-mobile platforms
- Added visual unit tests for battery notification
  To mock battery status and level, we had to define a batteryManager object in TestPlayerLoader and add a new function ResetPlayerWithBattery()

Co-Authored-By: Marlina José <marlina@umich.edu>
 2021-04-07 15:56:50 -04:00
smoogipoo
024adb699c Add test and fix several issues 2021-04-08 00:12:21 +09:00
smoogipoo
214813154b Fix class name 2021-04-07 22:28:22 +09:00
smoogipoo
99bee73ac1 Merge branch 'master' into add-spectate-button-and-state 2021-04-07 22:07:52 +09:00
Dan Balasescu
6eb809f4c4
Merge pull request #9194 from boswelja/rebind-song-select 
Allow rebinding Song Select mods/random/options keys
 2021-04-07 20:55:45 +09:00
smoogipoo
93c5935ebc Add match subscreen support + test 2021-04-07 20:46:30 +09:00
Dean Herbert
b4c6894d13 Add test coverage for song select footer area 2021-04-07 18:29:31 +09:00
smoogipoo
abd637ffaa Add button to footer 2021-04-07 17:35:18 +09:00
smoogipoo
56c13148f1 Fix typo in class name 2021-04-07 16:45:10 +09:00
smoogipoo
c744f77cfa Add participant panel state 2021-04-07 16:40:24 +09:00
smoogipoo
f5667125a0 Remove unnecessary method 2021-04-07 16:37:43 +09:00
smoogipoo
6be9c9f0f4 Link up ready button to spectate state 2021-04-07 16:35:50 +09:00
smoogipoo
1f57b6884d Add ready button to test scene 2021-04-07 16:30:40 +09:00
smoogipoo
6de91d7b6b Add spectate button + test 2021-04-06 21:37:27 +09:00
Dan Balasescu
ba3689b5b9
Merge pull request #12269 from PercyDan54/beatmap-details 
Use OnlineViewContainer for BeatmapDetails
 2021-04-06 17:52:32 +09:00
Dan Balasescu
2321101518
Merge branch 'master' into fix-overzealousmouse-button-blocking 2021-04-06 16:45:25 +09:00
Dean Herbert
53c1bc666c Make addition of nested GlobalActionContainer in OsuGameTestScene optional 2021-04-06 15:18:00 +09:00
Dean Herbert
e486e521ff Fix regressed test 2021-04-05 22:46:01 +09:00
Dean Herbert
beebdb0734 Clean up implementation 2021-04-05 22:30:51 +09:00
Bartłomiej Dach
b66ba43bc5 Add failing test scene 2021-04-03 14:02:46 +02:00
Bartłomiej Dach
7d4b0e3f0a Fix editor clock scene not re-enabling beatmap 
Could interfere with other tests due to causing crashes on attempts to
change `Beatmap.Value`.
 2021-04-03 12:34:48 +02:00
PercyDan54
1ff77754fd
Use OnlineViewContainer 2021-04-02 20:14:31 +08:00
smoogipoo
c3c7c18549 Fix tests 2021-04-01 23:48:26 +09:00